From 8b042db2b81293edaa3e0e874f27b8f5af7107df Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Tue, 19 Apr 2022 13:53:24 -0400 Subject: [PATCH] fix: renamed Algebraic => Numeric This is not doing algebraic manipulations, this is doing numeric computations. Confusing difference. --- .../src/rescript/Distributions/PointSetDist/Continuous.res | 6 +++--- ...raicShapeCombination.res => NumericShapeCombination.res} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename packages/squiggle-lang/src/rescript/Distributions/PointSetDist/{AlgebraicShapeCombination.res => NumericShapeCombination.res} (100%) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index f7d1e179..8b324978 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -262,7 +262,7 @@ let combineAlgebraicallyWithDiscreteSecond = ( | #Stepwise => stepwiseToLinear(t1) } - let combinedShape = AlgebraicShapeCombination.combineShapesContinuousDiscrete( + let combinedShape = NumericShapeCombination.combineShapesContinuousDiscrete( op, continuousAsLinear |> getShape, t2s, @@ -296,7 +296,7 @@ let combineAlgebraicallyWithDiscreteFirst = ( | #Stepwise => stepwiseToLinear(t2) } - let combinedShape = AlgebraicShapeCombination.combineShapesDiscreteContinuous( + let combinedShape = NumericShapeCombination.combineShapesDiscreteContinuous( op, t1s, continuousAsLinear |> getShape, @@ -322,7 +322,7 @@ let combineAlgebraically = (op: Operation.algebraicOperation, t1: t, t2: t) => { if t1n == 0 || t2n == 0 { empty } else { - let combinedShape = AlgebraicShapeCombination.combineShapesContinuousContinuous(op, s1, s2) + let combinedShape = NumericShapeCombination.combineShapesContinuousContinuous(op, s1, s2) let combinedIntegralSum = Common.combineIntegralSums( (a, b) => Some(a *. b), t1.integralSumCache, diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/AlgebraicShapeCombination.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/NumericShapeCombination.res similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/PointSetDist/AlgebraicShapeCombination.res rename to packages/squiggle-lang/src/rescript/Distributions/PointSetDist/NumericShapeCombination.res