jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reallow float ranges in random module

Browse source
This commit is contained in:
Mamy André-Ratsimbazafy 2019-05-08 13:48:03 +02:00
commit 5363b8cc59
No known key found for this signature in database
GPG key ID: 7B88AD1FE79492E1
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pure/random.nim
View file

@ -318,10 +318,15 @@ proc rand*(max: float): float {.benign.} =
## f = 8.717181376738381e-07 ## f = 8.717181376738381e-07
rand(state, max) rand(state, max)
proc rand*[T: Ordinal](r: var Rand; x: HSlice[T, T]): T = proc rand*[T: Ordinal or SomeFloat](r: var Rand; x: HSlice[T, T]): T =
## For a slice `a..b`, returns a value in the range `a..b` using the given ## For a slice `a..b`, returns a value in the range `a..b` using the given
## state. ## state.
## ##
## Allowed input types are:
## * Integer
## * Floats
## * Enums without holes
##
## See also: ## See also:
## * `rand proc<#rand,HSlice[T,T]>`_ that accepts a slice and uses the ## * `rand proc<#rand,HSlice[T,T]>`_ that accepts a slice and uses the
## default random number generator ## default random number generator
@ -333,9 +338,14 @@ proc rand*[T: Ordinal](r: var Rand; x: HSlice[T, T]): T =
doAssert r.rand(1..6) == 4 doAssert r.rand(1..6) == 4
doAssert r.rand(1..6) == 4 doAssert r.rand(1..6) == 4
doAssert r.rand(1..6) == 6 doAssert r.rand(1..6) == 6
result = T(rand(r, int(x.b) - int(x.a)) + int(x.a)) let f = r.rand(-1.0 .. 1.0)
## f = 0.8741183448756229
when T is SomeFloat:
result = rand(r, x.b - x.a) + x.a
else: # Integers and Enum types
result = T(rand(r, int(x.b) - int(x.a)) + int(x.a))
proc rand*[T: Ordinal](x: HSlice[T, T]): T = proc rand*[T: Ordinal or SomeFloat](x: HSlice[T, T]): T =
## For a slice `a..b`, returns a value in the range `a..b`. ## For a slice `a..b`, returns a value in the range `a..b`.
## ##
## If `randomize<#randomize>`_ has not been called, the sequence of random ## If `randomize<#randomize>`_ has not been called, the sequence of random