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

Added triangular distribution catch

Browse Source
This commit is contained in:
Ozzie Gooen 2020-07-19 13:10:36 +01:00
parent 4072c47b70
commit b2c6ef7e5e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/distPlus/expressionTree/MathJsParser.re
View File

@ -157,8 +157,11 @@ module MathAdtToDistDst = {
let triangular: let triangular:
array(arg) => result(ExpressionTypes.ExpressionTree.node, string) = array(arg) => result(ExpressionTypes.ExpressionTree.node, string) =
fun fun
| [|Value(low), Value(medium), Value(high)|] => | [|Value(low), Value(medium), Value(high)|]
when low < medium && medium < high =>
Ok(`SymbolicDist(`Triangular({low, 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"); | _ => Error("Wrong number of variables in triangle distribution");
let multiModal = let multiModal =
@ -238,7 +241,7 @@ module MathAdtToDistDst = {
) => { ) => {
let toOkAlgebraic = r => Ok(`AlgebraicCombination(r)); let toOkAlgebraic = r => Ok(`AlgebraicCombination(r));
let toOkTruncate = r => Ok(`Truncate(r)); let toOkTruncate = r => Ok(`Truncate(r));
let toOkFloatFromDist = r => Ok(`FloatFromDist(r)) let toOkFloatFromDist = r => Ok(`FloatFromDist(r));
switch (name, args) { switch (name, args) {
| ("add", [|Ok(l), Ok(r)|]) => toOkAlgebraic((`Add, l, r)) | ("add", [|Ok(l), Ok(r)|]) => toOkAlgebraic((`Add, l, r))
| ("add", _) => Error("Addition needs two operands") | ("add", _) => Error("Addition needs two operands")
@ -276,10 +279,8 @@ module MathAdtToDistDst = {
toOkFloatFromDist((`Cdf(v), d)) toOkFloatFromDist((`Cdf(v), d))
| ("inv", [|Ok(d), Ok(`SymbolicDist(`Float(v)))|]) => | ("inv", [|Ok(d), Ok(`SymbolicDist(`Float(v)))|]) =>
toOkFloatFromDist((`Inv(v), d)) toOkFloatFromDist((`Inv(v), d))
| ("mean", [|Ok(d)|]) => | ("mean", [|Ok(d)|]) => toOkFloatFromDist((`Mean, d))
toOkFloatFromDist((`Mean, d)) | ("sample", [|Ok(d)|]) => toOkFloatFromDist((`Sample, d))
| ("sample", [|Ok(d)|]) =>
toOkFloatFromDist((`Sample, d))
| _ => Error("This type not currently supported") | _ => Error("This type not currently supported")
}; };
}; };