Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Convert range to repeat for choices() (#11889)

This commit is contained in:
Raymond Hettinger 2019-02-16 13:30:51 -08:00 committed by GitHub
parent 38f11cc3f6
commit 5382203ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/random.py
View File

@ -43,7 +43,7 @@ from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
from os import urandom as _urandom from os import urandom as _urandom
from _collections_abc import Set as _Set, Sequence as _Sequence from _collections_abc import Set as _Set, Sequence as _Sequence
from hashlib import sha512 as _sha512 from hashlib import sha512 as _sha512
from itertools import accumulate as _accumulate from itertools import accumulate as _accumulate, repeat as _repeat
from bisect import bisect as _bisect from bisect import bisect as _bisect
import os as _os import os as _os
@ -389,7 +389,7 @@ class Random(_random.Random):
if weights is None: if weights is None:
_int = int _int = int
n += 0.0 # convert to float for a small speed improvement n += 0.0 # convert to float for a small speed improvement
return [population[_int(random() * n)] for i in range(k)] return [population[_int(random() * n)] for i in _repeat(None, k)]
cum_weights = list(_accumulate(weights)) cum_weights = list(_accumulate(weights))
elif weights is not None: elif weights is not None:
raise TypeError('Cannot specify both weights and cumulative weights') raise TypeError('Cannot specify both weights and cumulative weights')
@ -399,7 +399,7 @@ class Random(_random.Random):
total = cum_weights[-1] + 0.0 # convert to float total = cum_weights[-1] + 0.0 # convert to float
hi = n - 1 hi = n - 1
return [population[bisect(cum_weights, random() * total, 0, hi)] return [population[bisect(cum_weights, random() * total, 0, hi)]
for i in range(k)] for i in _repeat(None, k)]
## -------------------- real-valued distributions ------------------- ## -------------------- real-valued distributions -------------------