improve Part domains

joshday · Mar 16, 2020 · 573ba8a · 573ba8a · joshday · Mar 16, 2020
1 parent fdfa2f5
commit 573ba8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "OnlineStatsBase"
 uuid = "925886fa-5bf2-5e8e-b522-a9147a512338"
-version = "1.2.0"
+version = "1.2.1"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/part.jl b/src/part.jl
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------# Part
-struct Part{D, O} <: OnlineStat{TwoThings}
+struct Part{D, O<:OnlineStat} <: OnlineStat{TwoThings}
     stat::O 
     domain::D
 end
@@ -53,11 +53,12 @@ end
 mutable struct ClosedInterval{T}
     first::T 
     last::T
+    ClosedInterval(a::T, b::T) where {T} = a < b ? new{T}(a,b) : error("Arguments must be ordered")
 end
 Base.show(io::IO, b::ClosedInterval) = print(io, "ClosedInterval: [$(b.first), $(b.last)]")
 Base.in(x, bucket::ClosedInterval) = bucket.first ≤ x ≤ bucket.last
 Base.isless(a::ClosedInterval, b::ClosedInterval) = isless(a.first, b.first)
-function Base.merge!(a::ClosedInterval, b::ClosedInterval)
+function Base.merge!(a::ClosedInterval, b::ClosedInterval, astat, bstat)
     a.first = min(a.first, b.first)
     a.last = max(a.last, b.last)
     a