Merge pull request #441 from quantified-uncertainty/fromsamples-fix

Small cleanup to fromSamples

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

@@ -189,10 +189,9 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => {
     ->GenericDist.mixture(~scaleMultiplyFn=scaleMultiply, ~pointwiseAddFn=pointwiseAdd)
     ->E.R2.fmap(r => Dist(r))
     ->OutputLocal.fromResult
-  | FromArray(xs) =>
+  | FromSamples(xs) => xs
-    xs
     ->SampleSetDist.make
-    ->E.R2.fmap2(x => DistributionTypes.SampleSetError(x))
+    ->E.R2.errMap(x => DistributionTypes.SampleSetError(x))
     ->E.R2.fmap(x => x->DistributionTypes.SampleSet->Dist)
     ->OutputLocal.fromResult
   }

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

@@ -97,8 +97,8 @@ module DistributionOperation = {
   type genericFunctionCallInfo =
     | FromDist(fromDist, genericDist)
     | FromFloat(fromDist, float)
+    | FromSamples(array<float>)
     | Mixture(array<(genericDist, float)>)
-    | FromArray(SampleSetDist.t)
 
   let distCallToString = (distFunction: fromDist): string =>
     switch distFunction {
@@ -123,7 +123,7 @@ module DistributionOperation = {
     switch d {
     | FromDist(f, _) | FromFloat(f, _) => distCallToString(f)
     | Mixture(_) => `mixture`
-    | FromArray(_) => `samples`
+    | FromSamples(_) => `fromSamples`
     }
 }
 module Constructors = {
@@ -140,7 +140,7 @@ module Constructors = {
     let isNormalized = (dist): t => FromDist(ToBool(IsNormalized), dist)
     let toPointSet = (dist): t => FromDist(ToDist(ToPointSet), dist)
     let toSampleSet = (dist, r): t => FromDist(ToDist(ToSampleSet(r)), dist)
-    let fromSamples = (xs): t => FromArray(xs)
+    let fromSamples = (xs): t => FromSamples(xs)
     let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist)
     let inspect = (dist): t => FromDist(ToDist(Inspect), dist)
     let toString = (dist): t => FromDist(ToString(ToString), dist)

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

@@ -218,17 +218,14 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall): option<
     Helpers.toDistFn(ToSampleSet(Belt.Int.fromFloat(float)), dist)
   | ("toSampleSet", [EvDistribution(dist)]) =>
     Helpers.toDistFn(ToSampleSet(MagicNumbers.Environment.defaultSampleCount), dist)
-  | ("fromSamples", [EvArray(arr)]) =>
+  | ("fromSamples", [EvArray(inputArray)]) => {
-    Helpers.toDistFn(
+      let _wrapInputErrors = x => SampleSetDist.NonNumericInput(x)
-      ToSampleSet(MagicNumbers.Environment.defaultSampleCount),
+      let parsedArray = Helpers.parseNumberArray(inputArray)->E.R2.errMap(_wrapInputErrors)
-      arr
+      switch parsedArray {
-      ->Helpers.parseNumberArray
+      | Ok(array) => runGenericOperation(FromSamples(array))
-      ->E.R2.fmap2(x => SampleSetDist.NonNumericInput(x))
+      | Error(e) => GenDistError(SampleSetError(e))
-      ->E.R.bind(SampleSetDist.make)
+      }->Some
-      ->E.R2.fmap(x => DistributionTypes.SampleSet(x))
+    }
-      // Raising here isn't ideal. This: GenDistError(SampleSetError(NonNumericInput("Something wasn't a number"))) would be proper.
-      ->E.R2.toExn("Something in the input wasn't a number"),
-    )
   | ("inspect", [EvDistribution(dist)]) => Helpers.toDistFn(Inspect, dist)
   | ("truncateLeft", [EvDistribution(dist), EvNumber(float)]) =>
     Helpers.toDistFn(Truncate(Some(float), None), dist)

packages/squiggle-lang/src/rescript/Utility/E.res

@@ -289,6 +289,13 @@ module R = {
     | Ok(r) => r->Ok
     | Error(x) => x->f->Error
     }
+
+  //I'm not sure what to call this.
+  let unify = (a: result<'a, 'b>, c: 'b => 'a): 'a =>
+    switch a {
+    | Ok(x) => x
+    | Error(x) => c(x)
+    }
 }
 
 module R2 = {