From 6a9179d4b8e0aeb0917f23502be507a6d35d6f5f Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 25 May 2022 14:40:39 -0400 Subject: [PATCH] Last cleanup Value: [1e-5 to 1e-3] --- .../Distributions/PointSetDist/Mixed.res | 6 ------ .../PointSetDist/PointSetDist_Scoring.res | 4 ++-- .../src/rescript/Utility/XYShape.res | 16 ---------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 71310156..78f3c85b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -300,12 +300,6 @@ module T = Dist({ | _ => XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } } - - // let klDivergence = (prediction: t, answer: t) => { - // let klDiscretePart = Discrete.T.klDivergence(prediction.discrete, answer.discrete) - // let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) - // E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) - // } }) let combineAlgebraically = (op: Operation.convolutionOperation, t1: t, t2: t): t => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 581fda7f..a228fcdc 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -34,9 +34,9 @@ module WithDistAnswer = { Operation.Error.t, > => switch (estimate, answer) { - | (Continuous(_), Continuous(_)) => + | (Continuous(_), Continuous(_)) + | (Discrete(_), Discrete(_)) => combineFn(integrand, estimate, answer)->E.R2.fmap(integrateFn) - | (Discrete(_), Discrete(_)) => combineFn(integrand, estimate, answer)->E.R2.fmap(integrateFn) | (_, _) => let esti = estimate->toMixedFn let answ = answer->toMixedFn diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 77fa2782..b49540e9 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -491,22 +491,6 @@ module PointwiseCombination = { let newYs = E.A.fmap(x => XtoY.linear(x, t), newXs) {xs: newXs, ys: newYs} } - // This function is used for klDivergence - let combineAlongSupportOfSecondArgument: ( - interpolator, - (float, float) => result, - T.t, - T.t, - ) => result = (interpolator, fn, prediction, answer) => { - let combineWithFn = (answerX: float, i: int) => { - let answerY = answer.ys[i] - // let predictionY = XtoY.linear(answerX, prediction) - let predictionY = interpolator(prediction, i, answerX) - fn(predictionY, answerY) - } - let newYsWithError = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) - E.A.R.firstErrorOrOpen(newYsWithError)->E.R2.fmap(ys => {xs: answer.xs, ys: ys}) - } let addCombine = (interpolator: interpolator, t1: T.t, t2: T.t): T.t => combine(interpolator, (a, b) => Ok(a +. b), t1, t2)->E.R.toExn(