diff --git a/pytools/__init__.py b/pytools/__init__.py index 2d4b465bf2fb86b33c3cf26fc8afd10eb20ca620..386a4c14ee45115bbd2c4d2dc4bded331ead760a 100644 --- a/pytools/__init__.py +++ b/pytools/__init__.py @@ -92,9 +92,7 @@ Permutations, Tuples, Integer sequences .. autofunction:: wandering_element .. autofunction:: generate_nonnegative_integer_tuples_below .. autofunction:: generate_nonnegative_integer_tuples_summing_to_at_most -.. autofunction:: generate_all_nonnegative_integer_tuples .. autofunction:: generate_all_integer_tuples_below -.. autofunction:: generate_all_integer_tuples .. autofunction:: generate_permutations .. autofunction:: generate_unique_permutations @@ -1432,22 +1430,8 @@ def generate_nonnegative_integer_tuples_summing_to_at_most(n, length): yield remainder + (i,) -def generate_all_nonnegative_integer_tuples(length, least=0): - assert length >= 0 - current_max = least - while True: - for max_pos in range(length): - for prebase in generate_nonnegative_integer_tuples_below( - current_max, max_pos, least): - for postbase in generate_nonnegative_integer_tuples_below( - current_max+1, length-max_pos-1, least): - yield prebase + [current_max] + postbase - current_max += 1 - - # backwards compatibility generate_positive_integer_tuples_below = generate_nonnegative_integer_tuples_below -generate_all_positive_integer_tuples = generate_all_nonnegative_integer_tuples def _pos_and_neg_adaptor(tuple_iter): @@ -1467,11 +1451,6 @@ def generate_all_integer_tuples_below(n, length, least_abs=0): n, length, least_abs)) -def generate_all_integer_tuples(length, least_abs=0): - return _pos_and_neg_adaptor(generate_all_nonnegative_integer_tuples( - length, least_abs)) - - def generate_permutations(original): """Generate all permutations of the list *original*. diff --git a/setup.cfg b/setup.cfg index 774963ba8ae1c18b86ddbe799dddc7f680d51f96..3d66394d19b145c8311cc6d763b6648d2993a034 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ docstring-quotes = " multiline-quotes = """ # enable-flake8-bugbear -# + [wheel] universal = 1