math.combinatorics: produce type of sequence in selections.

diff --git a/basis/math/combinatorics/combinatorics-tests.factor b/basis/math/combinatorics/combinatorics-tests.factor
index 5ae2ceffc0bdbe26ea9a703a383ba2952cd7f3c4..89809f2d3e2376e18ef2298048ca4ba2796e8fa0 100644 (file)
--- a/basis/math/combinatorics/combinatorics-tests.factor
+++ b/basis/math/combinatorics/combinatorics-tests.factor
@@ -79,6 +79,8 @@ IN: math.combinatorics.tests
     { 2 1 1 } { 2 1 2 } { 2 2 1 } { 2 2 2 } } ]
 [ { 1 2 } 3 selections ] unit-test
 
+{ { "aa" "ab" "ac" "ba" "bb" "bc" "ca" "cb" "cc" } }
+[ "abc" 2 selections ] unit-test
 
 { V{ { 1 2 } { 1 3 } } }
 [ { 1 2 3 } 2 [ { 1 } head? ] filter-combinations ] unit-test

diff --git a/basis/math/combinatorics/combinatorics.factor b/basis/math/combinatorics/combinatorics.factor
index c9109eb63df81bfef9f8dbed302b0cf68b019b9c..69f2f2aca5ceb8cdef1ef287c49283ce55eeda29 100644 (file)
--- a/basis/math/combinatorics/combinatorics.factor
+++ b/basis/math/combinatorics/combinatorics.factor
@@ -189,8 +189,8 @@ INSTANCE: combinations immutable-sequence
 <PRIVATE
 
 : (selections) ( seq n -- selections )
-    [ [ 1array ] map dup ] [ 1 - ] bi* [
-        cartesian-product concat [ { } concat-as ] map
+    [ dup [ 1sequence ] curry { } map-as dup ] [ 1 - ] bi* [
+        cartesian-product concat [ concat ] map
     ] with times ;
 
 PRIVATE>