jfmonty2/cup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch to fastrand (not actually any faster)

Browse Source
This commit is contained in:
Joseph Montanaro 2021-07-19 11:45:51 -07:00
parent cade17a9a6
commit f2e0698608
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
combinators.nim
View File

@ -1,5 +1,5 @@
import algorithm, random, sugar import algorithm, random, sugar
import fixedseq, game import fastrand, fixedseq, game
proc nextPermutation(x: var FixedSeq): bool = proc nextPermutation(x: var FixedSeq): bool =
@ -93,4 +93,4 @@ proc randomFuture*(dice: FixedSeq, r: var Rand): FixedSeq[5, Die, int8] =
result.initFixedSeq result.initFixedSeq
let order = dice.dup(shuffle(r)) let order = dice.dup(shuffle(r))
for i, color in order: for i, color in order:
result.add((color, r.rand(1..3))) result.add((color, r.fastRand(1..3)))

42
fastrand.nim
View File

@ -17,13 +17,27 @@ proc formatRate(n: Natural, d: Duration): string =
result = formatNum(1_000_000'f64 * n.float64 / d.inMicroseconds.float64) result = formatNum(1_000_000'f64 * n.float64 / d.inMicroseconds.float64)
proc fastRand(r: var Rand, x: Natural): uint64 = const upperBound = uint64(uint32.high)
# return ((r.next shr 32) * x.uint64) shr 32
let x = x.uint64
if x <= (uint64.high shl 32): proc fastRand*[T: Natural](r: var Rand, x: T): T =
return ((r.next shr 32) * x.uint64) shr 32 # Nim ranges are usually inclusive, but this algorithm is exclusive
let x = x.uint64 + 1
let num = if x <= upperBound:
((r.next shr 32) * x.uint64) shr 32
else: else:
return r.next mod x.uint64 r.next mod x.uint64
result = T(num)
proc fastRand*(r: var Rand; x, y: Natural): Natural =
let lim = (y - x)
result = fastRand(r, lim) + x
proc fastRand*[T](r: var Rand, slice: HSlice[T, T]): T =
let n = fastRand(r, slice.a.Natural, slice.b.Natural)
result = T(n)
proc testFastRand(num = 1_000_000_000): Duration = proc testFastRand(num = 1_000_000_000): Duration =
@ -44,9 +58,17 @@ proc testStdRand(num = 1_000_000_000): Duration =
# echo "std rand execution rate: ", 1000 * num / dur.inMilliseconds.int, " generated per second." # echo "std rand execution rate: ", 1000 * num / dur.inMilliseconds.int, " generated per second."
when isMainModule:
randomize() randomize()
var r = initRand(rand(int64))
let runs = 100_000_000 let runs = 100_000_000
let fr = testFastRand(runs) var totals: array[5..9, int]
echo "fastrand execution rate: ", formatNum(1_000_000 * runs / fr.inMicroseconds.int) for i in 1 .. runs:
let sr = testStdRand(runs) let n = r.fastRand(5..9)
echo "standard execution rate: ", formatNum(1_000_000 * runs / sr.inMicroseconds.int) totals[n] += 1
echo totals
# let fr = testFastRand(runs)
# echo "fastrand execution rate: ", formatNum(1_000_000 * runs / fr.inMicroseconds.int)
# let sr = testStdRand(runs)
# echo "standard execution rate: ", formatNum(1_000_000 * runs / sr.inMicroseconds.int)