New functions use new syntax

src/distPlus/expressionTree/ExpressionTreeEvaluator.re

@@ -259,6 +259,7 @@ module FloatFromDist = {
   };
 };
 
+// TODO: This forces things to be floats
 let callableFunction = (evaluationParams, name, args) => {
   let b =
     args
@@ -267,7 +268,7 @@ let callableFunction = (evaluationParams, name, args) => {
          |> E.R.bind(_, Render.toFloat)
        )
     |> E.A.R.firstErrorOrOpen;
-  b |> E.R.bind(_, Functions.fnn("normal"));
+  b |> E.R.bind(_, Functions.fnn(name));
 };
 
 module Render = {

src/distPlus/expressionTree/Functions.re

@@ -8,20 +8,75 @@ let twoFloats = (fn, n1: node, n2: node): result(node, string) =>
   | _ => Error("Variables have wrong type")
   };
 
+let threeFloats = (fn, n1: node, n2: node, n3: node): result(node, string) =>
+  switch (n1, n2, n3) {
+  | (
+      `SymbolicDist(`Float(a)),
+      `SymbolicDist(`Float(b)),
+      `SymbolicDist(`Float(c)),
+    ) =>
+    fn(a, b, c)
+  | _ => Error("Variables have wrong type")
+  };
+
 let twoFloatsToOkSym = fn => twoFloats((f1, f2) => fn(f1, f2) |> toOkSym);
 
+let threeFloats = fn => threeFloats((f1, f2, f3) => fn(f1, f2, f3));
+
 let apply2 = (fn, args): result(node, string) =>
   switch (args) {
   | [|a, b|] => fn(a, b)
   | _ => Error("Needs 2 args")
   };
 
