quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow floats on top-level

Browse Source
This commit is contained in:
Ozzie Gooen 2020-04-01 18:47:59 +01:00
parent bc39ce9c67
commit e80bd4108e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/symbolic/MathJsParser.re
View File

@ -32,6 +32,7 @@ module MathJsonToMathJsAdt = {
| "ConstantNode" => | "ConstantNode" =>
optional(field("value", Json.Decode.float), j) optional(field("value", Json.Decode.float), j)
|> E.O.fmap(r => Value(r)) |> E.O.fmap(r => Value(r))
| "ParenthesisNode" => j |> field("content", run)
| "ObjectNode" => | "ObjectNode" =>
let properties = j |> field("properties", dict(run)); let properties = j |> field("properties", dict(run));
Js.Dict.entries(properties) Js.Dict.entries(properties)
@ -71,6 +72,8 @@ module MathAdtToDistDst = {
fun fun
| Fn({name: "multiply", args: [|Value(f), Symbol(s)|]}) => | Fn({name: "multiply", args: [|Value(f), Symbol(s)|]}) =>
Value(transformWithSymbol(f, s)) Value(transformWithSymbol(f, s))
| Fn({name: "unaryMinus", args: [|Value(f)|]}) =>
Value(-1.0 *. f)
| Fn({name, args}) => Fn({name, args: args |> E.A.fmap(run)}) | Fn({name, args}) => Fn({name, args: args |> E.A.fmap(run)})
| Array(args) => Array(args |> E.A.fmap(run)) | Array(args) => Array(args |> E.A.fmap(run))
| Symbol(s) => Symbol(s) | Symbol(s) => Symbol(s)
@ -110,6 +113,9 @@ module MathAdtToDistDst = {
| [|Value(low), Value(high)|] when low < high => { | [|Value(low), Value(high)|] when low < high => {
Ok(`Simple(SymbolicDist.Lognormal.from90PercentCI(low, high))); Ok(`Simple(SymbolicDist.Lognormal.from90PercentCI(low, high)));
} }
| [|Value(low), _|] when low <= 0.0 => {
Error("Low value cannot be less than 0.")
}
| [|Value(_), Value(_)|] => | [|Value(_), Value(_)|] =>
Error("Low value must be less than high value.") Error("Low value must be less than high value.")
| _ => Error("Wrong number of variables in lognormal distribution"); | _ => Error("Wrong number of variables in lognormal distribution");
@ -208,7 +214,7 @@ module MathAdtToDistDst = {
|> ( |> (
fun fun
| Fn(_) => functionParser(r) | Fn(_) => functionParser(r)
| Value(_) => Error("Top level can't be value") | Value(r) => Ok(`Simple(`Float(r)))
| Array(_) => Error("Array not valid as top level") | Array(_) => Error("Array not valid as top level")
| Symbol(_) => Error("Symbol not valid as top level") | Symbol(_) => Error("Symbol not valid as top level")
| Object(_) => Error("Object not valid as top level") | Object(_) => Error("Object not valid as top level")