quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed logScoreAgainstImproperPrior by finding how it was None

Browse Source 
Value: [1e-4 to 8e-2]
This commit is contained in:
Quinn Dougherty 2022-05-12 15:26:51 -04:00
parent 51310819a1
commit 65751e590a
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res
View File

@ -160,16 +160,16 @@ module Helpers = {
let constructNonNormalizedPointSet = ( let constructNonNormalizedPointSet = (
~supportOf: DistributionTypes.genericDist, ~supportOf: DistributionTypes.genericDist,
fn: float => float, fn: float => float,
): option<DistributionTypes.genericDist> => { ): DistributionTypes.genericDist => {
switch supportOf { let cdf = x => toFloatFn(#Cdf(x), supportOf)
| PointSet(Continuous(dist)) => let leftEndpoint = cdf(MagicNumbers.Epsilon.ten)
{xs: dist.xyShape.xs, ys: E.A.fmap(fn, dist.xyShape.xs)} let rightEndpoint = cdf(1.0 -. MagicNumbers.Epsilon.ten)
->Continuous.make let xs = switch (leftEndpoint, rightEndpoint) {
->Continuous | (Some(Float(a)), Some(Float(b))) =>
->PointSet E.A.Floats.range(a, b, MagicNumbers.Environment.defaultXYPointLength)
->Some | _ => []
| _ => None
} }
{xs: xs, ys: E.A.fmap(fn, xs)}->Continuous.make->Continuous->DistributionTypes.PointSet
} }
} }
@ -253,16 +253,18 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment)
"logScore", "logScore",
[EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], [EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))],
) => ) =>
Some(runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))) runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))->Some
| ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)]) | ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)])
| ( | (
"logScoreAgainstImproperPrior", "logScoreAgainstImproperPrior",
[EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))],
) => ) =>
E.O.fmap( runGenericOperation(
d => runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), d)), FromDist(
Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0), ToScore(LogScore(prediction, answer)),
) Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0),
),
)->Some
| ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist)
| ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist)
| ("scaleLog", [EvDistribution(dist)]) => | ("scaleLog", [EvDistribution(dist)]) =>