diff --git a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res index 6a61e3e1..9a77d3e5 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res @@ -9,7 +9,7 @@ describe("dotSubtract", () => { test("mean of normal minus exponential (unit)", () => { let mean = 0.0 let rate = 10.0 - + exception MeanFailed let dotDifference = DistributionOperation.Constructors.pointwiseSubtract( ~env, mkNormal(mean, 1.0), @@ -19,7 +19,7 @@ describe("dotSubtract", () => { let meanAnalytical = mean -. 1.0 /. rate switch meanResult { | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) - | Error(err) => err->expect->toBe(DistributionTypes.OperationError(DivisionByZeroError)) + | Error(_) => raise(MeanFailed) } }) Skip.test("mean of normal minus exponential (property)", () => { diff --git a/packages/squiggle-lang/__tests__/Distributions/Score_test.res b/packages/squiggle-lang/__tests__/Distributions/Score_test.res deleted file mode 100644 index 33cb0c82..00000000 --- a/packages/squiggle-lang/__tests__/Distributions/Score_test.res +++ /dev/null @@ -1,11 +0,0 @@ -/* -This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 -*/ -open Jest -open Expect - -describe("KL divergence", () => { - test("our's agrees with analytical", () => { - true->expect->toBe(true) - }) -}) diff --git a/packages/squiggle-lang/__tests__/TS/Score_test.ts b/packages/squiggle-lang/__tests__/TS/Score_test.ts deleted file mode 100644 index a7d24023..00000000 --- a/packages/squiggle-lang/__tests__/TS/Score_test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { testRun } from "./TestHelpers"; - -describe("KL divergence", () => { - test.skip("by integral solver agrees with analytical", () => { - let squiggleStringKL = `prediction=normal(4, 1) - answer=normal(1,1) - logSubtraction=dotSubtract(scaleLog(answer),scaleLog(prediction)) - klintegrand=dotMultiply(logSubtraction, answer) - klintegral = integralSum(klintegrand) - analyticalKl = log(1 / 1) + 1 ^ 2 / (2 * 1 ^ 2) + ((4 - 1) * (1 - 4) / (2 * 1 * 1)) - 1 / 2 - klintegral - analyticalKl`; - let squiggleResultKL = testRun(squiggleStringKL); - expect(squiggleResultKL.value).toBeCloseTo(0); - }); -}); - -let squiggleStringLS = `prediction=normal(4,1) - answer=normal(1,1) - logScore(prediction, answer)`; diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index c9ed718e..54c4c814 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -70,4 +70,3 @@ let cauchyMakeR = (local, rate) => fmapGenDist(SymbolicDist.Cauchy.make(local, r let lognormalMakeR = (mu, sigma) => fmapGenDist(SymbolicDist.Lognormal.make(mu, sigma)) let triangularMakeR = (low, mode, high) => fmapGenDist(SymbolicDist.Triangular.make(low, mode, high)) -// let floatMakeR = x =>E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Float.make(x))