Continuing cleanup of FunctionRegistry

packages/squiggle-lang/src/rescript/FunctionRegistry.res

@@ -241,38 +241,28 @@ module Registry = {
 let impossibleError = "Wrong inputs / Logically impossible"
 
 module Prepare = {
-  let twoNumberInputs = (inputs: array<value>) => {
+  let recordWithTwoArgsToValues = (inputs: array<value>): result<array<value>, string> =>
+    switch inputs {
+    | [Record([(_, n1), (_, n2)])] => Ok([n1, n2])
+    | _ => Error(impossibleError)
+    }
+
+  let twoNumberInputs = (inputs: array<value>): result<(float, float), string> => {
     switch inputs {
     | [Number(n1), Number(n2)] => Ok(n1, n2)
     | _ => Error(impossibleError)
     }
   }
 
-  let twoDistOrNumber = (values: array<value>) => {
+  let twoDistOrNumber = (values: array<value>): result<(distOrNumber, distOrNumber), string> => {
     switch values {
     | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2)
     | _ => Error(impossibleError)
     }
   }
 
-  let twoNumberInputsRecord = (v1: string, v2: string, inputs: array<value>) =>
+  let twoDistOrNumberFromRecord = (values: array<value>) =>
-    switch inputs {
+    values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber)
-    | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 =>
-      twoNumberInputs([n1, n2])
-    | _ => Error(impossibleError)
-    }
-
-  let twoNumberInputsRecord2 = (inputs: array<value>) =>
-    switch inputs {
-    | [Record([(_, n1), (_, n2)])] => twoNumberInputs([n1, n2])
-    | _ => Error(impossibleError)
-    }
-
-  let twoNumberInputsRecord3 = (inputs: array<value>) =>
-    switch inputs {
-    | [Record([(_, n1), (_, n2)])] => Ok([n1, n2])
-    | _ => Error(impossibleError)
-    }
 }
 
 module Wrappers = {
@@ -281,10 +271,11 @@ module Wrappers = {
   let symbolicEvDistribution = r => r->Symbolic->evDistribution
 }
 
-let twoDistsOrNumbers = (
+module Process = {
+  let twoDistsOrNumbersToDist = (
     ~fn: (float, float) => result<DistributionTypes.genericDist, string>,
     ~values: (distOrNumber, distOrNumber),
-) => {
+  ) => {
     let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000)
     let sampleSetToExpressionValue = (
       b: Belt.Result.t<QuriSquiggleLang.SampleSetDist.t, QuriSquiggleLang.DistributionTypes.error>,
@@ -327,14 +318,22 @@ let twoDistsOrNumbers = (
         sampleSetResult->sampleSetToExpressionValue
       }
     }
+  }
+
+  let twoDistsOrNumbersToDistUsingSymbolicDist = (
+    ~fn: (float, float) => result<SymbolicDistTypes.symbolicDist, string>,
+    ~values,
+  ) => {
+    twoDistsOrNumbersToDist(~fn=(a, b) => fn(a, b)->E.R2.fmap(Wrappers.symbolic), ~values)
+  }
 }
 
 module NormalFn = {
   let fnName = "normal"
-  let twoFloatsToSymoblic = (a1: float, a2: float) =>
+  let twoFloatsToSymoblic = (a1, a2) =>
-    SymbolicDist.Normal.make(a1, a2)->E.R2.fmap(Wrappers.symbolic)
+    SymbolicDist.Normal.make(a1, a2)
-  let twoFloatsToSymbolic90P = (a1: float, a2: float) =>
+  let twoFloatsToSymbolic90P = (a1, a2) =>
-    SymbolicDist.Normal.from90PercentCI(a1, a2)->Wrappers.symbolic->Ok
+    SymbolicDist.Normal.from90PercentCI(a1, a2)->Ok
 
   let toFn = Function.make(
     ~name="Normal",
@@ -345,7 +344,7 @@ module NormalFn = {
         ~run=inputs => {
           inputs
           ->Prepare.twoDistOrNumber
-          ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_))
+          ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_))
         },
       ),
       Function.makeDefinition(
@@ -353,18 +352,16 @@ module NormalFn = {
         ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])],
         ~run=inputs =>
           inputs
-          ->Prepare.twoNumberInputsRecord3
+          ->Prepare.twoDistOrNumberFromRecord
-          ->E.R.bind(Prepare.twoDistOrNumber)
+          ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_)),
-          ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)),
       ),
       Function.makeDefinition(
         ~name=fnName,
         ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])],
         ~run=inputs =>
           inputs
-          ->Prepare.twoNumberInputsRecord3
+          ->Prepare.twoDistOrNumberFromRecord
-          ->E.R.bind(Prepare.twoDistOrNumber)
+          ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymbolic90P, ~values=_)),
-          ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)),
       ),
     ],
   )
@@ -385,25 +382,23 @@ module LognormalFn = {
       Function.makeDefinition(~name=fnName, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs =>
         inputs
         ->Prepare.twoDistOrNumber
-        ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_))
+        ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymoblic, ~values=_))
       ),
       Function.makeDefinition(
         ~name=fnName,
         ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])],
         ~run=inputs =>
           inputs
-          ->Prepare.twoNumberInputsRecord3
+          ->Prepare.twoDistOrNumberFromRecord
-          ->E.R.bind(Prepare.twoDistOrNumber)
+          ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymbolic90P, ~values=_)),
-          ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)),
       ),
       Function.makeDefinition(
         ~name=fnName,
         ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])],
         ~run=inputs =>
           inputs
-          ->Prepare.twoNumberInputsRecord3
+          ->Prepare.twoDistOrNumberFromRecord
-          ->E.R.bind(Prepare.twoDistOrNumber)
+          ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToMeanStdev, ~values=_)),
-          ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToMeanStdev, ~values=_)),
       ),
     ],
   )