Merge remote-tracking branch 'origin/scoring-cleanup-refactor' into scoring-cleanup-three

packages/squiggle-lang/src/rescript/Distributions/GenericDist.res

@@ -128,47 +128,71 @@ module Score = {
     ~answ: genericDistOrScalar,
     ~prior: option<genericDistOrScalar>,
   ): result<PointSetDist_Scoring.scoreArgs, error> => {
-    let toPointSetFn = toPointSet(
+// <<<<<<< HEAD
+//    let toPointSetFn = toPointSet(
+//      ~xyPointLength=MagicNumbers.Environment.defaultXYPointLength,
+//      ~sampleCount=MagicNumbers.Environment.defaultSampleCount,
+//      ~xSelection=#ByWeight,
+//    )
+//    let twoDists = PointSetDist_Scoring.twoGenericDistsToTwoPointSetDists
+//    let prior': option<result<psDistOrScalar, error>> = switch prior {
+//    | None => None
+//    | Some(GDist(d)) => toPointSetFn(d, ())->E.R2.fmap(x => x->PSDist)->Some
+//    | Some(GScalar(s)) => s->PSScalar->Ok->Some
+//    }
+//    switch (esti, answ, prior') {
+//    | (GDist(esti'), GDist(answ'), None) =>
+//      twoDists(~toPointSetFn, esti', answ')->E.R2.fmap(((esti'', answ'')) =>
+//        {estimate: esti'', answer: answ'', prior: None}
+//        ->PointSetDist_Scoring.DistEstimateDistAnswer
+// =======
+    let toPointSetFn = t =>
+      toPointSet(
+        t,
         ~xyPointLength=MagicNumbers.Environment.defaultXYPointLength,
         ~sampleCount=MagicNumbers.Environment.defaultSampleCount,
         ~xSelection=#ByWeight,
+        (),
       )
-    let twoDists = PointSetDist_Scoring.twoGenericDistsToTwoPointSetDists
-    let prior': option<result<psDistOrScalar, error>> = switch prior {
+    let prior': option<result<pointSet_ScoreDistOrScalar, error>> = switch prior {
     | None => None
-    | Some(GDist(d)) => toPointSetFn(d, ())->E.R2.fmap(x => x->PSDist)->Some
-    | Some(GScalar(s)) => s->PSScalar->Ok->Some
+    | Some(Score_Dist(d)) => toPointSetFn(d)->E.R.bind(x => x->D->Ok)->Some
+    | Some(Score_Scalar(s)) => s->S->Ok->Some
     }
+    let twoDists = (esti': t, answ': t): result<
+      (PointSetTypes.pointSetDist, PointSetTypes.pointSetDist),
+      error,
+    > => E.R.merge(toPointSetFn(esti'), toPointSetFn(answ'))
     switch (esti, answ, prior') {
-    | (GDist(esti'), GDist(answ'), None) =>
-      twoDists(~toPointSetFn, esti', answ')->E.R2.fmap(((esti'', answ'')) =>
-        {estimate: esti'', answer: answ'', prior: None}
-        ->PointSetDist_Scoring.DistEstimateDistAnswer
+    | (Score_Dist(esti'), Score_Dist(answ'), None) =>
+      twoDists(esti', answ')->E.R2.fmap(((esti'', answ'')) =>
+        {estimate: esti'', answer: answ'', prior: None}->PointSetDist_Scoring.DistEstimateDistAnswer
+// >>>>>>> origin/scoring-cleanup-refactor
       )
     | (GDist(esti'), GDist(answ'), Some(Ok(PSDist(prior'')))) =>
       twoDists(~toPointSetFn, esti', answ')->E.R2.fmap(((esti'', answ'')) =>
         {estimate: esti'', answer: answ'', prior: Some(prior'')}
         ->PointSetDist_Scoring.DistEstimateDistAnswer
       )
-    | (GDist(_), _, Some(Ok(PSScalar(_)))) => DistributionTypes.Unreachable->Error
-    | (GDist(esti'), GScalar(answ'), None) =>
-      toPointSetFn(esti', ())->E.R.bind(esti'' =>
+    | (Score_Dist(_), _, Some(Ok(S(_)))) => DistributionTypes.Unreachable->Error
+    | (Score_Dist(esti'), Score_Scalar(answ'), None) =>
+      toPointSetFn(esti')->E.R.bind(esti'' =>
         {estimate: esti'', answer: answ', prior: None}
         ->PointSetDist_Scoring.DistEstimateScalarAnswer
         ->Ok
       )
-    | (GDist(esti'), GScalar(answ'), Some(Ok(PSDist(prior'')))) =>
-      toPointSetFn(esti', ())->E.R2.fmap(esti'' =>
+    | (Score_Dist(esti'), Score_Scalar(answ'), Some(Ok(D(prior'')))) =>
+      toPointSetFn(esti')->E.R.bind(esti'' =>
         {estimate: esti'', answer: answ', prior: Some(prior'')}
         ->PointSetDist_Scoring.DistEstimateScalarAnswer
       )
-    | (GScalar(esti'), GDist(answ'), None) =>
-      toPointSetFn(answ', ())->E.R2.fmap(answ'' =>
+    | (Score_Scalar(esti'), Score_Dist(answ'), None) =>
+      toPointSetFn(answ')->E.R.bind(answ'' =>
         {estimate: esti', answer: answ'', prior: None}
         ->PointSetDist_Scoring.ScalarEstimateDistAnswer
       )
-    | (GScalar(esti'), GDist(answ'), Some(Ok(PSScalar(prior'')))) =>
-      toPointSetFn(answ', ())->E.R2.fmap(answ'' =>
+    | (Score_Scalar(esti'), Score_Dist(answ'), Some(Ok(S(prior'')))) =>
+      toPointSetFn(answ')->E.R.bind(answ'' =>
         {estimate: esti', answer: answ'', prior: Some(prior'')}
         ->PointSetDist_Scoring.ScalarEstimateDistAnswer
       )

packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res

@@ -1,11 +1,11 @@
-type t = PointSetTypes.pointSetDist
+type pointSetDist = PointSetTypes.pointSetDist
 
 type scalar = float
 type abstractScoreArgs<'a, 'b> = {estimate: 'a, answer: 'b, prior: option<'a>}
 type scoreArgs =
-  | DistEstimateDistAnswer(abstractScoreArgs<t, t>)
-  | DistEstimateScalarAnswer(abstractScoreArgs<t, scalar>)
-  | ScalarEstimateDistAnswer(abstractScoreArgs<scalar, t>)
+  | DistEstimateDistAnswer(abstractScoreArgs<pointSetDist, pointSetDist>)
+  | DistEstimateScalarAnswer(abstractScoreArgs<pointSetDist, scalar>)
+  | ScalarEstimateDistAnswer(abstractScoreArgs<scalar, pointSetDist>)
   | ScalarEstimateScalarAnswer(abstractScoreArgs<scalar, scalar>)
 
 let logFn = Js.Math.log // base e
@@ -29,15 +29,17 @@ module WithDistAnswer = {
       minusScaledLogOfQuotient(~esti=estimateElement, ~answ=answerElement)
     }
 
-  let rec sum = (~estimate: t, ~answer: t, ~combineFn, ~integrateFn, ~toMixedFn): result<
-    float,
-    Operation.Error.t,
-  > =>
-    switch (estimate, answer) {
-    | (Continuous(_), Continuous(_))
-    | (Discrete(_), Discrete(_)) =>
+  let sum = (
+    ~estimate: pointSetDist,
+    ~answer: pointSetDist,
+    ~combineFn,
+    ~integrateFn,
+    ~toMixedFn,
+  ): result<float, Operation.Error.t> => {
+    let combineAndIntegrate = (estimate, answer) =>
       combineFn(integrand, estimate, answer)->E.R2.fmap(integrateFn)
-    | (_, _) =>
+
+    let getMixedSums = (estimate: pointSetDist, answer: pointSetDist) => {
       let esti = estimate->toMixedFn
       let answ = answer->toMixedFn
       switch (
@@ -53,29 +55,31 @@ module WithDistAnswer = {
           Some(answDiscretePart),
         ) =>
         E.R.merge(
-          sum(
-            ~estimate=Discrete(estiDiscretePart),
-            ~answer=Discrete(answDiscretePart),
-            ~combineFn,
-            ~integrateFn,
-            ~toMixedFn,
+          combineAndIntegrate(
+            PointSetTypes.Discrete(estiDiscretePart),
+            PointSetTypes.Discrete(answDiscretePart),
           ),
-          sum(
-            ~estimate=Continuous(estiContinuousPart),
-            ~answer=Continuous(answContinuousPart),
-            ~combineFn,
-            ~integrateFn,
-            ~toMixedFn,
-          ),
-        )->E.R2.fmap(((discretePart, continuousPart)) => discretePart +. continuousPart)
+          combineAndIntegrate(Continuous(estiContinuousPart), Continuous(answContinuousPart)),
+        )
       | (_, _, _, _) => `unreachable state`->Operation.Other->Error
       }
     }
 
+    switch (estimate, answer) {
+    | (Continuous(_), Continuous(_))
+    | (Discrete(_), Discrete(_)) =>
+      combineAndIntegrate(estimate, answer)
+    | (_, _) =>
+      getMixedSums(estimate, answer)->E.R2.fmap(((discretePart, continuousPart)) =>
+        discretePart +. continuousPart
+      )
+    }
+  }
+
   let sumWithPrior = (
-    ~estimate: t,
-    ~answer: t,
-    ~prior: t,
+    ~estimate: pointSetDist,
+    ~answer: pointSetDist,
+    ~prior: pointSetDist,
     ~combineFn,
     ~integrateFn,
     ~toMixedFn,
@@ -87,7 +91,12 @@ module WithDistAnswer = {
 }
 
 module WithScalarAnswer = {
-  let score' = (~estimatePdf: float => float, ~answer: float): result<float, Operation.Error.t> => {
+  let sum = (mp: PointSetTypes.MixedPoint.t): float => mp.continuous +. mp.discrete
+  let score = (~estimate: pointSetDist, ~answer: scalar): result<float, Operation.Error.t> => {
+    let _score = (~estimatePdf: float => float, ~answer: float): result<
+      float,
+      Operation.Error.t,
+    > => {
       let density = answer->estimatePdf
       if density < 0.0 {
         Operation.PdfInvalidError->Error
@@ -97,7 +106,21 @@ module WithScalarAnswer = {
         density->logFn->(x => -.x)->Ok
       }
     }
-  let scoreWithPrior' = (
+
+    let estimatePdf = x =>
+      switch estimate {
+      | Continuous(esti) => Continuous.T.xToY(x, esti)->sum
+      | Discrete(esti) => Discrete.T.xToY(x, esti)->sum
+      | Mixed(esti) => Mixed.T.xToY(x, esti)->sum
+      }
+    _score(~estimatePdf, ~answer)
+  }
+
+  let scoreWithPrior = (~estimate: pointSetDist, ~answer: scalar, ~prior: pointSetDist): result<
+    float,
+    Operation.Error.t,
+  > => {
+    let _scoreWithPrior = (
       ~estimatePdf: float => float,
       ~answer: scalar,
       ~priorPdf: float => float,
@@ -109,25 +132,10 @@ module WithScalarAnswer = {
       } else if numerator == 0.0 || priorDensityOfAnswer == 0.0 {
         infinity->Ok
       } else {
-      minusScaledLogOfQuotient(~esti=numerator, ~answ=priorDensityOfAnswer)
+        minusScaledLogOfQuot(~esti=numerator, ~answ=priorDensityOfAnswer)
       }
     }
 
-  let sum = (mp: PointSetTypes.MixedPoint.t): float => mp.continuous +. mp.discrete
-  let score = (~estimate: t, ~answer: scalar): result<float, Operation.Error.t> => {
-    let estimatePdf = x =>
-      switch estimate {
-      | Continuous(esti) => Continuous.T.xToY(x, esti)->sum
-      | Discrete(esti) => Discrete.T.xToY(x, esti)->sum
-      | Mixed(esti) => Mixed.T.xToY(x, esti)->sum
-      }
-
-    score'(~estimatePdf, ~answer)
-  }
-  let scoreWithPrior = (~estimate: t, ~answer: scalar, ~prior: t): result<
-    float,
-    Operation.Error.t,
-  > => {
     let estimatePdf = x =>
       switch estimate {
       | Continuous(esti) => Continuous.T.xToY(x, esti)->sum
@@ -140,7 +148,7 @@ module WithScalarAnswer = {
       | Discrete(prio) => Discrete.T.xToY(x, prio)->sum
       | Mixed(prio) => Mixed.T.xToY(x, prio)->sum
       }
-    scoreWithPrior'(~estimatePdf, ~answer, ~priorPdf)
+    _scoreWithPrior(~estimatePdf, ~answer, ~priorPdf)
   }
 }