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

Testing convolutions

Browse Source
This commit is contained in:
Sebastian Kosch 2020-06-26 23:16:37 -07:00
parent d2e7e5f928
commit b368c2a8ee
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/DistBuilder.re
View File

@ -172,7 +172,7 @@ let make = () => {
~onSubmit=({state}) => {None}, ~onSubmit=({state}) => {None},
~initialState={ ~initialState={
//guesstimatorString: "mm(normal(-10, 2), uniform(18, 25), lognormal({mean: 10, stdev: 8}), triangular(31,40,50))", //guesstimatorString: "mm(normal(-10, 2), uniform(18, 25), lognormal({mean: 10, stdev: 8}), triangular(31,40,50))",
guesstimatorString: "uniform(0, 1) + normal(1, 2)", guesstimatorString: "uniform(0, 1) * normal(1, 2)",
domainType: "Complete", domainType: "Complete",
xPoint: "50.0", xPoint: "50.0",
xPoint2: "60.0", xPoint2: "60.0",

21
src/distPlus/distribution/Distributions.re
View File

@ -173,6 +173,10 @@ module Continuous = {
(); ();
}; };
Js.log2("Previous xyshape:", t |> getShape);
Js.log2("new pointmasssex", pointMassesX);
Js.log2("new pointmasssey", pointMassesY);
{ {
xyShape: { xyShape: {
xs: pointMassesX, xs: pointMassesX,
@ -321,23 +325,22 @@ module Continuous = {
let t2n = t2s |> XYShape.T.length; let t2n = t2s |> XYShape.T.length;
let outXYShapes: array(array((float, float))) = let outXYShapes: array(array((float, float))) =
Belt.Array.makeUninitializedUnsafe(t1n); Belt.Array.makeUninitializedUnsafe(t2n);
for (i in 0 to t1n - 1) { for (j in 0 to t2n - 1) { // for each one of the discrete points
// create a new distribution // create a new distribution, as long as the original continuous one
let dxyShape: array((float, float)) = let dxyShape: array((float, float)) = Belt.Array.makeUninitializedUnsafe(t1n);
Belt.Array.makeUninitializedUnsafe(t2n); for (i in 0 to t1n - 1) {
for (j in 0 to t2n - 1) {
let _ = let _ =
Belt.Array.set( Belt.Array.set(
dxyShape, dxyShape,
j, i,
(fn(t1s.xs[i], t2s.xs[j]), t1s.ys[i] *. t2s.ys[j]), (fn(t1s.xs[i], t2s.xs[j]), t1s.ys[i] *. t2s.ys[j]),
); );
(); ();
}; };
let _ = Belt.Array.set(outXYShapes, i, dxyShape); let _ = Belt.Array.set(outXYShapes, j, dxyShape);
(); ();
}; };
@ -355,7 +358,7 @@ module Continuous = {
let convolve = (~downsample=false, fn, t1: t, t2: t) => { let convolve = (~downsample=false, fn, t1: t, t2: t) => {
let downsampleIfTooLarge = (t: t) => { let downsampleIfTooLarge = (t: t) => {
let sqtl = sqrt(float_of_int(t |> getShape |> XYShape.T.length)); let sqtl = sqrt(float_of_int(t |> getShape |> XYShape.T.length));
sqtl > 10. && downsample ? T.downsample(int_of_float(sqtl), t) : t; sqtl > 10. && downsample && false ? T.downsample(int_of_float(sqtl), t) : t;
}; };
let t1d = downsampleIfTooLarge(t1); let t1d = downsampleIfTooLarge(t1);