Merge pull request #527 from quantified-uncertainty/sampleN

Added sampleN to interface

packages/squiggle-lang/package.json

@@ -33,7 +33,6 @@
     "Rescript"
   ],
   "author": "Quantified Uncertainty Research Institute",
-  "license": "MIT",
   "dependencies": {
     "rescript": "^9.1.4",
     "jstat": "^1.9.5",

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

@@ -18,6 +18,7 @@ type outputType =
   | Dist(genericDist)
   | Float(float)
   | String(string)
+  | FloatArray(array<float>)
   | Bool(bool)
   | GenDistError(error)
 

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

@@ -14,6 +14,7 @@ type outputType =
   | Dist(genericDist)
   | Float(float)
   | String(string)
+  | FloatArray(array<float>)
   | Bool(bool)
   | GenDistError(error)
 

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

@@ -222,6 +222,8 @@ let dispatchToGenericOutput = (
     ->E.R.bind(r => r(f1, f2, f3))
     ->SymbolicConstructors.symbolicResultToOutput
   | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist, ~env)
+  | ("sampleN", [EvDistribution(dist), EvNumber(n)]) =>
+    Some(FloatArray(GenericDist.sampleN(dist, Belt.Int.fromFloat(n))))
   | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist, ~env)
   | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist, ~env)
   | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist, ~env)
@@ -336,6 +338,7 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result<
   | Float(d) => Ok(EvNumber(d))
   | String(d) => Ok(EvString(d))
   | Bool(d) => Ok(EvBool(d))
+  | FloatArray(d) => Ok(EvArray(d |> E.A.fmap(r => ReducerInterface_ExpressionValue.EvNumber(r))))
   | GenDistError(err) => Error(REDistributionError(err))
   }