interval-sets: changed tests and docs for interval-in?.

diff --git a/basis/interval-sets/interval-sets-docs.factor b/basis/interval-sets/interval-sets-docs.factor
index 18930afa10a319e7074e4b3cbfdfbccf8eb75e51..81df1b33c778f475a5f5d11f4c83f585b4fcb05c 100644 (file)
--- a/basis/interval-sets/interval-sets-docs.factor
+++ b/basis/interval-sets/interval-sets-docs.factor
@@ -9,7 +9,7 @@ ARTICLE: "interval-sets" "Interval sets"
 "The " { $vocab-link "interval-sets" } " vocabulary implements an efficient data structure for sets of positive, machine word-sized integers, specified by ranges. The space taken by the data structure is proportional to the number of intervals contained. Membership testing is O(log n), and creation is O(n log n), where n is the number of ranges. Boolean operations are O(n). Interval sets are immutable."
 { $subsection interval-set }
 { $subsection <interval-set> }
-{ $subsection in? }
+{ $subsection interval-in? }
 { $subsection <interval-not> }
 { $subsection <interval-and> }
 { $subsection <interval-or> } ;
@@ -22,7 +22,7 @@ HELP: <interval-set>
 { $values { "specification" "a sequence of numbers and pairs of numbers" } { "interval-set" interval-set } }
 { $description "Creates an interval set based on the specification. Pairs of numbers are interpreted as intervals which include their endpoints, and individual numbers are interpreted to be in the set, in a singleton range." } ;
 
-HELP: in?
+HELP: interval-in?
 { $values { "key" integer } { "set" interval-set } { "?" { { $link t } " or " { $link f } } } }
 { $description "Tests whether an integer is in an interval set. This takes O(log n) time for an interval map composed of n intervals." } ;
 

diff --git a/basis/interval-sets/interval-sets-tests.factor b/basis/interval-sets/interval-sets-tests.factor
index 236d29b4a8304a3e96f631ffdd9a32f0b558b53e..cf900bb70072af93358cdb055fb634cf7b0c89d2 100644 (file)
--- a/basis/interval-sets/interval-sets-tests.factor
+++ b/basis/interval-sets/interval-sets-tests.factor
@@ -4,85 +4,85 @@ USING: tools.test interval-sets math grouping sequences accessors
 combinators.short-circuit literals ;
 IN: interval-sets.tests
 
-{ f } [ 0 T{ interval-set } in? ] unit-test
-{ f } [ 2 T{ interval-set } in? ] unit-test
+{ f } [ 0 T{ interval-set } interval-in? ] unit-test
+{ f } [ 2 T{ interval-set } interval-in? ] unit-test
 
 CONSTANT: i1 $[
     { { 3 4 } } <interval-set> ]
 
-{ f } [ 2 i1 in? ] unit-test
-{ t } [ 3 i1 in? ] unit-test
-{ t } [ 4 i1 in? ] unit-test
-{ f } [ 5 i1 in? ] unit-test
+{ f } [ 2 i1 interval-in? ] unit-test
+{ t } [ 3 i1 interval-in? ] unit-test
+{ t } [ 4 i1 interval-in? ] unit-test
+{ f } [ 5 i1 interval-in? ] unit-test
 
 CONSTANT: i2 $[
     { { 3 4 } } <interval-set>
     0x10FFFF <interval-not> ] ! unicode-max
 
-{ t } [ 2 i2 in? ] unit-test
-{ f } [ 3 i2 in? ] unit-test
-{ f } [ 4 i2 in? ] unit-test
-{ t } [ 5 i2 in? ] unit-test
+{ t } [ 2 i2 interval-in? ] unit-test
+{ f } [ 3 i2 interval-in? ] unit-test
+{ f } [ 4 i2 interval-in? ] unit-test
+{ t } [ 5 i2 interval-in? ] unit-test
 
 CONSTANT: i3 $[
     { { 2 4 } } <interval-set>
     { { 6 8 } } <interval-set>
     <interval-or> ]
 
