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

Wip, working on allowing distributions in normal

Browse Source
This commit is contained in:
Ozzie Gooen 2022-05-18 19:10:34 -04:00
parent 76bbfb2ef1
commit 69d962ce75
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/squiggle-lang/src/rescript/FunctionRegistry.res
View File

@ -258,12 +258,24 @@ let p5and95 = (p5, p95) => contain(SymbolicDist.Normal.from90PercentCI(p5, p95))
let convertTwoInputs = (inputs: array<value>): result<expressionValue, string> => let convertTwoInputs = (inputs: array<value>): result<expressionValue, string> =>
twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev))
// let twoDistOrStdev = (a1:distOrNumber, a2:distOrNumber, fn) => {
// switch (a1, a2) {
// | (Number(a1), Number(a2)) => fn(a1, a2)
// | (Dist(a1), Number(a2)) => toSampleSetDist(a1, 1000)->sampleMap(r => fn(r, a2) |> sample)
// | (Number(a1), Dist(a2)) => toSampleSetDist(a2, 1000)->sampleMap(r => fn(a1, r) |> sample)
// | (Dist(a1), Dist(a2)) => SampleSetDist.map2(a1, a2, (m, s) => fn(m, s) |> sample)
// }
// }
let normal = Function.make( let normal = Function.make(
"Normal", "Normal",
[ [
Function.makeDefinition("normal", [I_Numeric, I_Numeric], inputs => Function.makeDefinition("normal", [I_Numeric, I_Numeric], inputs =>
twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev))
), ),
Function.makeDefinition("normal", [I_DistOrNumber, I_DistOrNumber], inputs =>
twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev))
),
Function.makeDefinition( Function.makeDefinition(
"normal", "normal",
[I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])],