-

cool-RR · cool-RR · commit 0b2fb342cf5c · 2014-09-21T02:41:31.000+03:00
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -401,7 +401,7 @@ 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))]
+        return self[random.randint(0, get_length(self) - 1)]
     def __contains__(self, item):
         try: self.index(item)
         except ValueError: return False
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
@@ -49,6 +49,10 @@ def test():
     assert tuple(comb) == tuple(comb.uncombinationed)
     assert comb.is_combination
     assert not comb.uncombinationed.is_combination
+    assert repr(comb_space) == '''<CombSpace: 'dumber', n_elements=2>'''
+    assert repr(CombSpace(tuple(range(50, 0, -1)), 3)) == \
+     '''<CombSpace: (50, 49, 48, 47, 46, 45, 44, 43, 42 ... ), n_elements=3>'''
+    
     
     
     
diff --git a/source_py3/test_python_toolbox/test_combi/test_misc.py b/source_py3/test_python_toolbox/test_combi/test_misc.py
@@ -0,0 +1,20 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox import cute_testing
+from python_toolbox import math_tools
+
+from python_toolbox.combi import *
+
+
+def test():
+    assert misc.get_short_factorial_string(7) == str(math_tools.factorial(7))
+    assert misc.get_short_factorial_string(7, minus_one=True) == \
+                                               str(math_tools.factorial(7) - 1)
+    
+    assert misc.get_short_factorial_string(17) == '17!'
+    assert misc.get_short_factorial_string(17, minus_one=True) == '17! - 1'
+    
+    assert misc.get_short_factorial_string(float('inf')) == '''float('inf')'''
+    assert misc.get_short_factorial_string(float('inf'),
+                                          minus_one=True) == '''float('inf')'''
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
@@ -16,5 +16,18 @@ def test():
         
     assert (1, 6) not in selection_space
     assert 'foo' not in selection_space
+    assert 7 not in selection_space
     assert (1, 3, 4) in selection_space
+    assert selection_space
+    assert repr(selection_space) == '<SelectionSpace: range(0, 5)>'
+    assert {SelectionSpace(range(4)), SelectionSpace(range(4)),
+            SelectionSpace(range(5)), SelectionSpace(range(4))} == \
+                           {SelectionSpace(range(4)), SelectionSpace(range(5))}
+    
+    assert SelectionSpace(range(5)) == SelectionSpace(range(5))
+    assert SelectionSpace(range(5)) != SelectionSpace(range(4))
+    assert SelectionSpace(range(5)) != SelectionSpace(range(5, 0, -1))
+    
+    
+    
     
