Cleanup from previous refactor

packages/squiggle-lang/__tests__/Distributions/DistributionOperation_test.res

@@ -90,15 +90,6 @@ describe("toPointSet", () => {
     expect(result)->toBeSoCloseTo(5.0, ~digits=0)
   })
 
-  test("on sample set distribution with under 4 points", () => {
-    let sampleSet = SampleSetDist.make([0.0, 1.0, 2.0, 3.0]) -> E.R.toExn;
-    let result =
-      run(FromDist(ToDist(ToPointSet), SampleSet(sampleSet)))->outputMap(
-        FromDist(ToFloat(#Mean)),
-      )
-    expect(result)->toEqual(GenDistError(Other("Converting sampleSet to pointSet failed")))
-  })
-
   test("on sample set", () => {
     let result =
       run(FromDist(ToDist(ToPointSet), normalDist5))

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

@@ -65,7 +65,7 @@ let toPointSet = (
   | PointSet(pointSet) => Ok(pointSet)
   | Symbolic(r) => Ok(SymbolicDist.T.toPointSetDist(~xSelection, xyPointLength, r))
   | SampleSet(r) =>
-    SampleSetDist.toPointSetDist2(
+    SampleSetDist.toPointSetDist(
       ~samples=r,
       ~samplingInputs={
         sampleCount: sampleCount,

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

@@ -15,14 +15,18 @@ module T: {
 
 include T
 
-let length = (t:t) => get(t) |> E.A.length;
+let length = (t: t) => get(t) |> E.A.length
 
-// TODO: Refactor to raise correct error when not enough samples
+// TODO: Refactor to get error in the toPointSetDist function, instead of adding at very end.
-let toPointSetDist = (~samples: t, ~samplingInputs: SamplingInputs.samplingInputs, ()) =>
+let toPointSetDist = (~samples: t, ~samplingInputs: SamplingInputs.samplingInputs, ()): result<
-  SampleSetDist_ToPointSet.toPointSetDist(~samples=get(samples), ~samplingInputs, ())
+  PointSetTypes.pointSetDist,
-
+  string,
-let toPointSetDist2 = (~samples: t, ~samplingInputs: SamplingInputs.samplingInputs, ()) =>
+> =>
-  SampleSetDist_ToPointSet.toPointSetDist(~samples=get(samples), ~samplingInputs, ()).pointSetDist |> E.O.toResult("Failed to convert to PointSetDist")
+  SampleSetDist_ToPointSet.toPointSetDist(
+    ~samples=get(samples),
+    ~samplingInputs,
+    (),
+  ).pointSetDist |> E.O.toResult("Failed to convert to PointSetDist")
 
 //Randomly get one sample from the distribution
 let sample = (t: t): float => {

packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res

@@ -224,9 +224,8 @@ module SamplingDistribution = {
 
       let pointSetDist = 
         sampleSetDist
-        -> E.R2.fmap(r =>
+        -> E.R.bind(r =>
-          SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r, ()))
+          SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r, ()));
-        -> E.R.bind(r => r.pointSetDist |> E.O.toResult("combineShapesUsingSampling Error"))
       pointSetDist |> E.R.fmap(r => #Normalize(#RenderedDist(r)))
     })
   }