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

second test case

Browse Source
This commit is contained in:
Quinn Dougherty 2022-03-29 10:40:38 -04:00
parent 669fb95479
commit 49c091043a
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/squiggle-lang/__tests__/Symbolic_test.res
View File

@ -9,14 +9,22 @@ let makeTest = (~only=false, str, item1, item2) =>
: test(str, () => expect(item1) -> toEqual(item2)) : test(str, () => expect(item1) -> toEqual(item2))
let normalParams1: SymbolicDistTypes.normal = {mean: 5.0, stdev: 2.0} let normalParams1: SymbolicDistTypes.normal = {mean: 5.0, stdev: 2.0}
let normalParams2: SymbolicDistTypes.normal = {mean: 10.0, stdev: 2.0} // let normalParams2: SymbolicDistTypes.normal = {mean: 10.0, stdev: 2.0}
let normalParams3: SymbolicDistTypes.normal = {mean: 20.0, stdev: 2.0} let normalParams3: SymbolicDistTypes.normal = {mean: 20.0, stdev: 2.0}
let range20 = [0.0,1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0] let range20 = [0.0,1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0]
let forSparkline = (thisPdf, inps) => map(thisPdf, inps) let forSparkline = (thisPdf, inps) => map(thisPdf, inps)
describe("Sparklines", () => { describe("Normal with Sparklines", () => {
let pdf1 = x => Normal.pdf(x, normalParams1) let pdf1 = x => Normal.pdf(x, normalParams1)
let forSparkline1 = forSparkline(pdf1, range20) let forSparkline1 = forSparkline(pdf1, range20)
Js.Console.log(Sparklines.sparkly(forSparkline1, ~options={minimum: None, maximum: None})) makeTest("mean=5", Sparklines.sparkly(forSparkline1, ~options={minimum: None, maximum: None}), `▁▂▃▅███▅▃▂▁▁▁▁▁▁▁▁▁▁▁`)
makeTest("Spark1", 1, 0)
let normal4 = Normal.add(normalParams1, normalParams3)
let normalParams4 = switch normal4 {
| #Normal(params) => params
| _ => {mean: 0.0, stdev: 1.0}
}
let pdf4 = x => Normal.pdf(x, normalParams4)
let forSparkline4 = forSparkline(pdf4, range20)
makeTest("mixture of two normals", Sparklines.sparkly(forSparkline4, ~options={minimum: None, maximum: None}), `▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▂▅█`)
}) })

5
packages/squiggle-lang/src/rescript/utility/Sparklines.res
View File

@ -14,16 +14,17 @@ let sparkly = (
// if not numbers is not an array, throw typeerror "Expected an array" // if not numbers is not an array, throw typeerror "Expected an array"
// Unlike reference impl, we assume that all numbers are finite, i.e. no NaN. // Unlike reference impl, we assume that all numbers are finite, i.e. no NaN.
let ticks = ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]// ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"] let ticks = [`▁`, `▂`, `▃`, `▄`, `▅`, `▆`, `▇`, `█`]
let minimum = switch options.minimum { let minimum = switch options.minimum {
| None => Js.Math.minMany_float(numbers) | None => Js.Math.minMany_float(numbers)
| Some(x) => x | Some(x) => x
} }
// let minimum = E.O.default(Js.Math.minMany_float(numbers))
let maximum = switch options.maximum { let maximum = switch options.maximum {
| None => Js.Math.maxMany_float(numbers) | None => Js.Math.maxMany_float(numbers)
| Some(x) => x | Some(x) => x
} }
// let maximum = E.O.default(Js.Math.maxMany_float(numbers))
// Use a high tick if data is constant and max is not equal // Use a high tick if data is constant and max is not equal
let ticks = if minimum == maximum && maximum != 0.0 { let ticks = if minimum == maximum && maximum != 0.0 {
[ticks[4]] [ticks[4]]