From ac7b1ee9d5ec7c954bcd76f58c3791468dbcf0a6 Mon Sep 17 00:00:00 2001
From: Ozzie Gooen <ozzieagooen@gmail.com>
Date: Sun, 19 Jul 2020 23:08:27 +0100
Subject: [PATCH] SymbolicDistFloat adjustment for choose in ExpressionTree

---
 src/components/DistBuilder.re                          | 8 ++++----
 src/distPlus/expressionTree/ExpressionTreeEvaluator.re | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/DistBuilder.re b/src/components/DistBuilder.re
index ae00fbb6..5488743b 100644
--- a/src/components/DistBuilder.re
+++ b/src/components/DistBuilder.re
@@ -180,10 +180,10 @@ let make = () => {
         unitType: "UnspecifiedDistribution",
         zero: MomentRe.momentNow(),
         unit: "days",
-        sampleCount: "3000",
-        outputXYPoints: "100",
-        downsampleTo: "100",
-        kernelWidth: "5",
+        sampleCount: "30000",
+        outputXYPoints: "1000",
+        downsampleTo: "",
+        kernelWidth: "",
       },
       (),
     );
diff --git a/src/distPlus/expressionTree/ExpressionTreeEvaluator.re b/src/distPlus/expressionTree/ExpressionTreeEvaluator.re
index e93176b2..3993faaa 100644
--- a/src/distPlus/expressionTree/ExpressionTreeEvaluator.re
+++ b/src/distPlus/expressionTree/ExpressionTreeEvaluator.re
@@ -36,6 +36,8 @@ module AlgebraicCombination = {
     let dLength = (r: DistTypes.discreteShape) =>
       r.xyShape |> XYShape.T.length;
     switch (t1, t2) {
+    | (`SymbolicDist(`Float(_)), _)
+    | (_, `SymbolicDist(`Float(_))) => `Analytical
     | (`RenderedDist(Continuous(_)), `RenderedDist(Continuous(_))) => `Sampling
     | (`RenderedDist(Discrete(m1)), `RenderedDist(Discrete(m2)))
         when dLength(m1) * dLength(m2) > 1000 => `Analytical
@@ -48,7 +50,7 @@ module AlgebraicCombination = {
     | _ => `Sampling
     };
   };
-  let foo =
+  let combine =
       (evaluationParams, algebraicOp, t1: node, t2: node)
       : result(node, string) => {
     E.R.merge(
@@ -90,7 +92,7 @@ module AlgebraicCombination = {
          _,
          fun
          | `SymbolicDist(_) as t => Ok(t)
-         | _ => foo(evaluationParams, algebraicOp, t1, t2),
+         | _ => combine(evaluationParams, algebraicOp, t1, t2),
        );
 };