bpo-24567: Random subnormal.diff (#7954)

Handle subnormal weights for choices()
This commit is contained in:
Raymond Hettinger 2018-06-27 01:08:31 -07:00 committed by GitHub
parent 3c8043d8fa
commit ddf7171911
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions

View File

@ -383,7 +383,9 @@ class Random(_random.Random):
raise ValueError('The number of weights does not match the population')
bisect = _bisect.bisect
total = cum_weights[-1]
return [population[bisect(cum_weights, random() * total)] for i in range(k)]
hi = len(cum_weights) - 1
return [population[bisect(cum_weights, random() * total, 0, hi)]
for i in range(k)]
## -------------------- real-valued distributions -------------------

View File

@ -227,6 +227,14 @@ class TestBasicOps:
with self.assertRaises(IndexError):
choices([], cum_weights=[], k=5)
def test_choices_subnormal(self):
# Subnormal weights would occassionally trigger an IndexError
# in choices() when the value returned by random() was large
# enough to make `random() * total` round up to the total.
# See https://bugs.python.org/msg275594 for more detail.
choices = self.gen.choices
choices(population=[1, 2], weights=[1e-323, 1e-323], k=5000)
def test_gauss(self):
# Ensure that the seed() method initializes all the hidden state. In
# particular, through 2.2.1 it failed to reset a piece of state used

View File

@ -0,0 +1,2 @@
Improve random.choices() to handle subnormal input weights that could
occasionally trigger an IndexError.