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

Refactored Sparklines.res

Browse Source
This commit is contained in:
Ozzie Gooen 2022-03-29 16:31:08 -04:00
parent 50f5256dc5
commit cd5680f2dc
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,13 +22,12 @@ describe("Normal distribution with sparklines", () => {
let normalDistAtMean5: SymbolicDistTypes.normal = {mean: 5.0, stdev: 2.0} let normalDistAtMean5: SymbolicDistTypes.normal = {mean: 5.0, stdev: 2.0}
let normalDistAtMean10: SymbolicDistTypes.normal = {mean: 10.0, stdev: 2.0} let normalDistAtMean10: SymbolicDistTypes.normal = {mean: 10.0, stdev: 2.0}
let range20Float = E.A.rangeFloat(0, 20) // [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,] let range20Float = E.A.rangeFloat(0, 20) // [0.0,1.0,2.0,3.0,4.0,...19.0,]
let pdfNormalDistAtMean5 = x => Normal.pdf(x, normalDistAtMean5) let pdfNormalDistAtMean5 = x => Normal.pdf(x, normalDistAtMean5)
let sparklineMean5 = pdfImage(pdfNormalDistAtMean5, range20Float) let sparklineMean5 = pdfImage(pdfNormalDistAtMean5, range20Float)
makeTest("mean=5", Sparklines.create(sparklineMean5, ()), `▁▂▃▅███▅▃▂▁▁▁▁▁▁▁▁▁▁▁`) makeTest("mean=5", Sparklines.create(sparklineMean5, ()), `▁▂▃▅███▅▃▂▁▁▁▁▁▁▁▁▁▁▁`)
let sparklineMean15 = normalDistAtMean5 -> parameterWiseAdditionHelper(normalDistAtMean10) -> pdfImage(range20Float) let sparklineMean15 = normalDistAtMean5 -> parameterWiseAdditionHelper(normalDistAtMean10) -> pdfImage(range20Float)
// let sparklineMean15 = pdfImage(pdfNormalDistAtMean15, range20Float)
makeTest("parameter-wise addition of two normal distributions", Sparklines.create(sparklineMean15, ()), `▁▁▁▁▁▁▁▁▁▁▂▃▅▇███▇▅▃▂`) makeTest("parameter-wise addition of two normal distributions", Sparklines.create(sparklineMean15, ()), `▁▁▁▁▁▁▁▁▁▁▂▃▅▇███▇▅▃▂`)
}) })

6
packages/squiggle-lang/src/rescript/utility/E.res
View File

@ -269,7 +269,8 @@ module A = {
)) ))
|> Rationale.Result.return |> Rationale.Result.return
} }
let rangeFloat = (start, stop) => start -> Belt.Array.rangeBy(stop, ~step=1) -> (arr => fmap(Belt.Int.toFloat, arr)) let rangeFloat = (~step=1, start, stop) =>
Belt.Array.rangeBy(start, stop, ~step) |> fmap(Belt.Int.toFloat)
// This zips while taking the longest elements of each array. // This zips while taking the longest elements of each array.
let zipMaxLength = (array1, array2) => { let zipMaxLength = (array1, array2) => {
@ -324,7 +325,7 @@ module A = {
} }
) )
let filter = (o, e) => Js.Array.filter(o, e) let filter = (o, e) => Js.Array.filter(o, e)
let joinWith = (fill, arr) => Js.Array.joinWith(fill, arr) let joinWith = Js.Array.joinWith
module O = { module O = {
let concatSomes = (optionals: array<option<'a>>): array<'a> => let concatSomes = (optionals: array<option<'a>>): array<'a> =>
@ -407,6 +408,7 @@ module A = {
: { : {
let _ = Js.Array.push(element, continuous) let _ = Js.Array.push(element, continuous)
} }
() ()
}) })

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

@ -3,26 +3,24 @@
// Omitting rgb "fire" style, so no `chalk` dependency // Omitting rgb "fire" style, so no `chalk` dependency
// Omitting: NaN handling, special consideration for constant data. // Omitting: NaN handling, special consideration for constant data.
let create = ( let ticks = [`▁`, `▂`, `▃`, `▄`, `▅`, `▆`, `▇`, `█`]
numbers: array<float>,
~minimum=?,
~maximum=?,
()
) => {
let ticks = [`▁`, `▂`, `▃`, `▄`, `▅`, `▆`, `▇`, `█`]
let minimum = E.O.default(Js.Math.minMany_float(numbers), minimum) let _ticksLength = E.A.length(ticks)
let maximum = E.O.default(Js.Math.maxMany_float(numbers), maximum)
let toHeight = (number: float) => { let _heightToTickIndex = (maximum: float, v: float) => {
let tickIndex = Js.Math.ceil_int((number /. maximum) *. (ticks -> Belt.Array.length -> Belt.Int.toFloat)) - 1 let v = Js.Math.ceil_int(v /. maximum *. Belt.Int.toFloat(_ticksLength)) - 1
let tickIndex = if maximum == 0.0 || tickIndex < 0 { min(v, 0)
0 }
} else {
tickIndex let create = (relativeHeights: array<float>, ~maximum=?, ()) => {
} if E.A.length(relativeHeights) === 0 {
ticks[tickIndex] ""
} } else {
let maximum = maximum |> E.O.default(E.A.max(relativeHeights) |> E.O.toExn(""))
toHeight -> E.A.fmap(numbers) -> (arr => E.A.joinWith("", arr))
relativeHeights
|> E.A.fmap(_heightToTickIndex(maximum))
|> E.A.fmap(r => E.A.get(ticks, r) |> E.O.toExn(""))
|> E.A.joinWith("")
}
} }