open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graph: handle min value of zero

Browse Source
This commit is contained in:
mantikoros 2022-07-01 16:50:34 -04:00
parent 7571a069d0
commit dffc61ebe4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/components/contract/contract-prob-graph.tsx
View File

@ -8,6 +8,7 @@ import { getInitialProbability } from 'common/calculate'
import { BinaryContract, PseudoNumericContract } from 'common/contract' import { BinaryContract, PseudoNumericContract } from 'common/contract'
import { useWindowSize } from 'web/hooks/use-window-size' import { useWindowSize } from 'web/hooks/use-window-size'
import { getMappedValue } from 'common/pseudo-numeric' import { getMappedValue } from 'common/pseudo-numeric'
import { formatLargeNumber } from 'common/util/format'
export const ContractProbGraph = memo(function ContractProbGraph(props: { export const ContractProbGraph = memo(function ContractProbGraph(props: {
contract: BinaryContract | PseudoNumericContract contract: BinaryContract | PseudoNumericContract
@ -17,6 +18,7 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
const { contract, height } = props const { contract, height } = props
const { resolutionTime, closeTime, outcomeType } = contract const { resolutionTime, closeTime, outcomeType } = contract
const isBinary = outcomeType === 'BINARY' const isBinary = outcomeType === 'BINARY'
const isLogScale = outcomeType === 'PSEUDO_NUMERIC' && contract.isLogScale
const bets = props.bets.filter((bet) => !bet.isAnte && !bet.isRedemption) const bets = props.bets.filter((bet) => !bet.isAnte && !bet.isRedemption)
@ -67,9 +69,10 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
const points: { x: Date; y: number }[] = [] const points: { x: Date; y: number }[] = []
const s = isBinary ? 100 : 1 const s = isBinary ? 100 : 1
const c = isLogScale && contract.min === 0 ? 1 : 0
for (let i = 0; i < times.length - 1; i++) { for (let i = 0; i < times.length - 1; i++) {
points[points.length] = { x: times[i], y: s * probs[i] } points[points.length] = { x: times[i], y: s * probs[i] + c }
const numPoints: number = Math.floor( const numPoints: number = Math.floor(
dayjs(times[i + 1]).diff(dayjs(times[i]), 'ms') / timeStep dayjs(times[i + 1]).diff(dayjs(times[i]), 'ms') / timeStep
) )
@ -81,7 +84,7 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
x: dayjs(times[i]) x: dayjs(times[i])
.add(thisTimeStep * n, 'ms') .add(thisTimeStep * n, 'ms')
.toDate(), .toDate(),
y: s * probs[i], y: s * probs[i] + c,
} }
} }
} }
@ -94,7 +97,9 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
const multiYear = !dayjs(startDate).isSame(latestTime, 'year') const multiYear = !dayjs(startDate).isSame(latestTime, 'year')
const lessThanAWeek = dayjs(startDate).add(8, 'day').isAfter(latestTime) const lessThanAWeek = dayjs(startDate).add(8, 'day').isAfter(latestTime)
const formatter = isBinary ? formatPercent : formatNumeric const formatter = isBinary
? formatPercent
: (x: DatumValue) => formatLargeNumber(+x.valueOf())
return ( return (
<div <div
@ -107,8 +112,8 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
isBinary isBinary
? { min: 0, max: 100, type: 'linear' } ? { min: 0, max: 100, type: 'linear' }
: { : {
min: contract.min, min: contract.min + c,
max: contract.max, max: contract.max + c,
type: contract.isLogScale ? 'log' : 'linear', type: contract.isLogScale ? 'log' : 'linear',
} }
} }
@ -162,10 +167,6 @@ function formatPercent(y: DatumValue) {
return `${Math.round(+y.toString())}%` return `${Math.round(+y.toString())}%`
} }
function formatNumeric(y: DatumValue) {
return `${Math.round(+y.toString())}`
}
function formatTime( function formatTime(
time: number, time: number,
includeYear: boolean, includeYear: boolean,