Merge branch 'master' of git://factorcode.org/git/factor

basis/random/random-tests.factor

@@ -1,5 +1,5 @@
 USING: random sequences tools.test kernel math math.functions
-sets ;
+sets grouping random.private ;
 IN: random.tests
 
 [ 4 ] [ 4 random-bytes length ] unit-test
@@ -17,3 +17,9 @@ IN: random.tests
 [ t ] [ 1000 [ 400 random ] replicate prune length 256 > ] unit-test
 
 [ f ] [ 0 random ] unit-test
+
+[ f ]
+[ 100 [ { 0 1 } random ] replicate all-equal? ] unit-test
+
+[ t ]
+[ { 1 2 } [ length ] [ >randomize-range length ] bi - 1 = ] unit-test

basis/random/random.factor

@@ -43,6 +43,9 @@ M: f random-32* ( obj -- * ) no-random-number-generator ;
     [ random-bytes >byte-array byte-array>bignum ]
     [ 3 shift 2^ ] bi / * >integer ;
 
+: >randomize-range ( seq -- range )
+    length 1+ 2 (a,b] ; inline
+
 PRIVATE>
 
 : random-bits ( n -- r ) 2^ random-integer ;
@@ -53,7 +56,8 @@ PRIVATE>
     ] if-empty ;
 
 : randomize ( seq -- seq' )
-    dup length 1 (a,b] [ dup random pick exchange ] each ;
+    [ ] [ >randomize-range ] [ ] tri
+    '[ [ random ] [ 1- ] bi _ exchange ] each ;
 
 : delete-random ( seq -- elt )
     [ length random-integer ] keep [ nth ] 2keep delete-nth ;