bpo-38881: choices() raises ValueError when all weights are zero (GH-17362)
This commit is contained in:
parent
84b1ff6560
commit
041d8b48a2
|
@ -165,8 +165,9 @@ Functions for sequences
|
|||
|
||||
The *weights* or *cum_weights* can use any numeric type that interoperates
|
||||
with the :class:`float` values returned by :func:`random` (that includes
|
||||
integers, floats, and fractions but excludes decimals). Weights are
|
||||
assumed to be non-negative.
|
||||
integers, floats, and fractions but excludes decimals). Behavior is
|
||||
undefined if any weight is negative. A :exc:`ValueError` is raised if all
|
||||
weights are zero.
|
||||
|
||||
For a given seed, the :func:`choices` function with equal weighting
|
||||
typically produces a different sequence than repeated calls to
|
||||
|
@ -177,6 +178,9 @@ Functions for sequences
|
|||
|
||||
.. versionadded:: 3.6
|
||||
|
||||
.. versionchanged:: 3.9
|
||||
Raises a :exc:`ValueError` if all weights are zero.
|
||||
|
||||
|
||||
.. function:: shuffle(x[, random])
|
||||
|
||||
|
|
|
@ -413,8 +413,10 @@ class Random(_random.Random):
|
|||
raise TypeError('Cannot specify both weights and cumulative weights')
|
||||
if len(cum_weights) != n:
|
||||
raise ValueError('The number of weights does not match the population')
|
||||
bisect = _bisect
|
||||
total = cum_weights[-1] + 0.0 # convert to float
|
||||
if total <= 0.0:
|
||||
raise ValueError('Total of weights must be greater than zero')
|
||||
bisect = _bisect
|
||||
hi = n - 1
|
||||
return [population[bisect(cum_weights, random() * total, 0, hi)]
|
||||
for i in _repeat(None, k)]
|
||||
|
|
|
@ -241,6 +241,11 @@ class TestBasicOps:
|
|||
choices = self.gen.choices
|
||||
choices(population=[1, 2], weights=[1e-323, 1e-323], k=5000)
|
||||
|
||||
def test_choices_with_all_zero_weights(self):
|
||||
# See issue #38881
|
||||
with self.assertRaises(ValueError):
|
||||
self.gen.choices('AB', [0.0, 0.0])
|
||||
|
||||
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
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
random.choices() now raises a ValueError when all the weights are zero.
|
Loading…
Reference in New Issue