From 5c9f57a24a66196cace59b5856c981608cf84712 Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@protonmail.com>
Date: Wed, 11 May 2022 12:56:56 -0400
Subject: [PATCH] fix: Attain parity with previous implementation

This is achieved by not adding more points in between i
the points are already pretty close
---
 .../src/rescript/MagicNumbers.res             |  2 +-
 .../src/rescript/Utility/XYShape.res          | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res
index cd8cfd2f..57e33e3b 100644
--- a/packages/squiggle-lang/src/rescript/MagicNumbers.res
+++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res
@@ -11,7 +11,7 @@ module Epsilon = {
 
 module Environment = {
   let defaultXYPointLength = 1000
-  let defaultSampleCount = 10000
+  let defaultSampleCount = 1000
   let enrichmentFactor = 10
 }
 
diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res
index 3daa6c6d..01b59670 100644
--- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res
+++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res
@@ -468,18 +468,24 @@ module PointwiseCombination = {
     }
 
     let getInBetween = (x1: float, x2: float): array<float> => {
-      let newPointsArray = Belt.Array.makeBy(points - 1, i => i)
-      // don't repeat the x2 point, it will be gotten in the next iteration.
-      let result = Js.Array.mapi((pos, i) =>
-        switch i {
-        | 0 => x1
-        | _ =>
-          x1 *.
-          (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /.
-          Belt.Float.fromInt(points) +. x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points)
+      switch x1 -. x2 > 2.0 *. MagicNumbers.Epsilon.seven {
+      | false => [x1]
+      | true => {
+          let newPointsArray = Belt.Array.makeBy(points - 1, i => i)
+          // don't repeat the x2 point, it will be gotten in the next iteration.
+          let result = Js.Array.mapi((pos, i) =>
+            switch i {
+            | 0 => x1
+            | _ =>
+              x1 *.
+              (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /.
+              Belt.Float.fromInt(points) +.
+                x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points)
+            }
+          , newPointsArray)
+          result
         }
-      , newPointsArray)
-      result
+      }
     }
     let newXsUnflattened = Js.Array.mapi((x, i) =>
       switch i < length - 2 {