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

math.combinatorics: cleanup stack effects to be more descriptive.

db4
John Benediktsson 2013-04-18 07:15:47 -07:00
parent 81f733493d
commit 77b3d509be
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/math/combinatorics/combinatorics-docs.factor
View File

@ -49,7 +49,7 @@ HELP: all-permutations
} ; } ;
HELP: each-permutation HELP: each-permutation
{ $values { "seq" sequence } { "quot" { $quotation "( seq -- )" } } } { $values { "seq" sequence } { "quot" { $quotation "( ... elt -- ... )" } } }
{ $description "Applies the quotation to each permutation of " { $snippet "seq" } " in order." } ; { $description "Applies the quotation to each permutation of " { $snippet "seq" } " in order." } ;
HELP: inverse-permutation HELP: inverse-permutation
@ -94,7 +94,7 @@ HELP: all-combinations
}""" } } ; }""" } } ;
HELP: each-combination HELP: each-combination
{ $values { "seq" sequence } { "k" "a non-negative integer" } { "quot" { $quotation "( seq -- )" } } } { $values { "seq" sequence } { "k" "a non-negative integer" } { "quot" { $quotation "( ... elt -- ... )" } } }
{ $description "Applies the quotation to each combination of " { $snippet "seq" } " choosing " { $snippet "k" } " elements, in order." } ; { $description "Applies the quotation to each combination of " { $snippet "seq" } " choosing " { $snippet "k" } " elements, in order." } ;

22
basis/math/combinatorics/combinatorics.factor
View File

@ -75,23 +75,23 @@ DEFER: next-permutation
PRIVATE> PRIVATE>
: each-permutation ( seq quot -- ) : each-permutation ( ... seq quot: ( ... elt -- ... ) -- ... )
permutations-quot each ; inline permutations-quot each ; inline
: map-permutations ( seq quot -- seq' ) : map-permutations ( ... seq quot: ( ... elt -- ... newelt ) -- ... newseq )
permutations-quot map ; inline permutations-quot map ; inline
: filter-permutations ( seq quot -- seq' ) : filter-permutations ( ... seq quot: ( ... elt -- ... ? ) -- ... newseq )
selector [ each-permutation ] dip ; inline selector [ each-permutation ] dip ; inline
: all-permutations ( seq -- seq' ) : all-permutations ( seq -- seq' )
[ ] map-permutations ; [ ] map-permutations ;
: find-permutation ( seq quot -- elt ) : find-permutation ( ... seq quot: ( ... elt -- ... ? ) -- ... elt/f )
[ permutations-quot find drop ] [ permutations-quot find drop ]
[ drop over [ permutation ] [ 2drop f ] if ] 2bi ; inline [ drop over [ permutation ] [ 2drop f ] if ] 2bi ; inline
: reduce-permutations ( seq identity quot -- result ) : reduce-permutations ( ... seq identity quot: ( ... prev elt -- ... next ) -- ... result )
swapd each-permutation ; inline swapd each-permutation ; inline
: inverse-permutation ( seq -- permutation ) : inverse-permutation ( seq -- permutation )
@ -185,26 +185,26 @@ INSTANCE: combinations immutable-sequence
PRIVATE> PRIVATE>
: each-combination ( seq k quot -- ) : each-combination ( ... seq k quot: ( ... elt -- ... ) -- ... )
combinations-quot each ; inline combinations-quot each ; inline
: map-combinations ( seq k quot -- seq' ) : map-combinations ( ... seq k quot: ( ... elt -- ... newelt ) -- ... newseq )
combinations-quot map ; inline combinations-quot map ; inline
: filter-combinations ( seq k quot -- seq' ) : filter-combinations ( ... seq k quot: ( ... elt -- ... ? ) -- ... newseq )
selector [ each-combination ] dip ; inline selector [ each-combination ] dip ; inline
:: map>assoc-combinations ( seq k quot exemplar -- ) :: map>assoc-combinations ( ... seq k quot: ( ... elt -- ... key value ) exemplar -- ... assoc )
[ combinations-quot ] dip map>assoc ; inline [ combinations-quot ] dip map>assoc ; inline
: all-combinations ( seq k -- seq' ) : all-combinations ( seq k -- seq' )
[ ] map-combinations ; [ ] map-combinations ;
: find-combination ( seq k quot -- elt/f ) : find-combination ( ... seq k quot: ( ... elt -- ... ? ) -- ... elt/f )
[ combinations-quot find drop ] [ combinations-quot find drop ]
[ drop pick [ combination ] [ 3drop f ] if ] 3bi ; inline [ drop pick [ combination ] [ 3drop f ] if ] 3bi ; inline
: reduce-combinations ( seq k identity quot -- result ) : reduce-combinations ( ... seq k identity quot: ( ... prev elt -- next ) -- ... result )
[ -rot ] dip each-combination ; inline [ -rot ] dip each-combination ; inline
: all-subsets ( seq -- subsets ) : all-subsets ( seq -- subsets )