+let apply3 = (fn, args: array(node)): result(node, string) =>
+  switch (args) {
+  | [|a, b, c|] => fn(a, b, c)
+  | _ => Error("Needs 3 args")
+  };
+
+let to_: array(node) => result(node, string) =
+  fun
+  | [|`SymbolicDist(`Float(low)), `SymbolicDist(`Float(high))|]
+      when low <= 0.0 && low < high => {
+      Ok(`SymbolicDist(SymbolicDist.Normal.from90PercentCI(low, high)));
+    }
+  | [|`SymbolicDist(`Float(low)), `SymbolicDist(`Float(high))|]
+      when low < high => {
+      Ok(`SymbolicDist(SymbolicDist.Lognormal.from90PercentCI(low, high)));
+    }
+  | [|`SymbolicDist(`Float(_)), `SymbolicDist(_)|] =>
+    Error("Low value must be less than high value.")
+  | _ => Error("Requires 2 variables");
+
 let fnn = (name, args: array(node)) => {
   switch (name) {
   | "normal" => apply2(twoFloatsToOkSym(SymbolicDist.Normal.make), args)
   | "uniform" => apply2(twoFloatsToOkSym(SymbolicDist.Uniform.make), args)
   | "beta" => apply2(twoFloatsToOkSym(SymbolicDist.Beta.make), args)
   | "cauchy" => apply2(twoFloatsToOkSym(SymbolicDist.Cauchy.make), args)
+  | "lognormal" => apply2(twoFloatsToOkSym(SymbolicDist.Lognormal.make), args)
+  | "lognormalFromMeanAndStdDev" => apply2(twoFloatsToOkSym(SymbolicDist.Lognormal.fromMeanAndStdev), args)
+  | "exponential" => 
+    switch (args) {
+    | [|
+        `SymbolicDist(`Float(a)),
+      |] =>
+      Ok(`SymbolicDist(SymbolicDist.Exponential.make(a)));
+    | _ => Error("Needs 3 valid arguments")
+    }
+  | "triangular" =>
+    switch (args) {
+    | [|
+        `SymbolicDist(`Float(a)),
+        `SymbolicDist(`Float(b)),
+        `SymbolicDist(`Float(c)),
+      |] =>
+      SymbolicDist.Triangular.make(a, b, c)
+      |> E.R.fmap(r => `SymbolicDist(r))
+    | _ => Error("Needs 3 valid arguments")
+    }
+  | "to" => to_(args)
   | _ => Error("Function not found")
   };
 };

src/distPlus/expressionTree/MathJsParser.re

@@ -93,56 +93,26 @@ module MathAdtToDistDst = {
         );
   };
 
-  let lognormal:
+  let lognormal = (args, parseArgs, nodeParser) =>
-    array(arg) => result(ExpressionTypes.ExpressionTree.node, string) =
+    switch (args) {
-    fun
+    | [|Object(o)|] =>
-    | [|Value(mu), Value(sigma)|] =>
+      let g = s =>
-      Ok(`SymbolicDist(`Lognormal({mu, sigma})))
+        Js.Dict.get(o, s) |> E.O.toResult("") |> E.R.bind(_, nodeParser);
-    | [|Object(o)|] => {
+      switch (g("mean"), g("stdev"), g("mu"), g("sigma")) {
-        let g = Js.Dict.get(o);
+      | (Ok(mean), Ok(stdev), _, _) =>
-        switch (g("mean"), g("stdev"), g("mu"), g("sigma")) {
-        | (Some(Value(mean)), Some(Value(stdev)), _, _) =>
-          Ok(
-            `SymbolicDist(
-              SymbolicDist.Lognormal.fromMeanAndStdev(mean, stdev),
-            ),
-          )
-        | (_, _, Some(Value(mu)), Some(Value(sigma))) =>
-          Ok(`SymbolicDist(`Lognormal({mu, sigma})))
-        | _ => Error("Lognormal distribution would need mean and stdev")
-        };
-      }
-    | _ => Error("Wrong number of variables in lognormal distribution");
-
-  let to_: array(arg) => result(ExpressionTypes.ExpressionTree.node, string) =
-    fun
-    | [|Value(low), Value(high)|] when low <= 0.0 && low < high => {
-        Ok(`SymbolicDist(SymbolicDist.Normal.from90PercentCI(low, high)));
-      }
-    | [|Value(low), Value(high)|] when low < high => {
         Ok(
-          `SymbolicDist(SymbolicDist.Lognormal.from90PercentCI(low, high)),
+          `CallableFunction(("lognormalFromMeanAndStdDev", [|mean, stdev|])),
-        );
+        )
-      }
+      | (_, _, Ok(mu), Ok(sigma)) =>
-    | [|Value(_), Value(_)|] =>
+        Ok(`CallableFunction(("lognormal", [|mu, sigma|])))
-      Error("Low value must be less than high value.")
+      | _ => Error("Lognormal distribution needs either mean and stdev or mu and sigma")
-    | _ => Error("Wrong number of variables in lognormal distribution");
+      };
-
+    | _ =>
-  let exponential:
+      parseArgs()
-    array(arg) => result(ExpressionTypes.ExpressionTree.node, string) =
+      |> E.R.fmap((args: array(ExpressionTypes.ExpressionTree.node)) =>
-    fun
+           `CallableFunction(("lognormal", args))
-    | [|Value(rate)|] => Ok(`SymbolicDist(`Exponential({rate: rate})))
+         )
-    | _ => Error("Wrong number of variables in Exponential distribution");
+    };
-
-  let triangular:
-    array(arg) => result(ExpressionTypes.ExpressionTree.node, string) =
-    fun
-    | [|Value(low), Value(medium), Value(high)|]
-        when low < medium && medium < high =>
-      Ok(`SymbolicDist(`Triangular({low, medium, high})))
-    | [|Value(_), Value(_), Value(_)|] =>
-      Error("Triangular values must be increasing order")
-    | _ => Error("Wrong number of variables in triangle distribution");
 
   let multiModal =
       (
@@ -150,15 +120,6 @@ module MathAdtToDistDst = {
         weights: option(array(float)),
       ) => {
     let weights = weights |> E.O.default([||]);
-
-    /*let dists:  =
-      args
-      |> E.A.fmap(
-           fun
-          | Ok(a) => a
-          | Error(e) => Error(e)
-          );*/
-
     let firstWithError = args |> Belt.Array.getBy(_, Belt.Result.isError);
     let withoutErrors = args |> E.A.fmap(E.R.toOption) |> E.A.O.concatSomes;
 
@@ -249,17 +210,22 @@ module MathAdtToDistDst = {
   };
 
   let functionParser = (nodeParser, name, args) => {
-    let parseArgs = () =>
+    let parseArray = ags =>
-      args |> E.A.fmap(nodeParser) |> E.A.R.firstErrorOrOpen;
+      ags |> E.A.fmap(nodeParser) |> E.A.R.firstErrorOrOpen;
+    let parseArgs = () => parseArray(args);
     switch (name) {
-    | "normal" | "uniform" | "beta" | "caucy" =>
+    | "normal"
+    | "uniform"
+    | "beta"
+    | "triangular"
+    | "to"
+    | "exponential"
+    | "cauchy" =>
       parseArgs()
-      |> E.R.fmap(
+      |> E.R.fmap((args: array(ExpressionTypes.ExpressionTree.node)) =>
-           (
-             args: array(ExpressionTypes.ExpressionTree.node),
-           ) =>
            `CallableFunction((name, args))
          )
+    | "lognormal" => lognormal(args, parseArgs, nodeParser)
     | "mm" =>
       let weights =
         args

src/distPlus/symbolic/SymbolicDist.re

@@ -2,8 +2,12 @@ open SymbolicTypes;
 
 module Exponential = {
   type t = exponential;
-  let make = (rate): symbolicDist =>
+  let make = (rate:float): symbolicDist =>
-    `Exponential({rate});
+    `Exponential(
+      {
+        rate:rate
+      },
+    );
   let pdf = (x, t: t) => Jstat.exponential##pdf(x, t.rate);
   let cdf = (x, t: t) => Jstat.exponential##cdf(x, t.rate);
   let inv = (p, t: t) => Jstat.exponential##inv(p, t.rate);
@@ -14,8 +18,7 @@ module Exponential = {
 
 module Cauchy = {
   type t = cauchy;
-  let make = (local, scale): symbolicDist =>
+  let make = (local, scale): symbolicDist => `Cauchy({local, scale});
-    `Cauchy({local,scale});
   let pdf = (x, t: t) => Jstat.cauchy##pdf(x, t.local, t.scale);
   let cdf = (x, t: t) => Jstat.cauchy##cdf(x, t.local, t.scale);
   let inv = (p, t: t) => Jstat.cauchy##inv(p, t.local, t.scale);
@@ -26,8 +29,10 @@ module Cauchy = {
 
 module Triangular = {
   type t = triangular;
-  let make = (low, medium, high): symbolicDist =>
+  let make = (low, medium, high): result(symbolicDist, string) =>
-    `Triangular({low, medium, high});
+    low < medium && medium < high
+      ? Ok(`Triangular({low, medium, high}))
+      : Error("Triangular values must be increasing order");
   let pdf = (x, t: t) => Jstat.triangular##pdf(x, t.low, t.high, t.medium);
   let cdf = (x, t: t) => Jstat.triangular##cdf(x, t.low, t.high, t.medium);
   let inv = (p, t: t) => Jstat.triangular##inv(p, t.low, t.high, t.medium);
@@ -82,7 +87,7 @@ module Normal = {
 
 module Beta = {
   type t = beta;
-  let make = (alpha, beta) => `Beta({alpha, beta})
+  let make = (alpha, beta) => `Beta({alpha, beta});
   let pdf = (x, t: t) => Jstat.beta##pdf(x, t.alpha, t.beta);
   let cdf = (x, t: t) => Jstat.beta##cdf(x, t.alpha, t.beta);
   let inv = (p, t: t) => Jstat.beta##inv(p, t.alpha, t.beta);
@@ -93,7 +98,7 @@ module Beta = {
 
 module Lognormal = {
   type t = lognormal;
-  let make = (mu, sigma) => `Lognormal({mu, sigma})
+  let make = (mu, sigma) => `Lognormal({mu, sigma});
   let pdf = (x, t: t) => Jstat.lognormal##pdf(x, t.mu, t.sigma);
   let cdf = (x, t: t) => Jstat.lognormal##cdf(x, t.mu, t.sigma);
   let inv = (p, t: t) => Jstat.lognormal##inv(p, t.mu, t.sigma);
@@ -140,7 +145,7 @@ module Lognormal = {
 
 module Uniform = {
   type t = uniform;
-  let make = (low, high) => `Uniform({low, high})
+  let make = (low, high) => `Uniform({low, high});
   let pdf = (x, t: t) => Jstat.uniform##pdf(x, t.low, t.high);
   let cdf = (x, t: t) => Jstat.uniform##cdf(x, t.low, t.high);
   let inv = (p, t: t) => Jstat.uniform##inv(p, t.low, t.high);
@@ -156,7 +161,7 @@ module Uniform = {
 
 module Float = {
   type t = float;
-  let make = t => `Float(t)
+  let make = t => `Float(t);
   let pdf = (x, t: t) => x == t ? 1.0 : 0.0;
   let cdf = (x, t: t) => x >= t ? 1.0 : 0.0;
   let inv = (p, t: t) => p < t ? 0.0 : 1.0;