-

cool-RR · cool-RR · commit eaa5c53aa7a4 · 2014-09-30T23:47:16.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm.py b/source_py3/python_toolbox/combi/perm.py
@@ -114,7 +114,7 @@ def __init__(self, perm_sequence, perm_space=None):
             
             
     _reduced = property(lambda self: (
-        type(self), self._perm_sequence
+        type(self), self._perm_sequence, self.nominal_perm_space
     ))
             
     __iter__ = lambda self: iter(self._perm_sequence)
@@ -334,6 +334,10 @@ def __lt__(self, other):
     items = caching.CachedProperty(PermItems)
     as_dictoid = caching.CachedProperty(PermAsDictoid)
     
+    def __eq__(self, other):
+        return type(self) == type(other) and \
+                      self.nominal_perm_space == other.nominal_perm_space and \
+           cute_iter_tools.are_equal(self._perm_sequence, other._perm_sequence)
         
 
 
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -650,18 +650,16 @@ def __getitem__(self, i):
         
         else:
             factoradic_number = math_tools.to_factoradic(
-                self.number * math.factorial(
-                     self.nominal_perm_space.n_unused_elements),
-                n_digits_pad=self.nominal_perm_space.sequence_length
+                i * math.factorial(
+                     self.n_unused_elements),
+                n_digits_pad=self.sequence_length
             )
             if self.is_partial:
-                factoradic_number = factoradic_number[
-                    :-self.nominal_perm_space.n_unused_elements
-                ]
-            unused_numbers = list(self.nominal_perm_space.sequence)
+                factoradic_number = factoradic_number[:-self.n_unused_elements]
+            unused_numbers = list(self.sequence)
             result = tuple(unused_numbers.pop(factoradic_digit) for
                                              factoradic_digit in factoradic_number)
-            assert sequence_tools.get_length(result) == self.length
+            assert sequence_tools.get_length(result) == self.sequence_length
             
             return self.perm_type(result, self)
                 
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
@@ -54,8 +54,7 @@ def test_perm_spaces():
     with cute_testing.RaiseAssertor(IndexError): pure_0a[pure_0a.length + 2]
     with cute_testing.RaiseAssertor(IndexError): pure_0a[pure_0a.length + 300]
     
-    with cute_testing.RaiseAssertor(): Perm(24, pure_0a)
-    with cute_testing.RaiseAssertor(): Perm(-1, pure_0a)
+    with cute_testing.RaiseAssertor(): pure_0a[24]
     
     assert pure_0a.take_random() in pure_0c
     
@@ -90,7 +89,6 @@ def test_perm_spaces():
     assert isinstance(first_perm.as_dictoid, combi.perm.PermAsDictoid)
     assert first_perm.as_dictoid[2] == 2
     assert dict(first_perm.as_dictoid) == {0: 0, 1: 1, 2: 2, 3: 3}
-    assert first_perm % 7 == 0
     assert not (first_perm != first_perm)
     assert first_perm == first_perm
     assert first_perm
@@ -100,8 +98,6 @@ def test_perm_spaces():
     assert some_perm.inverse == ~ some_perm
     assert ~ ~ some_perm == some_perm
     
-    assert int(first_perm) == 0
-    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.
@@ -118,9 +114,6 @@ def test_perm_spaces():
                                                 len(pure_perm_space) - 1
     assert pure_perm_space.index(some_perm) == 7
     
-    assert Perm(7, pure_perm_space) ==  Perm(7, range(4)) == Perm(7, 4) == \
-                                                                    some_perm
-    
     assert 'meow' * Perm((1, 3, 2, 0)) == 'ewom'
     assert Perm('meow', 'meow') * Perm((1, 3, 2, 0)) == Perm('ewom', 'meow')
     assert [0, 1, 2, 3] * Perm((0, 1, 2, 3)) == (0, 1, 2, 3)
