-

cool-RR · cool-RR · commit 095405d06a68 · 2014-09-19T00:11:48.000+03:00
diff --git a/source_py3/python_toolbox/combi/selection_space.py b/source_py3/python_toolbox/combi/selection_space.py
@@ -24,10 +24,11 @@
         
 class SelectionSpace(sequence_tools.CuteSequenceMixin,
                      collections.Sequence):
-    def __init__(self, sequence, n):
+    def __init__(self, sequence):
         self.sequence = \
              sequence_tools.ensure_iterable_is_immutable_sequence(sequence)
-        self.length = 2 ** len(self.sequence)
+        self.sequence_length = len(self.sequence)
+        self.length = 2 ** self.sequence_length
         
         
     def __repr__(self):
@@ -40,16 +41,18 @@ def __getitem__(self, i):
         if isinstance(i, slice):
             raise NotImplementedError
         
+        if (-self.length <= i <= -1):
+            i += self.length
         if not (0 <= i < self.length):
             raise IndexError
         
-        pattern = '{0:0%sb}' % self.length
+        pattern = '{0:0%sb}' % self.sequence_length
         binary_i = pattern.format(i)
         
-        assert len(binary_i) == len(self.sequence)
+        assert len(binary_i) == self.sequence_length
         
         return tuple(item for (is_included, item) in
-                     zip(binary_i, self.sequence) if is_included)
+                     zip(map(int, binary_i), self.sequence) if is_included)
         
         
     _reduced = property(lambda self: (type(self), self.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
@@ -386,5 +386,6 @@ def test_neighbors():
     
 
 def test_super_structure():
-    
+    # blocktodo do a whole thing with mapspaces and somethingspacespaceshit
+    pass
     
diff --git a/source_py3/test_python_toolbox/test_combi/test_selection_space.py b/source_py3/test_python_toolbox/test_combi/test_selection_space.py
@@ -0,0 +1,13 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox.combi import *
+
+
+def test():
+    selection_space = SelectionSpace(range(5))
+    assert len(tuple(selection_space)) == len(selection_space) == 2 ** 5
+    assert selection_space[0] == ()
+    assert selection_space[-1] == tuple(range(5))
+    
+    
