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

trees.splay: fix delete-at.

db4
John Benediktsson 2011-10-14 17:52:24 -07:00
parent 7d31da68b8
commit ce1d69aa0a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extra/trees/splay/splay-tests.factor
View File

@ -31,3 +31,8 @@ IN: trees.splay.tests
{ 1 "a" } { 2 "b" } { 3 "c" } { 1 "a" } { 2 "b" } { 3 "c" }
} >splay >alist } >splay >alist
] unit-test ] unit-test
[ 0 ] [
100 iota [ dup zip >splay ] keep
[ over delete-at ] each assoc-size
] unit-test

13
extra/trees/splay/splay.factor
View File

@ -94,18 +94,13 @@ DEFER: (splay)
dup [ dup get-largest key>> swap splay-at ] when ; dup [ dup get-largest key>> swap splay-at ] when ;
: splay-join ( n2 n1 -- node ) : splay-join ( n2 n1 -- node )
splay-largest [ splay-largest [ [ right<< ] keep ] when* ;
[ right<< ] keep
] [
drop f
] if* ;
: remove-splay ( key tree -- ) : remove-splay ( key tree -- )
[ get-splay nip ] keep [ 2dup get-splay [
dup dec-count
dup right>> swap left>> splay-join dup right>> swap left>> splay-join
swap root<< >>root dec-count drop
] [ drop ] if* ; ] [ 3drop ] if ;
: set-splay ( value key tree -- ) : set-splay ( value key tree -- )
2dup get-splay [ 2nip value<< ] [ 2dup get-splay [ 2nip value<< ] [