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

sorting: speed up sort-keys and sort-values by doing less bounds checking.

db4
John Benediktsson 2013-03-20 17:06:51 -07:00
parent a440b2a909
commit c1cfb50728
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/sorting/sorting.factor
View File

@ -153,16 +153,26 @@ PRIVATE>
: inv-sort-with ( seq quot: ( elt -- key ) -- sortedseq ) : inv-sort-with ( seq quot: ( elt -- key ) -- sortedseq )
[ compare invert-comparison ] curry sort ; inline [ compare invert-comparison ] curry sort ; inline
<PRIVATE
: check-bounds ( alist n -- alist )
[ swap 2dup bounds-check? [ 2drop ] [ bounds-error ] if ]
curry dupd each ;
PRIVATE>
GENERIC: sort-keys ( obj -- sortedseq ) GENERIC: sort-keys ( obj -- sortedseq )
M: object sort-keys >alist sort-keys ; M: object sort-keys >alist sort-keys ;
M: sequence sort-keys [ first ] sort-with ; M: sequence sort-keys
0 check-bounds [ first-unsafe ] sort-with ;
GENERIC: sort-values ( obj -- sortedseq ) GENERIC: sort-values ( obj -- sortedseq )
M: object sort-values >alist sort-values ; M: object sort-values >alist sort-values ;
M: sequence sort-values [ second ] sort-with ; M: sequence sort-values
1 check-bounds [ second-unsafe ] sort-with ;
: sort-pair ( a b -- c d ) 2dup after? [ swap ] when ; : sort-pair ( a b -- c d ) 2dup after? [ swap ] when ;