-{ f } [ 1 i3 in? ] unit-test
-{ t } [ 2 i3 in? ] unit-test
-{ t } [ 3 i3 in? ] unit-test
-{ t } [ 4 i3 in? ] unit-test
-{ f } [ 5 i3 in? ] unit-test
-{ t } [ 6 i3 in? ] unit-test
-{ t } [ 7 i3 in? ] unit-test
-{ t } [ 8 i3 in? ] unit-test
-{ f } [ 9 i3 in? ] unit-test
+{ f } [ 1 i3 interval-in? ] unit-test
+{ t } [ 2 i3 interval-in? ] unit-test
+{ t } [ 3 i3 interval-in? ] unit-test
+{ t } [ 4 i3 interval-in? ] unit-test
+{ f } [ 5 i3 interval-in? ] unit-test
+{ t } [ 6 i3 interval-in? ] unit-test
+{ t } [ 7 i3 interval-in? ] unit-test
+{ t } [ 8 i3 interval-in? ] unit-test
+{ f } [ 9 i3 interval-in? ] unit-test
 
 CONSTANT: i4 $[
     { { 2 4 } } <interval-set>
     { { 6 8 } } <interval-set>
     <interval-and> ]
 
-{ f } [ 1 i4 in? ] unit-test
-{ f } [ 2 i4 in? ] unit-test
-{ f } [ 3 i4 in? ] unit-test
-{ f } [ 4 i4 in? ] unit-test
-{ f } [ 5 i4 in? ] unit-test
-{ f } [ 6 i4 in? ] unit-test
-{ f } [ 7 i4 in? ] unit-test
-{ f } [ 8 i4 in? ] unit-test
-{ f } [ 9 i4 in? ] unit-test
+{ f } [ 1 i4 interval-in? ] unit-test
+{ f } [ 2 i4 interval-in? ] unit-test
+{ f } [ 3 i4 interval-in? ] unit-test
+{ f } [ 4 i4 interval-in? ] unit-test
+{ f } [ 5 i4 interval-in? ] unit-test
+{ f } [ 6 i4 interval-in? ] unit-test
+{ f } [ 7 i4 interval-in? ] unit-test
+{ f } [ 8 i4 interval-in? ] unit-test
+{ f } [ 9 i4 interval-in? ] unit-test
 
 CONSTANT: i5 $[
     { { 2 5 } } <interval-set>
     { { 4 8 } } <interval-set>
     <interval-or> ]
 
-{ f } [ 1 i5 in? ] unit-test
-{ t } [ 2 i5 in? ] unit-test
-{ t } [ 3 i5 in? ] unit-test
-{ t } [ 4 i5 in? ] unit-test
-{ t } [ 5 i5 in? ] unit-test
-{ t } [ 6 i5 in? ] unit-test
-{ t } [ 7 i5 in? ] unit-test
-{ t } [ 8 i5 in? ] unit-test
-{ f } [ 9 i5 in? ] unit-test
+{ f } [ 1 i5 interval-in? ] unit-test
+{ t } [ 2 i5 interval-in? ] unit-test
+{ t } [ 3 i5 interval-in? ] unit-test
+{ t } [ 4 i5 interval-in? ] unit-test
+{ t } [ 5 i5 interval-in? ] unit-test
+{ t } [ 6 i5 interval-in? ] unit-test
+{ t } [ 7 i5 interval-in? ] unit-test
+{ t } [ 8 i5 interval-in? ] unit-test
+{ f } [ 9 i5 interval-in? ] unit-test
 
 CONSTANT: i6 $[
     { { 2 5 } } <interval-set>
     { { 4 8 } } <interval-set>
     <interval-and> ]
 
-{ f } [ 1 i6 in? ] unit-test
-{ f } [ 2 i6 in? ] unit-test
-{ f } [ 3 i6 in? ] unit-test
-{ t } [ 4 i6 in? ] unit-test
-{ t } [ 5 i6 in? ] unit-test
-{ f } [ 6 i6 in? ] unit-test
-{ f } [ 7 i6 in? ] unit-test
-{ f } [ 8 i6 in? ] unit-test
-{ f } [ 9 i6 in? ] unit-test
+{ f } [ 1 i6 interval-in? ] unit-test
+{ f } [ 2 i6 interval-in? ] unit-test
+{ f } [ 3 i6 interval-in? ] unit-test
+{ t } [ 4 i6 interval-in? ] unit-test
+{ t } [ 5 i6 interval-in? ] unit-test
+{ f } [ 6 i6 interval-in? ] unit-test
+{ f } [ 7 i6 interval-in? ] unit-test
+{ f } [ 8 i6 interval-in? ] unit-test
+{ f } [ 9 i6 interval-in? ] unit-test
 
 : criterion ( interval-set -- ? )
     array>> {