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

Comment out some stuff, fix annoying react key prop error

Browse Source
This commit is contained in:
Sebastian Kosch 2020-06-09 21:43:35 -07:00
parent eb0ffdc6c3
commit fa1bf75acc
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/charts/DistPlusPlot.re
View File

@ -339,7 +339,7 @@ let make = (~distPlus: DistTypes.distPlus) => {
<div> <div>
{state.distributions {state.distributions
|> E.L.fmapi((index, config) => |> E.L.fmapi((index, config) =>
<div className="flex"> <div className="flex" key={string_of_int(index)}>
<div className="w-4/5"> <div className="w-4/5">
<Chart distPlus config onHover={r => {setX(_ => r)}} /> <Chart distPlus config onHover={r => {setX(_ => r)}} />
</div> </div>
@ -406,4 +406,4 @@ let make = (~distPlus: DistTypes.distPlus) => {
{state.showStats ? table(distPlus, x) : ReasonReact.null} {state.showStats ? table(distPlus, x) : ReasonReact.null}
{state.showPercentiles ? percentiles(distPlus) : ReasonReact.null} {state.showPercentiles ? percentiles(distPlus) : ReasonReact.null}
</div>; </div>;
}; };

8
src/distPlus/symbolic/MathJsParser.re
View File

@ -263,11 +263,8 @@ module MathAdtToDistDst = {
| Object(_) => Error("Object not valid as top level") | Object(_) => Error("Object not valid as top level")
); );
let run = (r): result(SymbolicDist.bigDist, string) => { let run = (r): result(SymbolicDist.bigDist, string) =>
let o = r |> MathAdtCleaner.run |> topLevel; r |> MathAdtCleaner.run |> topLevel;
Js.log2("parser output", o);
o
};
}; };
let fromString = str => { let fromString = str => {
@ -282,7 +279,6 @@ let fromString = str => {
let mathJsToJson = Mathjs.parseMath(str); let mathJsToJson = Mathjs.parseMath(str);
let mathJsParse = let mathJsParse =
E.R.bind(mathJsToJson, r => { E.R.bind(mathJsToJson, r => {
Js.log2("parsed", r);
switch (MathJsonToMathJsAdt.run(r)) { switch (MathJsonToMathJsAdt.run(r)) {
| Some(r) => Ok(r) | Some(r) => Ok(r)
| None => Error("MathJsParse Error") | None => Error("MathJsParse Error")

4
src/distPlus/symbolic/SymbolicDist.re
View File

@ -64,7 +64,7 @@ type dist = [
- IndependentVariableProduct(WeightedDist, WeightedDist) [i.e. distribution product] - IndependentVariableProduct(WeightedDist, WeightedDist) [i.e. distribution product]
*/ */
type weightedDist = (float, dist); /*type weightedDist = (float, dist);
type bigDistTree = type bigDistTree =
/* | DistLeaf(dist) */ /* | DistLeaf(dist) */
@ -79,7 +79,7 @@ let rec treeIntegral = item => {
| PointwiseNormalizedDistSum(childTrees) => | PointwiseNormalizedDistSum(childTrees) =>
childTrees |> E.A.fmap(treeIntegral) |> E.A.Floats.sum childTrees |> E.A.fmap(treeIntegral) |> E.A.Floats.sum
}; };
}; };*/
/* bigDist can either be a single distribution, or a /* bigDist can either be a single distribution, or a
PointwiseCombination, i.e. an array of (dist, weight) tuples */ PointwiseCombination, i.e. an array of (dist, weight) tuples */