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

remove >r r> from heaps

db4
Doug Coleman 2008-11-29 13:28:52 -06:00
parent 62a1a1df1c
commit d0370a06b0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basis/heaps/heaps.factor
View File

@ -18,7 +18,7 @@ GENERIC: heap-size ( heap -- n )
TUPLE: heap data ; TUPLE: heap data ;
: <heap> ( class -- heap ) : <heap> ( class -- heap )
>r V{ } clone r> boa ; inline [ V{ } clone ] dip boa ; inline
TUPLE: entry value key heap index ; TUPLE: entry value key heap index ;
@ -52,16 +52,16 @@ M: heap heap-size ( heap -- n )
data>> nth-unsafe ; inline data>> nth-unsafe ; inline
: up-value ( n heap -- entry ) : up-value ( n heap -- entry )
>r up r> data-nth ; inline [ up ] dip data-nth ; inline
: left-value ( n heap -- entry ) : left-value ( n heap -- entry )
>r left r> data-nth ; inline [ left ] dip data-nth ; inline
: right-value ( n heap -- entry ) : right-value ( n heap -- entry )
>r right r> data-nth ; inline [ right ] dip data-nth ; inline
: data-set-nth ( entry n heap -- ) : data-set-nth ( entry n heap -- )
>r [ >>index drop ] 2keep r> [ [ >>index drop ] 2keep ] dip
data>> set-nth-unsafe ; inline data>> set-nth-unsafe ; inline
: data-push ( entry heap -- n ) : data-push ( entry heap -- n )
@ -82,8 +82,8 @@ M: heap heap-size ( heap -- n )
data>> first ; inline data>> first ; inline
: data-exchange ( m n heap -- ) : data-exchange ( m n heap -- )
[ tuck data-nth >r data-nth r> ] 3keep [ tuck data-nth [ data-nth ] dip ] 3keep
tuck >r >r data-set-nth r> r> data-set-nth ; inline tuck [ data-set-nth ] 2dip data-set-nth ; inline
GENERIC: heap-compare ( pair1 pair2 heap -- ? ) GENERIC: heap-compare ( pair1 pair2 heap -- ? )
@ -97,10 +97,10 @@ M: max-heap heap-compare (heap-compare) +lt+ eq? ;
heap-size >= ; inline heap-size >= ; inline
: left-bounds-check? ( m heap -- ? ) : left-bounds-check? ( m heap -- ? )
>r left r> heap-bounds-check? ; inline [ left ] dip heap-bounds-check? ; inline
: right-bounds-check? ( m heap -- ? ) : right-bounds-check? ( m heap -- ? )
>r right r> heap-bounds-check? ; inline [ right ] dip heap-bounds-check? ; inline
: continue? ( m up[m] heap -- ? ) : continue? ( m up[m] heap -- ? )
[ data-nth swap ] keep [ data-nth ] keep [ data-nth swap ] keep [ data-nth ] keep
@ -109,7 +109,7 @@ M: max-heap heap-compare (heap-compare) +lt+ eq? ;
DEFER: up-heap DEFER: up-heap
: (up-heap) ( n heap -- ) : (up-heap) ( n heap -- )
>r dup up r> [ dup up ] dip
3dup continue? [ 3dup continue? [
[ data-exchange ] 2keep up-heap [ data-exchange ] 2keep up-heap
] [ ] [
@ -121,7 +121,7 @@ DEFER: up-heap
: (child) ( m heap -- n ) : (child) ( m heap -- n )
2dup right-value 2dup right-value
>r 2dup left-value r> [ 2dup left-value ] dip
rot heap-compare rot heap-compare
[ right ] [ left ] if ; [ right ] [ left ] if ;