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

Remove dead code from math.intervals; we no longer need the operations to support f anymore

db4
Slava Pestov 2008-11-06 11:57:31 -06:00
parent 4e55cd973b
commit 751426f283
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/math/intervals/intervals-tests.factor
View File

@ -83,8 +83,6 @@ IN: math.intervals.tests
0 1 (a,b) 1 2 [a,b] interval-union 0 2 (a,b] = 0 1 (a,b) 1 2 [a,b] interval-union 0 2 (a,b] =
] unit-test ] unit-test
[ f ] [ 0 1 (a,b) f interval-union ] unit-test
[ t ] [ [ t ] [
0 1 (a,b) 0 1 [a,b] interval-intersect 0 1 (a,b) = 0 1 (a,b) 0 1 [a,b] interval-intersect 0 1 (a,b) =
] unit-test ] unit-test

21
basis/math/intervals/intervals.factor
View File

@ -115,14 +115,10 @@ TUPLE: interval { from read-only } { to read-only } ;
{ [ dup empty-interval eq? ] [ nip ] } { [ dup empty-interval eq? ] [ nip ] }
{ [ over empty-interval eq? ] [ drop ] } { [ over empty-interval eq? ] [ drop ] }
[ [
2dup and [ [ interval>points ] bi@ swapd
[ interval>points ] bi@ swapd [ [ swap endpoint< ] most ]
[ [ swap endpoint< ] most ] [ [ swap endpoint> ] most ] 2bi*
[ [ swap endpoint> ] most ] 2bi* <interval>
<interval>
] [
or
] if
] ]
} cond ; } cond ;
@ -133,13 +129,7 @@ TUPLE: interval { from read-only } { to read-only } ;
{ {
{ [ dup empty-interval eq? ] [ drop ] } { [ dup empty-interval eq? ] [ drop ] }
{ [ over empty-interval eq? ] [ nip ] } { [ over empty-interval eq? ] [ nip ] }
[ [ [ interval>points 2array ] bi@ append points>interval ]
2dup and [
[ interval>points 2array ] bi@ append points>interval
] [
2drop f
] if
]
} cond ; } cond ;
: interval-subset? ( i1 i2 -- ? ) : interval-subset? ( i1 i2 -- ? )
@ -183,7 +173,6 @@ TUPLE: interval { from read-only } { to read-only } ;
: interval-length ( int -- n ) : interval-length ( int -- n )
{ {
{ [ dup empty-interval eq? ] [ drop 0 ] } { [ dup empty-interval eq? ] [ drop 0 ] }
{ [ dup not ] [ drop 0 ] }
[ interval>points [ first ] bi@ swap - ] [ interval>points [ first ] bi@ swap - ]
} cond ; } cond ;