-

cool-RR · cool-RR · commit 1fcaac31841c · 2014-09-18T14:44:02.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -547,24 +547,22 @@ def index(self, perm):
             raise ValueError
         
         perm = sequence_tools.ensure_iterable_is_immutable_sequence(perm)
+        perm_set = set(perm)
+        if not (perm_set <= set(self.sequence)):
+            raise ValueError
         
         if len(perm) != self.n_elements:
             raise ValueError
         
         if not isinstance(perm, self.perm_type):
-            perm_set = set(perm)
             if perm_set != set(range(len(perm))):
-                if perm_set != set(self.sequence):
-                    raise ValueError
                 perm = self.perm_type(perm, self)
             else:
                 perm = self.perm_type(perm)
             
         elif self.is_rapplied:
             if not perm.is_rapplied:
                 raise ValueError
-            if set(perm) != set(self.sequence):
-                raise ValueError
         elif perm.is_rapplied and not self.is_rapplied:
             raise ValueError
         if self.is_degreed and (perm.degree not in self.degrees):
diff --git a/source_py3/test_python_toolbox/test_combi/test_comb_space.py b/source_py3/test_python_toolbox/test_combi/test_comb_space.py
@@ -0,0 +1,30 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox.combi import *
+
+
+def test():
+    comb_space = CombSpace('dumber', 2)
+    assert isinstance(comb_space, CombSpace)
+    assert isinstance(comb_space, PermSpace)
+    assert comb_space.length == 1 + 2 + 3 + 4 + 5
+    things_in_comb_space = (
+        'du', 'db', 'br', ('d', 'u'), {'d', 'u'}, Comb('du', comb_space)
+    )
+    things_not_in_comb_space = (
+        'dx', 'dub', ('d', 'x'), {'d', 'u', 'b'}, Comb('dux', comb_space),
+        Comb('du', CombSpace('other', 2))
+    )
+    
+    for thing in things_in_comb_space:
+        assert thing in comb_space
+    for thing in things_not_in_comb_space:
+        assert thing not in comb_space
+    
+    
+    
+    
+    
+    
+    
