From b87e952785f07d1bdaf28ff5d7e8c116b8809a53 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 2 Sep 2022 21:53:20 -0700 Subject: [PATCH] Formatter --- ...leLibrary_FunctionRegistryLibrary_test.res | 10 +++++-- .../rescript/Distributions/GenericDist.res | 2 +- .../Distributions/PointSetDist/Continuous.res | 30 +++++++++---------- .../Distributions/PointSetDist/Discrete.res | 8 ++--- .../Distributions/PointSetDist/Mixed.res | 30 ++++++++++--------- .../PointSetDist/PointSetDist.res | 6 ++-- 6 files changed, 47 insertions(+), 39 deletions(-) diff --git a/packages/squiggle-lang/__tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.res b/packages/squiggle-lang/__tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.res index 7ddb57d4..82933838 100644 --- a/packages/squiggle-lang/__tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.res +++ b/packages/squiggle-lang/__tests__/SquiggleLibrary/SquiggleLibrary_FunctionRegistryLibrary_test.res @@ -63,9 +63,15 @@ describe("FunctionRegistry Library", () => { testEvalToBe("SampleSet.fromList([3,5,2,3,5,2,3,5,2,3,3,5])", "Ok(Sample Set Distribution)") testEvalToBe("SampleSet.fromList([3,5,2,3,5,2,3,5,2,3,3,5])", "Ok(Sample Set Distribution)") testEvalToBe("SampleSet.fromFn({|| sample(normal(5,2))})", "Ok(Sample Set Distribution)") - testEvalToBe("SampleSet.min(SampleSet.fromDist(normal(50,2)), 2)", "Ok(Sample Set Distribution)") + testEvalToBe( + "SampleSet.min(SampleSet.fromDist(normal(50,2)), 2)", + "Ok(Sample Set Distribution)", + ) testEvalToBe("mean(SampleSet.min(SampleSet.fromDist(normal(50,2)), 2))", "Ok(2)") - testEvalToBe("SampleSet.max(SampleSet.fromDist(normal(50,2)), 10)", "Ok(Sample Set Distribution)") + testEvalToBe( + "SampleSet.max(SampleSet.fromDist(normal(50,2)), 10)", + "Ok(Sample Set Distribution)", + ) testEvalToBe( "addOne(t)=t+1; SampleSet.toList(SampleSet.map(SampleSet.fromList([1,2,3,4,5,6]), addOne))", "Ok([2,3,4,5,6,7])", diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 266fc383..24aea69a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -31,7 +31,7 @@ let isSymbolic = (t: t) => let sampleN = (t: t, n) => switch t { - | PointSet(r) => PointSetDist.T.sampleN(r,n) + | PointSet(r) => PointSetDist.T.sampleN(r, n) | SampleSet(r) => SampleSetDist.sampleN(r, n) | Symbolic(r) => SymbolicDist.T.sampleN(n, r) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 69c3c01c..ada7e462 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,24 +271,24 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) -let doN = (n, fn) => { - let items = Belt.Array.make(n, 0.0) - for x in 0 to n - 1 { - let _ = Belt.Array.set(items, x, fn()) + let doN = (n, fn) => { + let items = Belt.Array.make(n, 0.0) + for x in 0 to n - 1 { + let _ = Belt.Array.set(items, x, fn()) + } + items } - items -} -let sample = (t: t): float => { - let randomItem = Random.float(1.0) - t |> integralYtoX(randomItem) -} + let sample = (t: t): float => { + let randomItem = Random.float(1.0) + t |> integralYtoX(randomItem) + } -let sampleN = (dist, n) => { - let integralCache = integral(dist) - let distWithUpdatedIntegralCache = updateIntegralCache(Some(integralCache), dist) - doN(n, () => sample(distWithUpdatedIntegralCache)) -} + let sampleN = (dist, n) => { + let integralCache = integral(dist) + let distWithUpdatedIntegralCache = updateIntegralCache(Some(integralCache), dist) + doN(n, () => sample(distWithUpdatedIntegralCache)) + } }) let isNormalized = (t: t): bool => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index dec30f35..e8564daf 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -224,8 +224,8 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } -let sampleN = (t: t, n): array => { - let normalized = t->normalize->getShape - Stdlib.Random.sample(normalized.xs, {probs: normalized.ys, size: n}) -} + let sampleN = (t: t, n): array => { + let normalized = t->normalize->getShape + Stdlib.Random.sample(normalized.xs, {probs: normalized.ys, size: n}) + } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 807a56ef..9086f505 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -270,9 +270,9 @@ module T = Dist({ }) } - let discreteIntegralSum =({discrete}: t): float => Discrete.T.Integral.sum(discrete) - let continuousIntegralSum =({continuous}: t): float => Continuous.T.Integral.sum(continuous) - let integralSum =(t:t): float => discreteIntegralSum(t) +. continuousIntegralSum(t) + let discreteIntegralSum = ({discrete}: t): float => Discrete.T.Integral.sum(discrete) + let continuousIntegralSum = ({continuous}: t): float => Continuous.T.Integral.sum(continuous) + let integralSum = (t: t): float => discreteIntegralSum(t) +. continuousIntegralSum(t) let mean = ({discrete, continuous} as t: t): float => { let discreteMean = Discrete.T.mean(discrete) @@ -289,7 +289,7 @@ module T = Dist({ let _integralSum = integralSum(t) let getMeanOfSquares = ({discrete, continuous}: t) => { let discreteMean = discrete |> Discrete.shapeMap(XYShape.T.square) |> Discrete.T.mean - let continuousMean = continuous -> Continuous.Analysis.getMeanOfSquares + let continuousMean = continuous->Continuous.Analysis.getMeanOfSquares (discreteMean *. discreteIntegralSum(t) +. continuousMean *. continuousIntegralSum(t)) /. integralSum(t) } @@ -300,16 +300,18 @@ module T = Dist({ | _ => XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } } - - let sampleN = (t: t, n:int): array => { - let discreteIntegralSum = discreteIntegralSum(t); - let integralSum = integralSum(t); - let discreteSampleLength:int = (Js.Int.toFloat(n) *. discreteIntegralSum /. integralSum) -> E.Float.toInt - let continuousSampleLength = n - discreteSampleLength; - let continuousSamples = t.continuous ->Continuous.T.normalize-> Continuous.T.sampleN( continuousSampleLength) - let discreteSamples = t.discrete ->Discrete.T.normalize->Discrete.T.sampleN(discreteSampleLength) - Js.log3("Samples", continuousSamples, discreteSamples); - E.A.concat(discreteSamples, continuousSamples) -> E.A.shuffle + + let sampleN = (t: t, n: int): array => { + let discreteIntegralSum = discreteIntegralSum(t) + let integralSum = integralSum(t) + let discreteSampleLength: int = + (Js.Int.toFloat(n) *. discreteIntegralSum /. integralSum)->E.Float.toInt + let continuousSampleLength = n - discreteSampleLength + let continuousSamples = + t.continuous->Continuous.T.normalize->Continuous.T.sampleN(continuousSampleLength) + let discreteSamples = t.discrete->Discrete.T.normalize->Discrete.T.sampleN(discreteSampleLength) + Js.log3("Samples", continuousSamples, discreteSamples) + E.A.concat(discreteSamples, continuousSamples)->E.A.shuffle } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 2a1467a5..ba6174e9 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -201,9 +201,9 @@ module T = Dist({ let sampleN = (t: t, int): array => switch t { - | Mixed(m) => Mixed.T.sampleN(m,int) - | Discrete(m) => Discrete.T.sampleN(m,int) - | Continuous(m) => Continuous.T.sampleN(m,int) + | Mixed(m) => Mixed.T.sampleN(m, int) + | Discrete(m) => Discrete.T.sampleN(m, int) + | Continuous(m) => Continuous.T.sampleN(m, int) } })