Commit a1d61d04 authored by Raymond Hettinger's avatar Raymond Hettinger

Fixup new itertools recipes.

parent 343314a1
...@@ -796,7 +796,7 @@ which incur interpreter overhead. ...@@ -796,7 +796,7 @@ which incur interpreter overhead.
pools = map(tuple, args) * kwds.get('repeat', 1) pools = map(tuple, args) * kwds.get('repeat', 1)
return tuple(random.choice(pool) for pool in pools) return tuple(random.choice(pool) for pool in pools)
def random_permuation(iterable, r=None): def random_permutation(iterable, r=None):
"Random selection from itertools.permutations(iterable, r)" "Random selection from itertools.permutations(iterable, r)"
pool = tuple(iterable) pool = tuple(iterable)
r = len(pool) if r is None else r r = len(pool) if r is None else r
...@@ -805,12 +805,16 @@ which incur interpreter overhead. ...@@ -805,12 +805,16 @@ which incur interpreter overhead.
def random_combination(iterable, r): def random_combination(iterable, r):
"Random selection from itertools.combinations(iterable, r)" "Random selection from itertools.combinations(iterable, r)"
pool = tuple(iterable) pool = tuple(iterable)
return tuple(sorted(random.sample(pool, r), key=pool.index)) n = len(pool)
indices = sorted(random.sample(xrange(n), r))
return tuple(pool[i] for i in indices)
def random_combination_with_replacement(iterable, r): def random_combination_with_replacement(iterable, r):
"Random selection from itertools.combinations_with_replacement(iterable, r)" "Random selection from itertools.combinations_with_replacement(iterable, r)"
pool = tuple(iterable) pool = tuple(iterable)
return tuple(sorted(imap(random.choice, [pool]*r), key=pool.index)) n = len(pool)
indices = sorted(random.randrange(n) for i in xrange(r))
return tuple(pool[i] for i in indices)
Note, many of the above recipes can be optimized by replacing global lookups Note, many of the above recipes can be optimized by replacing global lookups
with local variables defined as default values. For example, the with local variables defined as default values. For example, the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment