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

feat: Save progress before pushing to repository

Browse Source 
Note: Not for use yet
This commit is contained in:
NunoSempere 2022-04-20 12:25:52 -04:00
parent 6e834af7d7
commit 10f88b4a2a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/squiggle-lang/src/rescript/Distributions/PointSetDist/NumericShapeCombination2.res
View File

@ -7,7 +7,7 @@ let getApproximatePdfOfContinuousDistributionAtPoint = (
): float => { ): float => {
let closestFromBelowIndex = E.A.reducei(dist.xs, None, (accumulator, item, index) => let closestFromBelowIndex = E.A.reducei(dist.xs, None, (accumulator, item, index) =>
item < point ? Some(index) : accumulator item < point ? Some(index) : accumulator
) ) // This could be improved by taking advantage of the fact that these are ordered
let closestFromAboveIndexOption = Belt.Array.getIndexBy(dist.xs, item => item > point) let closestFromAboveIndexOption = Belt.Array.getIndexBy(dist.xs, item => item > point)
let weightedMean = ( let weightedMean = (
@ -29,7 +29,7 @@ let getApproximatePdfOfContinuousDistributionAtPoint = (
raise( raise(
LogicallyInconsistent( LogicallyInconsistent(
"Logically inconsistent option in NumericShapeCombination2.res. Possibly caused by empty distribution", "Logically inconsistent option in NumericShapeCombination2.res. Possibly caused by empty distribution",
), ), // to do: give an error type
) // all are smaller, and all are larger ) // all are smaller, and all are larger
| (None, Some(i)) => 0.0 // none are smaller, all are larger | (None, Some(i)) => 0.0 // none are smaller, all are larger
| (Some(i), None) => 0.0 // all are smaller, none are larger | (Some(i), None) => 0.0 // all are smaller, none are larger
@ -66,6 +66,9 @@ let addContinuousContinuous = (
let getApproximatePdfOfS2AtPoint = x => getApproximatePdfOfContinuousDistributionAtPoint(s2, x) let getApproximatePdfOfS2AtPoint = x => getApproximatePdfOfContinuousDistributionAtPoint(s2, x)
let float = x => Belt.Int.toFloat(x) let float = x => Belt.Int.toFloat(x)
// Compute the integral numerically. // Compute the integral numerically.
// I wouldn't worry too much about the O(n^3). At 5000 samples, this takes on the order of 25 million operations
// The AMD Ryzen 7 processor in my computer can do around 300K million operations per second.
// src: https://wikiless.org/wiki/Instructions_per_second?lang=en#Thousand_instructions_per_second_(TIPS/kIPS)
for i in 0 to numIntervals - 1 { for i in 0 to numIntervals - 1 {
newXs[i] = lowerBound +. float(i) *. epsilon newXs[i] = lowerBound +. float(i) *. epsilon
newYs[i] = 0.0 newYs[i] = 0.0
@ -83,6 +86,13 @@ let addContinuousContinuous = (
{xs: newXs, ys: newYs} {xs: newXs, ys: newYs}
} }
let getArithmeticComplementOfDistributionForSubstraction = (
dist: PointSetTypes.xyShape,
): PointSetTypes.xyShape => {
let newXs = Belt.Array.map(dist.xs, x => -.x)
{xs: newXs, ys: dist.ys}
}
let combineShapesContinuousContinuous = ( let combineShapesContinuousContinuous = (
op: Operation.algebraicOperation, op: Operation.algebraicOperation,
s1: PointSetTypes.xyShape, s1: PointSetTypes.xyShape,
@ -90,11 +100,12 @@ let combineShapesContinuousContinuous = (
): PointSetTypes.xyShape => { ): PointSetTypes.xyShape => {
let result = switch op { let result = switch op {
| #Add => addContinuousContinuous(s1, s2) | #Add => addContinuousContinuous(s1, s2)
| #Subtract => emptyXYShape | #Subtract =>
addContinuousContinuous(s1, getArithmeticComplementOfDistributionForSubstraction(s2))
| #Multiply => emptyXYShape | #Multiply => emptyXYShape
| #Divide => emptyXYShape
| #Power => emptyXYShape | #Power => emptyXYShape
| #Logarithm => emptyXYShape | #Logarithm => emptyXYShape
| #Divide => emptyXYShape
} }
result result
} }