From a266b8ed094bb8ee35f68a4bd3b1843045c36fba Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Wed, 25 May 2022 13:38:55 -0400
Subject: [PATCH] Fixed tests (plausibly slightly naively)

Value: [1e-4 to 1e-1]
---
 .../Distributions/PointSetDist/Mixed.res      |  3 ---
 .../PointSetDist/PointSetDist_Scoring.res     | 22 +++++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res
index c9d46efb..71310156 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res
@@ -306,9 +306,6 @@ module T = Dist({
   //    let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous)
   //    E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t))
   //  }
-  //  let logScoreWithPointResolution = (~prediction: t, ~answer: float, ~prior: option<t>) => {
-  //    Error(Operation.NotYetImplemented)
-  //  }
 })
 
 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 b302d83e..202397c5 100644
--- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res
@@ -29,8 +29,26 @@ module WithDistAnswer = {
       minusScaledLogOfQuot(~esti=estimateElement, ~answ=answerElement)
     }
 
-  let sum = (~estimate: t, ~answer: t, ~combineFn, ~integrateFn) =>
-    combineFn(integrand, estimate, answer)->E.R2.fmap(integrateFn)
+  let rec sum = (~estimate: t, ~answer: t, ~combineFn, ~integrateFn) =>
+    switch (estimate, answer) {
+    | ((Continuous(_) | Discrete(_)) as esti, (Continuous(_) | Discrete(_)) as answ) =>
+      combineFn(integrand, esti, answ)->E.R2.fmap(integrateFn)
+    | (Mixed(esti), Mixed(answ)) =>
+      E.R.merge(
+        sum(
+          ~estimate=Discrete(esti.discrete),
+          ~answer=Discrete(answ.discrete),
+          ~combineFn,
+          ~integrateFn,
+        ),
+        sum(
+          ~estimate=Continuous(esti.continuous),
+          ~answer=Continuous(answ.continuous),
+          ~combineFn,
+          ~integrateFn,
+        ),
+      )->E.R2.fmap(((discretePart, continuousPart)) => discretePart +. continuousPart)
+    }
 
   let sumWithPrior = (~estimate: t, ~answer: t, ~prior: t, ~combineFn, ~integrateFn): result<
     float,