steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sets: fix cardinality of sequences, and speed up subset?.

db4
John Benediktsson 2011-08-27 20:20:56 -07:00
parent fdf7c91ebc
commit e2cca82fca
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/sets/sets.factor
View File

@ -60,11 +60,18 @@ M: set diff
M: set intersects? M: set intersects?
small/large sequence/tester any? ; small/large sequence/tester any? ;
<PRIVATE
: (subset?) ( set1 set2 -- ? )
sequence/tester all? ; inline
PRIVATE>
M: set subset? M: set subset?
sequence/tester all? ; 2dup [ cardinality ] bi@ > [ 2drop f ] [ (subset?) ] if ;
M: set set= M: set set=
2dup [ cardinality ] bi@ eq? [ subset? ] [ 2drop f ] if ; 2dup [ cardinality ] bi@ eq? [ (subset?) ] [ 2drop f ] if ;
M: set fast-set ; M: set fast-set ;
@ -107,7 +114,7 @@ M: sequence null?
empty? ; inline empty? ; inline
M: sequence cardinality M: sequence cardinality
length ; pruned length ;
: combine ( sets -- set ) : combine ( sets -- set )
[ f ] [ f ]