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

assoc-heaps: simplify.

char-rename
John Benediktsson 2017-02-06 11:19:43 -08:00
parent 0dbcbd50f6
commit 915378019c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extra/assoc-heaps/assoc-heaps.factor
View File

@ -13,18 +13,15 @@ C: <assoc-heap> assoc-heap
: <unique-max-heap> ( -- unique-heap ) : <unique-max-heap> ( -- unique-heap )
H{ } clone <max-heap> <assoc-heap> ; H{ } clone <max-heap> <assoc-heap> ;
M: assoc-heap heap-push* ( value key assoc-heap -- entry ) M: assoc-heap heap-push*
pick over assoc>> key? [ pick over assoc>> key? [
3drop f 3drop f
] [ ] [
[ assoc>> swapd set-at ] [ heap>> heap-push* ] 3bi [ assoc>> swapd set-at ] [ heap>> heap-push* ] 3bi
] if ; ] if ;
M: assoc-heap heap-pop ( assoc-heap -- value key ) M: assoc-heap heap-pop heap>> heap-pop ;
heap>> heap-pop ;
M: assoc-heap heap-peek ( assoc-heap -- value key ) M: assoc-heap heap-peek heap>> heap-peek ;
heap>> heap-peek ;
M: assoc-heap heap-empty? ( assoc-heap -- ? ) M: assoc-heap heap-empty? heap>> heap-empty? ;
heap>> heap-empty? ;