-

cool-RR · cool-RR · commit 357717605e57 · 2014-09-19T17:23:20.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -532,15 +532,6 @@ def __getitem__(self, i):
     __hash__ = lambda self: hash(self._reduced)
     
     
-    def __contains__(self, item):
-        try:
-            self.index(item)
-        except ValueError:
-            return False
-        else:
-            return True
-            
-        
     def index(self, perm):
         '''Get the index number of permutation `perm` in this space.'''
         if not isinstance(perm, collections.Iterable):
diff --git a/source_py3/python_toolbox/combi/product_space.py b/source_py3/python_toolbox/combi/product_space.py
@@ -62,14 +62,6 @@ def __getitem__(self, i):
     __eq__ = lambda self, other: (isinstance(other, ProductSpace) and
                                   self._reduced == other._reduced)
     
-    def __contains__(self, given_sequence):
-        try:
-            self.index(given_sequence)
-        except ValueError:
-            return False
-        else:
-            return True
-        
     def index(self, given_sequence):
         if not isinstance(given_sequence, collections.Sequence) or \
                                 not len(given_sequence) == len(self.sequences):
diff --git a/source_py3/python_toolbox/combi/selection_space.py b/source_py3/python_toolbox/combi/selection_space.py
@@ -84,32 +84,24 @@ def __getitem__(self, i):
         
     _reduced = property(lambda self: (type(self), self.sequence))
     __hash__ = lambda self: hash(self._reduced)
-             
+    __bool__ = lambda self: bool(self.length)
     __eq__ = lambda self, other: (isinstance(other, SelectionSpace) and
                                   self._reduced == other._reduced)
     
-    def __contains__(self, given_iterable):
-        try:
-            self.index(given_iterable)
-        except ValueError:
-            return False
-        else:
-            return True
-        
-    def index(self, given_iterable):
-        if not isinstance(given_iterable, collections.Iterable):
+    def index(self, selection):
+        '''Find the index number of `selection` in this `SelectionSpace`.'''
+        if not isinstance(selection, collections.Iterable):
             raise ValueError
         
-        given_iterable_set = set(given_iterable)
+        selection_set = set(selection)
         
-        if not given_iterable_set <= self._sequence_set:
+        if not selection_set <= self._sequence_set:
             raise ValueError
         
         return sum((2 ** i) for i, item in enumerate(reversed(self.sequence))
-                                                 if item in given_iterable_set)
+                                                 if item in selection_set)
     
     
-    __bool__ = lambda self: bool(self.length)
         
 
 
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -203,11 +203,6 @@ def __len__(self):
         # Sadly Python doesn't allow infinity or floats here.
         return self.length if isinstance(self.length, numbers.Integral) else 0
         
-    def __contains__(self, i):
-        try: self.index(i)
-        except ValueError: return False
-        else: return True
-        
     def index(self, i):
         from python_toolbox import math_tools
         if not isinstance(i, numbers.Number):
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -402,6 +402,11 @@ def __init__(self, slice_, iterable_or_length=None, offset=0):
 class CuteSequenceMixin(misc_tools.AlternativeLengthMixin):
     def take_random(self):
         return self[random.randint(0, get_length(self))]
+    def __contains__(self, item):
+        try: self.index(item)
+        except ValueError: return False
+        else: return True
+    
         
     
 class CuteSequence(CuteSequenceMixin, collections.Sequence):
