Changed default example

src/components/DistBuilder.re

@@ -183,7 +183,9 @@ module DemoDist = {
                     |> E.R.bind(_, a =>
                          switch (a) {
                          | `DistPlus(d) => Ok((r, DistPlus.T.normalize(d)))
-                         | n => {Js.log2("Error here",n); Error("wrong type")}
+                         | n =>
+                           Js.log2("Error here", n);
+                           Error("wrong type");
                          }
                        )
                   )
@@ -214,9 +216,17 @@ let make = () => {
       ~initialState={
         //guesstimatorString: "mm(normal(-10, 2), uniform(18, 25), lognormal({mean: 10, stdev: 8}), triangular(31,40,50))",
         guesstimatorString: "
-foo(t) = normal(t,2)
+        us_economy_2018 = (10.5 to 10.6)T
-bar(t) = foo(t)
+growth_rate = 1.08 to 1.2
-bar",
+us_economy(t) = us_economy_2018 * (growth_rate^t)
+
+us_population_2019 = 320M to 330M
+us_population_growth_rate = 1.01 to 1.02
+us_population(t) = us_population_2019 * (us_population_growth_rate^t)
+
+gdp_per_person(t) = us_economy(t)/us_population(t)
+gdp_per_person
+",
         domainType: "Complete",
         xPoint: "50.0",
         xPoint2: "60.0",

src/components/charts/DistPlusPlotReducer.re

@@ -107,5 +107,6 @@ let init = {
   showPercentiles: false,
   distributions: [
     {yLog: false, xLog: false, isCumulative: false, height: 4},
+    {yLog: false, xLog: false, isCumulative: true, height: 1},
   ],
 };

src/components/charts/DistributionPlot/spec-percentiles.json

@@ -78,7 +78,7 @@
       "type": "linear",
       "range": "height",
       "nice": true,
-      "zero": false,
+      "zero": true,
       "domain": { "data": "facet", "field": "p99" }
     }
   ],

src/distPlus/expressionTree/Functions.re

@@ -46,6 +46,9 @@ let to_: (float, float) => result(node, string) =
 // let render = {"inputs": [`dist], "outputs": [`renderedDist]};
 // let render = {"inputs": [`distRenderedDist], "outputs": [`renderedDist]};
 
+// type types = [`Float| `Dist];
+// type def = {types};
+
 let fnn =
     (
       evaluationParams: ExpressionTypes.ExpressionTree.evaluationParams,