Using SkipLists for large windows

yha · Jun 28, 2022 · d944fb0 · d944fb0 · yha · Jun 28, 2022
1 parent f39919e
commit d944fb0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,12 +1,14 @@
 name = "RunningQuantiles"
 uuid = "80c66bcf-cf80-4640-8128-20a4ffc975e3"
 authors = ["yha <yharel@campus.technion.ac.il>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
+SkipLists = "1bc1db3f-e088-4b4f-941a-131a3eb578db"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
 OffsetArrays = "1.12"
-julia = "1.7"
+SkipLists = "1.1.1"
+julia = "1.7"
diff --git a/bench/benchmark.jl b/bench/benchmark.jl
@@ -12,10 +12,11 @@ function make_v(p_nan = 0.1, n=10_000)
     v
 end
 
-benches = Dict("FastRunningMedian" => (v,w) -> FastRunningMedian.running_median(v, w),
-               "RunningQuantiles"  => (v,w) -> running_median(v, w),
-               "SortFilters"       => (v,w) -> SortFilters.movsort(v, w, 0.5)
-                )
+benches = OrderedDict(
+    "FastRunningMedian" => (v,w) -> FastRunningMedian.running_median(v, w),
+    "SortFilters"       => (v,w) -> SortFilters.movsort(v, w, 0.5),
+    "RunningQuantiles"  => (v,w) -> running_median(v, w),
+)
 
 function bench(f,k,n,w)
     @info "Benchmarking $k, w=$w"

diff --git a/src/RunningQuantiles.jl b/src/RunningQuantiles.jl
@@ -2,8 +2,7 @@ module RunningQuantiles
 
 export running_quantile, running_median, SkipNaNs, PropagateNaNs, ErrOnNaN
 
-# `SkipLists` will be used when a version including PR #21 is released
-# using SkipLists
+using SkipLists
 using OffsetArrays
 using Statistics
 
@@ -79,17 +78,15 @@ function _running_quantile(v, p, r::AbstractUnitRange, nan_mode; buffer)
     result
 end
 
-#### To use when `SkipLists` support indexing (SkipLists PR #21)
-# function default_buffer(v,p,w)
-#     # Heuristics derived from superficial benchmarking.
-#     # These can probably be improved.
-#     len = length(make_window(w))
-#     if len > 6000
-#         SkipList{eltype(v)}(; node_capacity = round(Int, len/10))
-#     else
-#         SortedVector{eltype(v)}()
-#     end
-# end
-default_buffer(v,p,w) = SortedVector{eltype(v)}()
+function default_buffer(v,p,w)
+    # Heuristics derived from superficial benchmarking.
+    # These can probably be improved.
+    len = length(make_window(w))
+    if len > 6000
+        SkipList{eltype(v)}(; node_capacity = round(Int, len/10))
+    else
+        SortedVector{eltype(v)}()
+    end
+end
 
 end # module