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

heaps: speed up heaps benchmark.

db4
John Benediktsson 2012-09-14 10:03:30 -07:00
parent 7e3a5fc1b2
commit 2422490f86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/heaps/heaps.factor
View File

@ -95,7 +95,7 @@ M: max-heap heap-compare (heap-compare) +lt+ eq? ;
: continue? ( m n heap -- ? ) : continue? ( m n heap -- ? )
[ data-nth nip ] [ data-nth nip ]
[ nip data-nth ] [ nip data-nth ]
[ 2nip ] 3tri heap-compare ; [ 2nip ] 3tri heap-compare ; inline
DEFER: up-heap DEFER: up-heap
@ -112,11 +112,11 @@ DEFER: up-heap
: (child) ( m heap -- n ) : (child) ( m heap -- n )
{ [ drop ] [ left-value ] [ right-value ] [ nip ] } 2cleave { [ drop ] [ left-value ] [ right-value ] [ nip ] } 2cleave
heap-compare [ right ] [ left ] if ; heap-compare [ right ] [ left ] if ; inline
: child ( m heap -- n ) : child ( m heap -- n )
2dup right-bounds-check? 2dup right-bounds-check?
[ drop left ] [ (child) ] if ; [ drop left ] [ (child) ] if ; inline
DEFER: down-heap DEFER: down-heap
@ -151,7 +151,7 @@ ERROR: bad-heap-delete ;
M: bad-heap-delete summary M: bad-heap-delete summary
drop "Invalid entry passed to heap-delete" ; drop "Invalid entry passed to heap-delete" ;
: entry>index ( entry heap -- n ) : entry>index ( entry heap -- n )
over heap>> eq? [ bad-heap-delete ] unless over heap>> eq? [ bad-heap-delete ] unless
index>> ; index>> ;