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

Fix division by zero

Browse Source
This commit is contained in:
Sebastian Kosch 2020-06-12 23:53:01 -07:00
parent f6c1918b12
commit 9b10452156
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,6 +410,7 @@ module DistTree = {
`Distribution(`Float(func(v1, v2))) `Distribution(`Float(func(v1, v2)))
} }
| (`Distribution(`Normal(n2)), `Distribution(`Float(v1)), `AddOperation)
| (`Distribution(`Float(v1)), `Distribution(`Normal(n2)), `AddOperation) => { | (`Distribution(`Float(v1)), `Distribution(`Normal(n2)), `AddOperation) => {
let n: normal = {mean: v1 +. n2.mean, stdev: n2.stdev}; let n: normal = {mean: v1 +. n2.mean, stdev: n2.stdev};
`Distribution(`Normal(n)) `Distribution(`Normal(n))
@ -420,6 +421,22 @@ module DistTree = {
`Distribution(`Normal(n)); `Distribution(`Normal(n));
} }
| (`Distribution(`Normal(n1)), `Distribution(`Normal(n2)), `SubtractOperation) => {
let n: normal = {mean: n1.mean -. n2.mean, stdev: sqrt(n1.stdev ** 2. +. n2.stdev ** 2.)};
`Distribution(`Normal(n));
}
| (`Distribution(`Lognormal(l1)), `Distribution(`Lognormal(l2)), `MultiplyOperation) => {
let l: lognormal = {mu: l1.mu +. l2.mu, sigma: l1.sigma +. l2.sigma};
`Distribution(`Lognormal(l));
}
| (`Distribution(`Lognormal(l1)), `Distribution(`Lognormal(l2)), `DivideOperation) => {
let l: lognormal = {mu: l1.mu -. l2.mu, sigma: l1.sigma +. l2.sigma};
`Distribution(`Lognormal(l));
}
/* General cases: convolve the XYShapes */ /* General cases: convolve the XYShapes */
| (`Distribution(d1), `Distribution(d2), _) => { | (`Distribution(d1), `Distribution(d2), _) => {
let (sc1, sd1) = renderDistributionToXYShape(d1, sampleCount); let (sc1, sd1) = renderDistributionToXYShape(d1, sampleCount);
@ -537,6 +554,9 @@ module DistTree = {
let evaluateNormalize = (et: nodeResult, sampleCount: int) => { let evaluateNormalize = (et: nodeResult, sampleCount: int) => {
// just divide everything by the integral. // just divide everything by the integral.
switch (et) { switch (et) {
| `RenderedShape(sc, sd, 0.) => {
`RenderedShape(Distributions.Continuous.empty, Distributions.Discrete.empty, 0.)
}
| `RenderedShape(sc, sd, i) => { | `RenderedShape(sc, sd, i) => {
// loop through all ys and divide them by i // loop through all ys and divide them by i
let normalize = (s: DistTypes.xyShape): DistTypes.xyShape => {xs: s.xs, ys: s.ys |> E.A.fmap(y => y /. i)}; let normalize = (s: DistTypes.xyShape): DistTypes.xyShape => {xs: s.xs, ys: s.ys |> E.A.fmap(y => y /. i)};