From 5bdb229b56d08051ddac9dec37a329e3a819aca3 Mon Sep 17 00:00:00 2001
From: Roman Galochkin <roman.redrat@gmail.com>
Date: Wed, 4 Mar 2020 10:50:11 +0300
Subject: [PATCH] Uses strings instead of floats/ints

---
 package.json                                  |   2 +-
 src/components/DistBuilder.re                 | 242 ++++++++----------
 .../charts/DistributionPlot/distPlotD3.js     |  33 +--
 yarn.lock                                     |   8 +-
 4 files changed, 135 insertions(+), 150 deletions(-)

diff --git a/package.json b/package.json
index 12536a55..5ffd925d 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "antd": "3.17.0",
     "autoprefixer": "9.7.4",
     "babel-jest": "25.1.0",
-    "bs-ant-design-alt": "2.0.0-alpha.31",
+    "bs-ant-design-alt": "2.0.0-alpha.33",
     "bs-css": "11.0.0",
     "bs-moment": "0.4.4",
     "bs-platform": "7.0.1",
diff --git a/src/components/DistBuilder.re b/src/components/DistBuilder.re
index a34a71b3..0041b018 100644
--- a/src/components/DistBuilder.re
+++ b/src/components/DistBuilder.re
@@ -6,21 +6,27 @@ module FormConfig = [%lenses
     guesstimatorString: string,
     //
     domainType: string, // Complete, LeftLimited(...), RightLimited(...), LeftAndRightLimited(..., ...)
-    xPoint: float,
-    xPoint2: float,
-    excludingProbabilityMass: float,
-    excludingProbabilityMass2: float,
+    xPoint: string,
+    xPoint2: string,
+    excludingProbabilityMass: string,
+    excludingProbabilityMass2: string,
     //
     unitType: string, // UnspecifiedDistribution, TimeDistribution(zero, unit)
     zero: MomentRe.Moment.t,
     unit: string,
     //
-    sampleCount: int,
-    outputXYPoints: int,
-    truncateTo: int,
+    sampleCount: string,
+    outputXYPoints: string,
+    truncateTo: string,
   }
 ];
 
+type options = {
+  sampleCount: int,
+  outputXYPoints: int,
+  truncateTo: option(int),
+};
+
 module Form = ReForm.Make(FormConfig);
 
 let schema = Form.Validation.Schema([||]);
@@ -43,47 +49,18 @@ module FieldString = {
   };
 };
 
