mersenne.nim public procs no longer work with platform-dependent int type
This commit is contained in:
parent
31bb5c4ae0
commit
b235e5b279
2 changed files with 18 additions and 13 deletions
|
|
@ -5,29 +5,31 @@ type
|
||||||
|
|
||||||
{.deprecated: [TMersenneTwister: MersenneTwister].}
|
{.deprecated: [TMersenneTwister: MersenneTwister].}
|
||||||
|
|
||||||
proc newMersenneTwister*(seed: int): MersenneTwister =
|
proc newMersenneTwister*(seed: uint32): MersenneTwister =
|
||||||
result.index = 0
|
result.index = 0
|
||||||
result.mt[0]= uint32(seed)
|
result.mt[0] = seed
|
||||||
for i in 1..623'u32:
|
for i in 1..623'u32:
|
||||||
result.mt[i]= (0x6c078965'u32 * (result.mt[i-1] xor (result.mt[i-1] shr 30'u32)) + i)
|
result.mt[i] = (0x6c078965'u32 * (result.mt[i-1] xor (result.mt[i-1] shr 30'u32)) + i)
|
||||||
|
|
||||||
proc generateNumbers(m: var MersenneTwister) =
|
proc generateNumbers(m: var MersenneTwister) =
|
||||||
for i in 0..623:
|
for i in 0..623:
|
||||||
var y = (m.mt[i] and 0x80000000'u32) + (m.mt[(i+1) mod 624] and 0x7fffffff'u32)
|
var y = (m.mt[i] and 0x80000000'u32) +
|
||||||
|
(m.mt[(i+1) mod 624] and 0x7fffffff'u32)
|
||||||
m.mt[i] = m.mt[(i+397) mod 624] xor uint32(y shr 1'u32)
|
m.mt[i] = m.mt[(i+397) mod 624] xor uint32(y shr 1'u32)
|
||||||
if (y mod 2'u32) != 0:
|
if (y mod 2'u32) != 0:
|
||||||
m.mt[i] = m.mt[i] xor 0x9908b0df'u32
|
m.mt[i] = m.mt[i] xor 0x9908b0df'u32
|
||||||
|
|
||||||
proc getNum*(m: var MersenneTwister): int =
|
proc getNum*(m: var MersenneTwister): uint32 =
|
||||||
|
## Returns the next pseudo random number ranging from 0 to high(uint32)
|
||||||
if m.index == 0:
|
if m.index == 0:
|
||||||
generateNumbers(m)
|
generateNumbers(m)
|
||||||
var y = m.mt[m.index]
|
result = m.mt[m.index]
|
||||||
y = y xor (y shr 11'u32)
|
m.index = (m.index + 1) mod m.mt.len
|
||||||
y = y xor ((7'u32 shl y) and 0x9d2c5680'u32)
|
|
||||||
y = y xor ((15'u32 shl y) and 0xefc60000'u32)
|
result = result xor (result shr 11'u32)
|
||||||
y = y xor (y shr 18'u32)
|
result = result xor ((7'u32 shl result) and 0x9d2c5680'u32)
|
||||||
m.index = (m.index+1) mod 624
|
result = result xor ((15'u32 shl result) and 0xefc60000'u32)
|
||||||
return int(y)
|
result = result xor (result shr 18'u32)
|
||||||
|
|
||||||
# Test
|
# Test
|
||||||
when not defined(testing) and isMainModule:
|
when not defined(testing) and isMainModule:
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,9 @@ Changes affecting backwards compatibility
|
||||||
new experimental ``this`` pragma to achieve a similar effect to what the old ``using`` statement tried to achieve.
|
new experimental ``this`` pragma to achieve a similar effect to what the old ``using`` statement tried to achieve.
|
||||||
- Typeless parameters have been removed from the language since it would
|
- Typeless parameters have been removed from the language since it would
|
||||||
clash with ``using``.
|
clash with ``using``.
|
||||||
|
- Procedures in ``mersenne.nim`` (Mersenne Twister implementation) no longer
|
||||||
|
accept and produce ``int`` values which have platform-dependent size -
|
||||||
|
they use ``uint32`` instead.
|
||||||
|
|
||||||
|
|
||||||
Library Additions
|
Library Additions
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue