-

cool-RR · cool-RR · commit 7a946c6fba6b · 2014-09-18T14:51:55.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -546,7 +546,14 @@ def index(self, perm):
         if not isinstance(perm, collections.Iterable):
             raise ValueError
         
-        perm = sequence_tools.ensure_iterable_is_immutable_sequence(perm)
+        try:
+            perm = sequence_tools.ensure_iterable_is_immutable_sequence(
+                perm,
+                allow_unordered=self.is_combination
+            )
+        except sequence_tools.UnorderedIterableException:
+            raise ValueError('An unordered iterable is never contained in a '
+                             'non-combination `PermSpace`.')
         perm_set = set(perm)
         if not (perm_set <= set(self.sequence)):
             raise ValueError
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -17,6 +17,12 @@
 infinity = float('inf')
 
 
+class UnorderedIterableException(Exception):
+    '''
+    An unordered iterable was encountered when we expected an orderable one.
+    '''
+
+
 def are_equal_regardless_of_order(seq1, seq2):
     '''
     Do `seq1` and `seq2` contain the same elements, same number of times?
@@ -230,7 +236,8 @@ def get_recurrences(sequence):
 
     
 def ensure_iterable_is_immutable_sequence(iterable, default_type=tuple,
-                                          unallowed_types=(bytes,)):
+                                          unallowed_types=(bytes,),
+                                          allow_unordered=True):
     '''
     Return a version of `iterable` that is an immutable sequence.
     
@@ -239,6 +246,8 @@ def ensure_iterable_is_immutable_sequence(iterable, default_type=tuple,
     specified in `default_type`.
     '''
     assert isinstance(iterable, collections.Iterable)
+    if not allow_unordered:
+        
     if isinstance(iterable, collections.MutableSequence) or \
        isinstance(iterable, unallowed_types) or \
        not isinstance(iterable, collections.Sequence):
diff --git a/source_py3/test_python_toolbox/test_combi/test_perm_space.py b/source_py3/test_python_toolbox/test_combi/test_perm_space.py
@@ -41,6 +41,7 @@ def test_perms():
     assert int(last_perm) == len(pure_perm_space) - 1
     
     assert first_perm in pure_perm_space
+    assert set(first_perm) not in pure_perm_space # No order? Not contained.
     assert some_perm in pure_perm_space
     assert last_perm in pure_perm_space
     assert tuple(first_perm) in pure_perm_space
