-

cool-RR · cool-RR · commit 1fb302d44458 · 2014-09-25T01:15:00.000+03:00
diff --git a/source_py3/python_toolbox/logic_tools.py b/source_py3/python_toolbox/logic_tools.py
@@ -25,7 +25,12 @@ def all_equal(iterable, exhaustive=False):
     # work for unhashables.
     
     if exhaustive is True:
-        pairs = sequence_tools.combinations(list(iterable), 2)
+        from python_toolbox import combi
+        items = tuple(iterable)
+        pairs = tuple(
+            tuple(items[i] for i in comb) for comb in
+                                combi.CombSpace(len(items), min(2, len(items)))
+        )
     else: # exhaustive is False
         pairs = cute_iter_tools.iterate_overlapping_subsequences(iterable)
         
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -48,37 +48,6 @@ def flatten(iterable):
         return []
 
 
-def combinations(sequence, n=None, start=0):
-    '''
-    Iterate over combinations of items from the sequence.
-
-    `n` specifies the number of items. (Use `None` for all possible sizes
-    together.) `start` specifies the index number of the member from which to
-    start giving combinations. (Keep the default of `start=0` for doing the
-    whole sequence.)
-
-    Example:
-
-    `combinations([1, 2, 3, 4], n=2)` would be, in list form: `[[1, 2], [1, 3],
-    [1, 4], [2, 3], [2, 4], [3, 4]]`.
-    '''
-
-    if n is None:
-        length = len(sequence) - start
-        iterators = (combinations(sequence, n=i, start=start) for i
-                     in range(1, length + 1))
-        yield from itertools.chain(*iterators)
-
-    elif n == 1:
-        for thing in itertools.islice(sequence, start, None):
-            yield [thing]
-    else:
-        assert n > 1
-        for (i, thing) in itertools.islice(enumerate(sequence), start, None):
-            for sub_result in combinations(sequence, n - 1, start=(i + 1)):
-                yield [thing] + sub_result
-
-
 class NO_FILL_VALUE:
     '''
     Sentinel that means: Don't fill last partition with default fill values.
diff --git a/source_py3/test_python_toolbox/test_sequence_tools/test_combinations.py b/source_py3/test_python_toolbox/test_sequence_tools/test_combinations.py
