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

Fixed a bug where the distribution would be shown inverted

Browse Source
This commit is contained in:
Nuno Sempere 2020-05-26 16:35:57 +02:00
parent 23952af460
commit 96645334be
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/Drawer.re
View File

@ -161,24 +161,27 @@ module Convert = {
let canvasShapeToContinuousShape = let canvasShapeToContinuousShape =
(~canvasShape: Types.canvasShape, ~canvasElement: Dom.element) (~canvasShape: Types.canvasShape, ~canvasElement: Dom.element)
: Types.continuousShape => { : Types.continuousShape => {
let xs = canvasShape.xValues; let xs = canvasShape.xValues;
let hs = canvasShape.hs; let hs = canvasShape.hs;
let rectangle: Types.rectangle = let rectangle: Types.rectangle =
CanvasContext.getBoundingClientRect(canvasElement); CanvasContext.getBoundingClientRect(canvasElement);
let bottom = float_of_int(rectangle.bottom); let bottom = float_of_int(rectangle.bottom);
let paddingFactorY = CanvasContext.paddingFactorX(rectangle.height);
let windowScrollY: float = [%raw "window.scrollY"];
let ysRelative = let y0Line = bottom+.windowScrollY-.paddingFactorY;
E.A.fmap( let ys = E.A.fmap( h => y0Line -. h, hs);
h => bottom -. h +. CanvasContext.paddingFactorY(rectangle.height),
hs, let xyShape: Types.xyShape = {xs, ys};
);
let xyShape: Types.xyShape = {xs, ys: ysRelative};
let continuousShape: Types.continuousShape = { let continuousShape: Types.continuousShape = {
xyShape, xyShape,
interpolation: `Linear, interpolation: `Linear,
}; };
let integral = XYShape.Analysis.integrateContinuousShape(continuousShape); let integral = XYShape.Analysis.integrateContinuousShape(continuousShape);
let ys = E.A.fmap(y => y /. integral, ysRelative); let ys = E.A.fmap(y => y /. integral, ys);
let continuousShape: Types.continuousShape = { let continuousShape: Types.continuousShape = {
xyShape: { xyShape: {
xs, xs,
@ -343,6 +346,10 @@ module Draw = {
/* draw units along the x axis */ /* draw units along the x axis */
CanvasContext.font(context, "16px Roboto"); CanvasContext.font(context, "16px Roboto");
CanvasContext.lineWidth(context, 2.0); CanvasContext.lineWidth(context, 2.0);
CanvasContext.font(context, "16px Roboto");
CanvasContext.lineWidth(context, 2.0);
let numIntervals = 10; let numIntervals = 10;
let width = float_of_int(rectangle.width); let width = float_of_int(rectangle.width);
let height = float_of_int(rectangle.height); let height = float_of_int(rectangle.height);
@ -378,8 +385,8 @@ module Draw = {
}; };
let initialDistribution = (canvasElement: Dom.element, setState) => { let initialDistribution = (canvasElement: Dom.element, setState) => {
let mean = 50.0; let mean = 100.0;
let stdev = 20.0; let stdev = 15.0;
let numSamples = 3000; let numSamples = 3000;
let normal: SymbolicDist.dist = `Normal({mean, stdev}); let normal: SymbolicDist.dist = `Normal({mean, stdev});
@ -668,6 +675,7 @@ module State = {
~intendedSum=1.0, ~intendedSum=1.0,
pdf, pdf,
); );
Js.log(_pdf);
let cdf = Distributions.Continuous.T.integral(~cache=None, _pdf); let cdf = Distributions.Continuous.T.integral(~cache=None, _pdf);
let xs = [||]; let xs = [||];
let ys = [||]; let ys = [||];