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

remove m-n-as-a-slot

db4
Doug Coleman 2009-10-02 01:32:11 -05:00
parent 7348241b2f
commit 907e401542
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basis/random/sfmt/sfmt.factor
View File

@ -16,7 +16,6 @@ STRUCT: sfmt-state
{ seed uint }
{ n uint }
{ m uint }
{ m-n int }
{ ix uint }
{ mask uint-4 }
{ r1 uint-4 }
@ -53,7 +52,6 @@ M:: sfmt generate ( sfmt -- )
state n>> 1 - array nth state (>>r2)
state m>> :> m
state n>> :> n
state m-n>> :> m-n
state mask>> :> mask
n m - >fixnum iota [| i |
@ -70,7 +68,7 @@ M:: sfmt generate ( sfmt -- )
m 1 - iota [
n m - 1 + + >fixnum :> i
i array nth-unsafe
m-n i + array nth-unsafe
m n - i + array nth-unsafe
mask state r1>> state r2>> formula :> r
r i array set-nth-unsafe
@ -99,7 +97,6 @@ M:: sfmt generate ( sfmt -- )
swap >>m
swap >>n
swap >>seed
dup [ m>> ] [ n>> ] bi - >>m-n
0 >>ix ;
: <sfmt> ( seed n m mask -- sfmt )
@ -107,7 +104,7 @@ M:: sfmt generate ( sfmt -- )
sfmt new
swap >>state
dup <sfmt-array> [ >>uint-array ] [ >>uint-4-array ] bi*
[ generate ] keep ;
[ generate ] keep ; inline
: refill-sfmt? ( sfmt -- ? )
state>> [ ix>> ] [ n>> 4 * ] bi >= ;
@ -121,8 +118,8 @@ M:: sfmt generate ( sfmt -- )
PRIVATE>
M: sfmt random-32* ( sfmt -- n )
dup refill-sfmt? [ dup generate ] when next ;
dup refill-sfmt? [ dup generate ] when next ; inline
: <sfmt-19937> ( seed -- sfmt )
348 330 uint-4{ HEX: BFFFFFF6 HEX: BFFAFFFF HEX: DDFECB7F HEX: DFFFFFEF }
<sfmt> ;
<sfmt> ; inline