Expose integralSum to Squiggle

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

@@ -68,6 +68,7 @@ module DistributionOperation = {
     | #Pdf(float)
     | #Mean
     | #Sample
+    | #IntegralSum
   ]
 
   type toScaleFn = [

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

@@ -62,26 +62,31 @@ let isNormalized = (t: t): bool => Js.Math.abs_float(integralEndY(t) -. 1.0) < 1
 let toFloatOperation = (
   t,
   ~toPointSetFn: toPointSetFn,
-  ~distToFloatOperation: Operation.distToFloatOperation,
+  ~distToFloatOperation: DistributionTypes.DistributionOperation.toFloat,
 ) => {
-  let trySymbolicSolution = switch (t: t) {
-  | Symbolic(r) => SymbolicDist.T.operate(distToFloatOperation, r)->E.R.toOption
-  | _ => None
-  }
+  switch distToFloatOperation {
+  | #IntegralSum => Ok(integralEndY(t))
+  | (#Pdf(_) | #Cdf(_) | #Inv(_) | #Mean | #Sample) as op => {
+      let trySymbolicSolution = switch (t: t) {
+      | Symbolic(r) => SymbolicDist.T.operate(op, r)->E.R.toOption
+      | _ => None
+      }
 
-  let trySampleSetSolution = switch ((t: t), distToFloatOperation) {
-  | (SampleSet(sampleSet), #Mean) => SampleSetDist.mean(sampleSet)->Some
-  | (SampleSet(sampleSet), #Sample) => SampleSetDist.sample(sampleSet)->Some
-  | (SampleSet(sampleSet), #Inv(r)) => SampleSetDist.percentile(sampleSet, r)->Some
-  | _ => None
-  }
+      let trySampleSetSolution = switch ((t: t), distToFloatOperation) {
+      | (SampleSet(sampleSet), #Mean) => SampleSetDist.mean(sampleSet)->Some
+      | (SampleSet(sampleSet), #Sample) => SampleSetDist.sample(sampleSet)->Some
+      | (SampleSet(sampleSet), #Inv(r)) => SampleSetDist.percentile(sampleSet, r)->Some
+      | _ => None
+      }
 
-  switch trySymbolicSolution {
-  | Some(r) => Ok(r)
-  | None =>
-    switch trySampleSetSolution {
-    | Some(r) => Ok(r)
-    | None => toPointSetFn(t)->E.R2.fmap(PointSetDist.operate(distToFloatOperation))
+      switch trySymbolicSolution {
+      | Some(r) => Ok(r)
+      | None =>
+        switch trySampleSetSolution {
+        | Some(r) => Ok(r)
+        | None => toPointSetFn(t)->E.R2.fmap(PointSetDist.operate(op))
+        }
+      }
     }
   }
 }
@@ -366,7 +371,6 @@ let pointwiseCombination = (
   ~algebraicCombination: Operation.algebraicOperation,
   ~t2: t,
 ): result<t, error> => {
-  Js.log2("PointwiseCombination", algebraicCombination);
   E.R.merge(toPointSetFn(t1), toPointSetFn(t2))->E.R.bind(((t1, t2)) =>
     PointSetDist.combinePointwise(Operation.Algebraic.toFn(algebraicCombination), t1, t2)
     ->E.R2.fmap(r => DistributionTypes.PointSet(r))

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

@@ -20,7 +20,7 @@ let isNormalized: t => bool
 let toFloatOperation: (
   t,
   ~toPointSetFn: toPointSetFn,
-  ~distToFloatOperation: Operation.distToFloatOperation,
+  ~distToFloatOperation: DistributionTypes.DistributionOperation.toFloat,
 ) => result<float, error>
 
 @genType

packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res

@@ -196,6 +196,7 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall): option<
     ->SymbolicConstructors.symbolicResultToOutput
   | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist)
   | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist)
+  | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist)
   | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist)
   | ("toSparkline", [EvDistribution(dist)]) => Helpers.toStringFn(ToSparkline(20), dist)
   | ("toSparkline", [EvDistribution(dist), EvNumber(n)]) =>