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

Merge branch 'pointwise-commutative-error' of github.com:quantified-uncertainty/squiggle into pointwise-commutative-error

Browse Source
This commit is contained in:
Sam Nolan 2022-04-20 06:07:00 -04:00
commit 8dab784d2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res
View File

@ -263,7 +263,7 @@ let combineAlgebraicallyWithDiscrete = (
| #Stepwise => stepwiseToLinear(t1) | #Stepwise => stepwiseToLinear(t1)
} }
let combinedShape = AlgebraicShapeCombination.combineShapesContinuousDiscrete( let combinedShape = NumericShapeCombination.combineShapesContinuousDiscrete(
op, op,
continuousAsLinear |> getShape, continuousAsLinear |> getShape,
t2s, t2s,
@ -290,7 +290,7 @@ let combineAlgebraically = (op: Operation.algebraicOperation, t1: t, t2: t) => {
if t1n == 0 || t2n == 0 { if t1n == 0 || t2n == 0 {
empty empty
} else { } else {
let combinedShape = AlgebraicShapeCombination.combineShapesContinuousContinuous(op, s1, s2) let combinedShape = NumericShapeCombination.combineShapesContinuousContinuous(op, s1, s2)
let combinedIntegralSum = Common.combineIntegralSums( let combinedIntegralSum = Common.combineIntegralSums(
(a, b) => Some(a *. b), (a, b) => Some(a *. b),
t1.integralSumCache, t1.integralSumCache,

0
packages/squiggle-lang/src/rescript/Distributions/PointSetDist/AlgebraicShapeCombination.res → packages/squiggle-lang/src/rescript/Distributions/PointSetDist/NumericShapeCombination.res
View File