Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

random: support "random" on floats (uses uniform-random-float).

  • Loading branch information...
commit 8fa22da8149eab2d6f23324aeaa4128c9e135c1a 1 parent 6ccd545
John Benediktsson mrjbq7 authored
Showing with 9 additions and 6 deletions.
  1. +9 −6 basis/random/random.factor
15 basis/random/random.factor
View
@@ -1,11 +1,12 @@
! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.data arrays assocs
-byte-arrays byte-vectors combinators combinators.short-circuit
-fry hashtables hashtables.private hints io.backend io.binary
+USING: accessors alien.data arrays assocs byte-arrays
+byte-vectors combinators combinators.short-circuit fry
+hashtables hashtables.private hints io.backend io.binary
kernel locals math math.bitwise math.constants math.functions
math.order math.ranges namespaces sequences sequences.private
sets summary system typed vocabs ;
+QUALIFIED-WITH: alien.c-types c
IN: random
SYMBOL: system-random-generator
@@ -18,10 +19,10 @@ GENERIC: random-bytes* ( n tuple -- byte-array )
M: object random-bytes* ( n tuple -- byte-array )
[ [ <byte-vector> ] keep 4 /mod ] dip
- [ pick '[ _ random-32* int <ref> _ push-all ] times ]
+ [ pick '[ _ random-32* c:int <ref> _ push-all ] times ]
[
over zero?
- [ 2drop ] [ random-32* int <ref> swap head append! ] if
+ [ 2drop ] [ random-32* c:int <ref> swap head append! ] if
] bi-curry bi* B{ } like ;
HINTS: M\ object random-bytes* { fixnum object } ;
@@ -112,7 +113,7 @@ ERROR: too-many-samples seq n ;
<PRIVATE
: (uniform-random-float) ( min max obj -- n )
- [ 4 4 ] dip [ random-bytes* uint deref >float ] curry bi@
+ [ 4 4 ] dip [ random-bytes* c:uint deref >float ] curry bi@
2.0 32 ^ * +
[ over - 2.0 -64 ^ * ] dip
* + ; inline
@@ -122,6 +123,8 @@ PRIVATE>
: uniform-random-float ( min max -- n )
random-generator get (uniform-random-float) ; inline
+M: float random [ f ] [ 0.0 swap uniform-random-float ] if-zero ;
+
: random-unit ( -- n )
0.0 1.0 uniform-random-float ; inline
Please sign in to comment.
Something went wrong with that request. Please try again.