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

E.A.Floats.sort uses typed arrays

Browse Source
This commit is contained in:
Vyacheslav Matyukhin 2022-09-21 03:17:25 +04:00
parent 5db63fbe9f
commit 59d38f7885
No known key found for this signature in database
GPG Key ID: 3D2A774C5489F96C
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist_ToPointSet.res
View File

@ -39,13 +39,6 @@ module Internals = {
module T = { module T = {
type t = array<float> type t = array<float>
let fastSort = (samples: t): t => {
let typedSamples = samples->Js.TypedArray2.Float64Array.make->Js.TypedArray2.Float64Array.sortInPlace
// why is there no standard function in Resctipt for this?
let typedToArray: Js.TypedArray2.Float64Array.t => t = %raw(`a => Array.from(a)`)
typedToArray(typedSamples)
}
let xWidthToUnitWidth = (samples, outputXYPoints, xWidth) => { let xWidthToUnitWidth = (samples, outputXYPoints, xWidth) => {
let xyPointRange = E.A.Sorted.range(samples)->E.O2.default(0.0) let xyPointRange = E.A.Sorted.range(samples)->E.O2.default(0.0)
let xyPointWidth = xyPointRange /. float_of_int(outputXYPoints) let xyPointWidth = xyPointRange /. float_of_int(outputXYPoints)
@ -69,7 +62,7 @@ let toPointSetDist = (
~samplingInputs: SamplingInputs.samplingInputs, ~samplingInputs: SamplingInputs.samplingInputs,
(), (),
): Internals.Types.outputs => { ): Internals.Types.outputs => {
let samples = samples->Internals.T.fastSort let samples = samples->E.A.Floats.sort
let minDiscreteToKeep = MagicNumbers.ToPointSet.minDiscreteToKeep(samples) let minDiscreteToKeep = MagicNumbers.ToPointSet.minDiscreteToKeep(samples)
let (continuousPart, discretePart) = E.A.Floats.Sorted.splitContinuousAndDiscreteForMinWeight( let (continuousPart, discretePart) = E.A.Floats.Sorted.splitContinuousAndDiscreteForMinWeight(

7
packages/squiggle-lang/src/rescript/Utility/E/E_A.res
View File

@ -229,9 +229,10 @@ module Floats = {
let floatCompare: (float, float) => int = compare let floatCompare: (float, float) => int = compare
let sort = t => { let sort = t => {
let r = t let typed = t->Js.TypedArray2.Float64Array.make->Js.TypedArray2.Float64Array.sortInPlace
r |> Array.fast_sort(floatCompare) // why is there no standard function in Resctipt for this?
r let typedToArray: Js.TypedArray2.Float64Array.t => t = %raw(`a => Array.from(a)`)
typedToArray(typed)
} }
let getNonFinite = (t: t) => Belt.Array.getBy(t, r => !Js.Float.isFinite(r)) let getNonFinite = (t: t) => Belt.Array.getBy(t, r => !Js.Float.isFinite(r))