-module FieldNumber = {
-  [@react.component]
-  let make = (~field, ~label, ~min=0) => {
-    <Form.Field
-      field
-      render={({handleChange, error, value, validate}) =>
-        <Antd.Form.Item label={label |> E.ste}>
-          <Antd.InputNumber
-            value
-            onChange=handleChange
-            min
-            onBlur={_ => validate()}
-            parser={str => {
-              let a = str |> Js.Float.fromString |> int_of_float;
-              a < min ? min : a;
-            }}
-          />
-        </Antd.Form.Item>
-      }
-    />;
-  };
-};
-
 module FieldFloat = {
   [@react.component]
-  let make =
-      (~field, ~label, ~className=Css.style([]), ~min=0., ~precision=2) => {
+  let make = (~field, ~label, ~className=Css.style([])) => {
     <Form.Field
       field
       render={({handleChange, error, value, validate}) =>
         <Antd.Form.Item label={label |> E.ste}>
-          <Antd.InputFloat
+          <Antd.Input
             value
-            precision
-            onChange=handleChange
+            onChange={BsReform.Helpers.handleChange(handleChange)}
             onBlur={_ => validate()}
             className
-            parser={str => {
-              let a = str |> Js.Float.fromString;
-              Js.Float.isNaN(a) ? min : a;
-            }}
           />
         </Antd.Form.Item>
       }
@@ -134,27 +111,23 @@ module Styles = {
 
 module DemoDist = {
   [@react.component]
-  let make =
-      (
-        ~guesstimatorString,
-        ~domain,
-        ~unit,
-        ~sampleCount,
-        ~outputXYPoints,
-        ~truncateTo,
-      ) => {
+  let make = (~guesstimatorString, ~domain, ~unit, ~options) => {
     <Antd.Card title={"Distribution" |> E.ste}>
       <div className=Styles.spacer />
       <div>
-        <div>
-          {DistPlusIngredients.make(~guesstimatorString, ~domain, ~unit, ())
+        {switch (domain, unit, options) {
+         | (Some(domain), Some(unit), Some(options)) =>
+           DistPlusIngredients.make(~guesstimatorString, ~domain, ~unit, ())
            |> DistPlusIngredients.toDistPlus(
-                ~sampleCount,
-                ~outputXYPoints,
-                ~truncateTo,
+                ~sampleCount=options.sampleCount,
+                ~outputXYPoints=options.outputXYPoints,
+                ~truncateTo=options.truncateTo,
               )
-           |> E.O.React.fmapOrNull(distPlus => <DistPlusPlot distPlus />)}
-        </div>
+           |> E.O.React.fmapOrNull(distPlus => <DistPlusPlot distPlus />)
+         | _ =>
+           "Nothing to show. Try to change the distribution description."
+           |> E.ste
+         }}
       </div>
     </Antd.Card>;
   };
@@ -171,16 +144,16 @@ let make = () => {
       ~initialState={
         guesstimatorString: "mm(5 to 20, floor(normal(20,2)), [.5, .5])",
         domainType: "Complete",
-        xPoint: 50.0,
-        xPoint2: 60.0,
-        excludingProbabilityMass2: 0.5,
-        excludingProbabilityMass: 0.3,
+        xPoint: "50.0",
+        xPoint2: "60.0",
+        excludingProbabilityMass2: "0.5",
+        excludingProbabilityMass: "0.3",
         unitType: "UnspecifiedDistribution",
         zero: MomentRe.momentNow(),
         unit: "days",
-        sampleCount: 1000,
-        outputXYPoints: 2000,
-        truncateTo: 500,
+        sampleCount: "1000",
+        outputXYPoints: "2000",
+        truncateTo: "500",
       },
       (),
     );
@@ -190,78 +163,98 @@ let make = () => {
     reform.submit();
   };
 
+  let xPoint = reform.state.values.xPoint |> Js.Float.fromString;
+  let xPoint2 = reform.state.values.xPoint2 |> Js.Float.fromString;
+  let excludingProbabilityMass =
+    reform.state.values.excludingProbabilityMass |> Js.Float.fromString;
+  let excludingProbabilityMass2 =
+    reform.state.values.excludingProbabilityMass2 |> Js.Float.fromString;
+
+  let zero = reform.state.values.zero;
+  let unit = reform.state.values.unit;
+
+  let domainType = reform.state.values.domainType;
+  let unitType = reform.state.values.unitType;
+
+  let guesstimatorString = reform.state.values.guesstimatorString;
+  let sampleCount = reform.state.values.sampleCount |> Js.Float.fromString;
+  let outputXYPoints =
+    reform.state.values.outputXYPoints |> Js.Float.fromString;
+  let truncateTo = reform.state.values.truncateTo |> Js.Float.fromString;
+
   let domain =
-    switch (reform.state.values.domainType) {
-    | "Complete" => DistTypes.Complete
-    | "LeftLimited" =>
-      LeftLimited({
-        xPoint: reform.state.values.xPoint,
-        excludingProbabilityMass: reform.state.values.excludingProbabilityMass,
-      })
-    | "RightLimited" =>
-      RightLimited({
-        xPoint: reform.state.values.xPoint2,
-        excludingProbabilityMass:
-          reform.state.values.excludingProbabilityMass2,
-      })
-    | "LeftAndRightLimited" =>
-      LeftAndRightLimited(
-        {
-          xPoint: reform.state.values.xPoint,
-          excludingProbabilityMass:
-            reform.state.values.excludingProbabilityMass,
-        },
-        {
-          xPoint: reform.state.values.xPoint2,
-          excludingProbabilityMass:
-            reform.state.values.excludingProbabilityMass2,
-        },
+    switch (domainType) {
+    | "Complete" => Some(DistTypes.Complete)
+    | "LeftLimited"
+        when
+          !Js.Float.isNaN(xPoint)
+          && !Js.Float.isNaN(excludingProbabilityMass) =>
+      Some(LeftLimited({xPoint, excludingProbabilityMass}))
+    | "RightLimited"
+        when
+          !Js.Float.isNaN(xPoint2)
+          && !Js.Float.isNaN(excludingProbabilityMass2) =>
+      Some(RightLimited({xPoint, excludingProbabilityMass}))
+    | "LeftAndRightLimited"
+        when
+          !Js.Float.isNaN(xPoint)
+          && !Js.Float.isNaN(excludingProbabilityMass)
+          && !Js.Float.isNaN(xPoint2)
+          && !Js.Float.isNaN(excludingProbabilityMass2) =>
+      Some(
+        LeftAndRightLimited(
+          {xPoint, excludingProbabilityMass},
+          {xPoint, excludingProbabilityMass},
+        ),
       )
-    | _ => Js.Exn.raiseError("domain is unknown")
+    | _ => None
     };
 
   let unit =
-    switch (reform.state.values.unitType) {
-    | "UnspecifiedDistribution" => DistTypes.UnspecifiedDistribution
+    switch (unitType) {
+    | "UnspecifiedDistribution" => Some(DistTypes.UnspecifiedDistribution)
     | "TimeDistribution" =>
-      TimeDistribution({
-        zero: reform.state.values.zero,
-        unit: reform.state.values.unit |> TimeTypes.TimeUnit.ofString,
-      })
-    | _ => Js.Exn.raiseError("unit is unknown")
+      Some(
+        TimeDistribution({zero, unit: unit |> TimeTypes.TimeUnit.ofString}),
+      )
+    | _ => None
     };
 
-  let guesstimatorString = reform.state.values.guesstimatorString;
-  let sampleCount = reform.state.values.sampleCount;
-  let outputXYPoints = reform.state.values.outputXYPoints;
-  let truncateTo = reform.state.values.truncateTo |> E.O.some;
+  let options =
+    switch (sampleCount, outputXYPoints, truncateTo) {
+    | (_, _, _)
+        when
+          !Js.Float.isNaN(sampleCount)
+          && !Js.Float.isNaN(outputXYPoints)
+          && !Js.Float.isNaN(truncateTo)
+          && sampleCount > 10.
+          && outputXYPoints > 10.
+          && truncateTo > 10. =>
+      Some({
+        sampleCount: sampleCount |> int_of_float,
+        outputXYPoints: outputXYPoints |> int_of_float,
+        truncateTo: truncateTo |> int_of_float |> E.O.some,
+      })
+    | _ => None
+    };
 
   let demoDist =
     React.useMemo1(
-      () => {
-        <DemoDist
-          guesstimatorString
-          domain
-          unit
-          sampleCount
-          outputXYPoints
-          truncateTo
-        />
-      },
+      () => <DemoDist guesstimatorString domain unit options />,
       [|
         reform.state.values.guesstimatorString,
         reform.state.values.domainType,
-        reform.state.values.xPoint |> string_of_float,
-        reform.state.values.xPoint2 |> string_of_float,
-        reform.state.values.xPoint2 |> string_of_float,
-        reform.state.values.excludingProbabilityMass |> string_of_float,
-        reform.state.values.excludingProbabilityMass2 |> string_of_float,
+        reform.state.values.xPoint,
+        reform.state.values.xPoint2,
+        reform.state.values.xPoint2,
+        reform.state.values.excludingProbabilityMass,
+        reform.state.values.excludingProbabilityMass2,
         reform.state.values.unitType,
         reform.state.values.zero |> E.M.format(E.M.format_standard),
         reform.state.values.unit,
-        reform.state.values.sampleCount |> string_of_int,
-        reform.state.values.outputXYPoints |> string_of_int,
-        reform.state.values.truncateTo |> string_of_int,
+        reform.state.values.sampleCount,
+        reform.state.values.outputXYPoints,
+        reform.state.values.truncateTo,
         reloader |> string_of_int,
       |],
     );
@@ -445,25 +438,16 @@ let make = () => {
           </Row>
           <Row _type=`flex className=Styles.rows>
             <Col span=4>
-              <FieldNumber
-                field=FormConfig.SampleCount
-                label="Sample Count"
-                min=100
-              />
+              <FieldFloat field=FormConfig.SampleCount label="Sample Count" />
             </Col>
             <Col span=4>
-              <FieldNumber
+              <FieldFloat
                 field=FormConfig.OutputXYPoints
                 label="Output XY-points"
-                min=100
               />
             </Col>
             <Col span=4>
-              <FieldNumber
-                field=FormConfig.TruncateTo
-                label="Truncate To"
-                min=10
-              />
+              <FieldFloat field=FormConfig.TruncateTo label="Truncate To" />
             </Col>
           </Row>
           <Antd.Button
diff --git a/src/components/charts/DistributionPlot/distPlotD3.js b/src/components/charts/DistributionPlot/distPlotD3.js
index 99b73db7..a45ad37c 100644
--- a/src/components/charts/DistributionPlot/distPlotD3.js
+++ b/src/components/charts/DistributionPlot/distPlotD3.js
@@ -87,13 +87,11 @@ export class CdfChartD3 {
   render() {
     this._container = d3.select(this.attrs.container);
     if (this._container.node() === null) {
-      console.error('Container for D3 is not defined.');
-      return;
+      throw new Error('Container for D3 is not defined.');
     }
 
     if (!['log', 'linear'].includes(this.attrs.scale)) {
-      console.error('Scale should be either "log" or "linear".');
-      return;
+      throw new Error('Scale should be either "log" or "linear".');
     }
 
     // Log Scale.
@@ -121,8 +119,7 @@ export class CdfChartD3 {
     ];
     for (const field of fields) {
       if (!_.isNumber(this.attrs[field])) {
-        console.error(`${field} should be a number.`);
-        return;
+        throw new Error(`${field} should be a number.`);
       }
     }
 
@@ -157,12 +154,16 @@ export class CdfChartD3 {
         `translate(${this.calc.chartLeftMargin}, ${this.calc.chartTopMargin})`,
       );
 
-    const common = this.getCommonThings();
-    if (this.hasDate('continuous')) {
-      this.addDistributionChart(common);
-    }
-    if (this.hasDate('discrete')) {
-      this.addLollipopsChart(common);
+    try {
+      const common = this.getCommonThings();
+      if (this.hasDate('continuous')) {
+        this.addDistributionChart(common);
+      }
+      if (this.hasDate('discrete')) {
+        this.addLollipopsChart(common);
+      }
+    } catch (e) {
+      throw e;
     }
     return this;
   }
@@ -183,10 +184,10 @@ export class CdfChartD3 {
     const yMax = d3.max(this.attrs.data.continuous.ys);
 
     // Errors.
-    if (!_.isFinite(xMin)) return console.error('xMin is undefined');
-    if (!_.isFinite(xMax)) return console.error('xMax is undefined');
-    if (!_.isFinite(yMin)) return console.error('yMin is undefined');
-    if (!_.isFinite(yMax)) return console.error('yMax is undefined');
+    if (!_.isFinite(xMin)) throw new Error('xMin is undefined');
+    if (!_.isFinite(xMax)) throw new Error('xMax is undefined');
+    if (!_.isFinite(yMin)) throw new Error('yMin is undefined');
+    if (!_.isFinite(yMax)) throw new Error('yMax is undefined');
 
     // X-domains.
     const yMaxDomainFactor = _.get(this.attrs, 'yMaxContinuousDomainFactor', 1);
diff --git a/yarn.lock b/yarn.lock
index 244be22d..97f788e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2488,10 +2488,10 @@ browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.4, browserslist@^4.8
     electron-to-chromium "^1.3.341"
     node-releases "^1.1.47"
 
-bs-ant-design-alt@2.0.0-alpha.31:
-  version "2.0.0-alpha.31"
-  resolved "https://registry.yarnpkg.com/bs-ant-design-alt/-/bs-ant-design-alt-2.0.0-alpha.31.tgz#425003babaf47eefdc81cb392d9f224bc18c651a"
-  integrity sha512-N0wmBksjgyQ4ioLi6L/gTt8852ghrmdYOBvs7onckEQ/O86eYRbKSMGL8cqMvUYJLB3IxKXSS89cssApqzGpTw==
+bs-ant-design-alt@2.0.0-alpha.33:
+  version "2.0.0-alpha.33"
+  resolved "https://registry.yarnpkg.com/bs-ant-design-alt/-/bs-ant-design-alt-2.0.0-alpha.33.tgz#13dc94f4fe4e7525485515cca2d2eae298940045"
+  integrity sha512-C+REAjuxExzQnPP5KySwNd8Pizs0VGnrrF/6YlraErWr/Bjf3fqn6and3UXyHqi+DAj15IxY6e7lkaghQgO0eA==
   dependencies:
     antd "3.17.0"
     bs-moment "^0.4.4"