use < and <= for the partial order on Set and IntSet

ssfrr · Jan 8, 2014 · 5cc0b7d · 5cc0b7d
1 parent c85b103
commit 5cc0b7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/base/intset.jl b/base/intset.jl
@@ -287,3 +287,5 @@ function isequal(s1::IntSet, s2::IntSet)
 end
 
 issubset(a::IntSet, b::IntSet) = isequal(a, intersect(a,b))
+<(a::IntSet, b::IntSet) = (a<=b) && !isequal(a,b)
+<=(a::IntSet, b::IntSet) = issubset(a, b)
diff --git a/base/set.jl b/base/set.jl
@@ -75,7 +75,7 @@ function setdiff(a::Set, b::Set)
 end
 
 isequal(l::Set, r::Set) = (length(l) == length(r)) && (l <= r)
-isless(l::Set, r::Set) = (length(l) < length(r)) && (l <= r)
+<(l::Set, r::Set) = (length(l) < length(r)) && (l <= r)
 <=(l::Set, r::Set) = issubset(l, r)
 
 function issubset(l, r)

diff --git a/test/collections.jl b/test/collections.jl
@@ -168,10 +168,10 @@ d = (String => String)[ a => "foo" for a in ["a","b","c"]]
 @test !isempty(Set("banana", "apple"))
 @test !isempty(Set(1, 1:10, "pear"))
 
-# isless
-@test isless(Set(), Set(1))
-@test isless(Set(1), Set(1,2))
-@test !isless(Set(3), Set(1,2))
+# ordering
+@test Set() < Set(1)
+@test Set(1) < Set(1,2)
+@test !(Set(3) < Set(1,2))
 @test !(Set(3) > Set(1,2))
 @test Set(1,2,3) > Set(1,2)
 @test !(Set(3) <= Set(1,2))