pseudo numeric resolution
This commit is contained in:
parent
0d6054be2d
commit
be1243e93a
|
@ -82,6 +82,7 @@ export type PseudoNumeric = {
|
||||||
min: number
|
min: number
|
||||||
max: number
|
max: number
|
||||||
isLogScale: boolean
|
isLogScale: boolean
|
||||||
|
resolutionValue?: number
|
||||||
|
|
||||||
// same as binary market; map to everything to probability
|
// same as binary market; map to everything to probability
|
||||||
initialProbability: number
|
initialProbability: number
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { DPM_CREATOR_FEE } from '../../common/fees'
|
||||||
import { PrivateUser, User } from '../../common/user'
|
import { PrivateUser, User } from '../../common/user'
|
||||||
import { formatMoney, formatPercent } from '../../common/util/format'
|
import { formatMoney, formatPercent } from '../../common/util/format'
|
||||||
import { getValueFromBucket } from '../../common/calculate-dpm'
|
import { getValueFromBucket } from '../../common/calculate-dpm'
|
||||||
|
import { formatNumericProbability } from '../../common/numeric'
|
||||||
|
|
||||||
import { sendTemplateEmail } from './send-email'
|
import { sendTemplateEmail } from './send-email'
|
||||||
import { getPrivateUser, getUser } from './utils'
|
import { getPrivateUser, getUser } from './utils'
|
||||||
|
@ -88,10 +89,7 @@ const toDisplayResolution = (
|
||||||
resolutionProbability?: number,
|
resolutionProbability?: number,
|
||||||
resolutions?: { [outcome: string]: number }
|
resolutions?: { [outcome: string]: number }
|
||||||
) => {
|
) => {
|
||||||
if (
|
if (contract.outcomeType === 'BINARY') {
|
||||||
contract.outcomeType === 'BINARY' ||
|
|
||||||
contract.outcomeType === 'PSEUDO_NUMERIC'
|
|
||||||
) {
|
|
||||||
const prob = resolutionProbability ?? getProbability(contract)
|
const prob = resolutionProbability ?? getProbability(contract)
|
||||||
|
|
||||||
const display = {
|
const display = {
|
||||||
|
@ -104,6 +102,16 @@ const toDisplayResolution = (
|
||||||
return display || resolution
|
return display || resolution
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (contract.outcomeType === 'PSEUDO_NUMERIC') {
|
||||||
|
return (
|
||||||
|
contract.resolutionValue?.toString() ??
|
||||||
|
formatNumericProbability(
|
||||||
|
resolutionProbability ?? getProbability(contract),
|
||||||
|
contract
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
if (resolution === 'MKT' && resolutions) return 'MULTI'
|
if (resolution === 'MKT' && resolutions) return 'MULTI'
|
||||||
if (resolution === 'CANCEL') return 'N/A'
|
if (resolution === 'CANCEL') return 'N/A'
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,9 @@ export const resolveMarket = functions
|
||||||
} else if (outcomeType === 'NUMERIC') {
|
} else if (outcomeType === 'NUMERIC') {
|
||||||
if (isNaN(+outcome) && outcome !== 'CANCEL')
|
if (isNaN(+outcome) && outcome !== 'CANCEL')
|
||||||
return { status: 'error', message: 'Invalid outcome' }
|
return { status: 'error', message: 'Invalid outcome' }
|
||||||
|
} else if (outcomeType === 'PSEUDO_NUMERIC') {
|
||||||
|
if (probabilityInt === undefined && outcome !== 'CANCEL')
|
||||||
|
return { status: 'error', message: 'Invalid outcome' }
|
||||||
} else {
|
} else {
|
||||||
return { status: 'error', message: 'Invalid contract outcomeType' }
|
return { status: 'error', message: 'Invalid contract outcomeType' }
|
||||||
}
|
}
|
||||||
|
@ -62,7 +65,7 @@ export const resolveMarket = functions
|
||||||
return { status: 'error', message: 'Invalid value' }
|
return { status: 'error', message: 'Invalid value' }
|
||||||
|
|
||||||
if (
|
if (
|
||||||
outcomeType === 'BINARY' &&
|
(outcomeType === 'BINARY' || outcomeType === 'PSEUDO_NUMERIC') &&
|
||||||
probabilityInt !== undefined &&
|
probabilityInt !== undefined &&
|
||||||
(probabilityInt < 0 ||
|
(probabilityInt < 0 ||
|
||||||
probabilityInt > 100 ||
|
probabilityInt > 100 ||
|
||||||
|
@ -111,16 +114,19 @@ export const resolveMarket = functions
|
||||||
resolutionProbability
|
resolutionProbability
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const resolutionInfo =
|
||||||
|
outcome !== 'CANCEL'
|
||||||
|
? { resolutionValue: value, resolutionProbability, resolutions }
|
||||||
|
: {}
|
||||||
|
|
||||||
await contractDoc.update(
|
await contractDoc.update(
|
||||||
removeUndefinedProps({
|
removeUndefinedProps({
|
||||||
isResolved: true,
|
isResolved: true,
|
||||||
resolution: outcome,
|
resolution: outcome,
|
||||||
resolutionValue: value,
|
|
||||||
resolutionTime,
|
resolutionTime,
|
||||||
closeTime: newCloseTime,
|
closeTime: newCloseTime,
|
||||||
resolutionProbability,
|
|
||||||
resolutions,
|
|
||||||
collectedFees,
|
collectedFees,
|
||||||
|
...resolutionInfo,
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -137,6 +137,13 @@ export function ContractCard(props: {
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{outcomeType === 'PSEUDO_NUMERIC' && (
|
||||||
|
<PseudoNumericResolutionOrExpectation
|
||||||
|
className="items-center"
|
||||||
|
contract={contract}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{outcomeType === 'NUMERIC' && (
|
{outcomeType === 'NUMERIC' && (
|
||||||
<NumericResolutionOrExpectation
|
<NumericResolutionOrExpectation
|
||||||
className="items-center"
|
className="items-center"
|
||||||
|
@ -296,7 +303,7 @@ export function PseudoNumericResolutionOrExpectation(props: {
|
||||||
className?: string
|
className?: string
|
||||||
}) {
|
}) {
|
||||||
const { contract, className } = props
|
const { contract, className } = props
|
||||||
const { resolution, resolutionProbability } = contract
|
const { resolution, resolutionValue, resolutionProbability } = contract
|
||||||
const textColor = `text-blue-400`
|
const textColor = `text-blue-400`
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -309,7 +316,8 @@ export function PseudoNumericResolutionOrExpectation(props: {
|
||||||
<CancelLabel />
|
<CancelLabel />
|
||||||
) : (
|
) : (
|
||||||
<div className="text-blue-400">
|
<div className="text-blue-400">
|
||||||
{formatNumericProbability(resolutionProbability ?? 0, contract)}
|
{resolutionValue ??
|
||||||
|
formatNumericProbability(resolutionProbability ?? 0, contract)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
|
|
|
@ -306,11 +306,15 @@ function QuickOutcomeView(props: {
|
||||||
// Return a number from 0 to 1 for this contract
|
// Return a number from 0 to 1 for this contract
|
||||||
// Resolved contracts are set to 1, for coloring purposes (even if NO)
|
// Resolved contracts are set to 1, for coloring purposes (even if NO)
|
||||||
function getProb(contract: Contract) {
|
function getProb(contract: Contract) {
|
||||||
const { outcomeType, resolution } = contract
|
const { outcomeType, resolution, resolutionProbability } = contract
|
||||||
return resolution
|
return resolutionProbability
|
||||||
|
? resolutionProbability
|
||||||
|
: resolution
|
||||||
? 1
|
? 1
|
||||||
: outcomeType === 'BINARY'
|
: outcomeType === 'BINARY'
|
||||||
? getBinaryProb(contract)
|
? getBinaryProb(contract)
|
||||||
|
: outcomeType === 'PSEUDO_NUMERIC'
|
||||||
|
? getProbability(contract)
|
||||||
: outcomeType === 'FREE_RESPONSE'
|
: outcomeType === 'FREE_RESPONSE'
|
||||||
? getOutcomeProbability(contract, getTopAnswer(contract)?.id || '')
|
? getOutcomeProbability(contract, getTopAnswer(contract)?.id || '')
|
||||||
: outcomeType === 'NUMERIC'
|
: outcomeType === 'NUMERIC'
|
||||||
|
|
|
@ -21,6 +21,7 @@ export function NumericResolutionPanel(props: {
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const { contract, className } = props
|
const { contract, className } = props
|
||||||
|
const { min, max, outcomeType } = contract
|
||||||
|
|
||||||
const [outcomeMode, setOutcomeMode] = useState<
|
const [outcomeMode, setOutcomeMode] = useState<
|
||||||
'NUMBER' | 'CANCEL' | undefined
|
'NUMBER' | 'CANCEL' | undefined
|
||||||
|
@ -32,15 +33,24 @@ export function NumericResolutionPanel(props: {
|
||||||
const [error, setError] = useState<string | undefined>(undefined)
|
const [error, setError] = useState<string | undefined>(undefined)
|
||||||
|
|
||||||
const resolve = async () => {
|
const resolve = async () => {
|
||||||
const finalOutcome = outcomeMode === 'NUMBER' ? outcome : 'CANCEL'
|
const finalOutcome =
|
||||||
|
outcomeMode === 'CANCEL'
|
||||||
|
? 'CANCEL'
|
||||||
|
: outcomeType === 'PSEUDO_NUMERIC'
|
||||||
|
? 'MKT'
|
||||||
|
: 'NUMBER'
|
||||||
if (outcomeMode === undefined || finalOutcome === undefined) return
|
if (outcomeMode === undefined || finalOutcome === undefined) return
|
||||||
|
|
||||||
setIsSubmitting(true)
|
setIsSubmitting(true)
|
||||||
|
|
||||||
|
const boundedValue = Math.max(Math.min(max, value ?? 0), min)
|
||||||
|
const probabilityInt = ((boundedValue - min) / (max - min)) * 100
|
||||||
|
|
||||||
const result = await resolveMarket({
|
const result = await resolveMarket({
|
||||||
outcome: finalOutcome,
|
outcome: finalOutcome,
|
||||||
value,
|
value,
|
||||||
contractId: contract.id,
|
contractId: contract.id,
|
||||||
|
probabilityInt,
|
||||||
}).then((r) => r.data)
|
}).then((r) => r.data)
|
||||||
|
|
||||||
console.log('resolved', outcome, 'result:', result)
|
console.log('resolved', outcome, 'result:', result)
|
||||||
|
@ -72,7 +82,7 @@ export function NumericResolutionPanel(props: {
|
||||||
|
|
||||||
{outcomeMode === 'NUMBER' && (
|
{outcomeMode === 'NUMBER' && (
|
||||||
<BucketInput
|
<BucketInput
|
||||||
contract={contract}
|
contract={contract as any}
|
||||||
isSubmitting={isSubmitting}
|
isSubmitting={isSubmitting}
|
||||||
onBucketChange={(v, o) => (setValue(v), setOutcome(o))}
|
onBucketChange={(v, o) => (setValue(v), setOutcome(o))}
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user