-

cool-RR · cool-RR · commit a087bf9f9b1e · 2014-10-18T00:47:43.000+03:00
diff --git a/source_py3/python_toolbox/math_tools/factorials.py b/source_py3/python_toolbox/math_tools/factorials.py
@@ -12,7 +12,7 @@
 
 def factorial(x, start=1):
     '''
-    Calculate a factorial
+    Calculate a factorial.
     
     This differs from the built-in `math.factorial` in that it allows a `start`
     argument. If one is given, the function returns `(x!)/(start!)`.
diff --git a/source_py3/test_python_toolbox/test_combi/test_misc.py b/source_py3/test_python_toolbox/test_combi/test_misc.py
@@ -4,17 +4,24 @@
 from python_toolbox import cute_testing
 from python_toolbox import math_tools
 
-from python_toolbox.combi import *
+from python_toolbox import combi
 
 
 def test():
-    assert misc.get_short_factorial_string(7) == str(math_tools.factorial(7))
-    assert misc.get_short_factorial_string(7, minus_one=True) == \
+    assert combi.misc.get_short_factorial_string(7) == \
+                                                   str(math_tools.factorial(7))
+    assert combi.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 combi.misc.get_short_factorial_string(17) == '17!'
+    assert combi.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'),
+    assert combi.misc.get_short_factorial_string(float('inf')) == \
+                                                             '''float('inf')'''
+    assert combi.misc.get_short_factorial_string(float('inf'),
                                           minus_one=True) == '''float('inf')'''
+
+def test_binomial_in_root_namespace():
+    assert hasattr(combi, 'binomial')
+    assert combi.binomial(7, 3) == 35
diff --git a/source_py3/test_python_toolbox/test_math_tools/test_binomial.py b/source_py3/test_python_toolbox/test_math_tools/test_binomial.py
@@ -0,0 +1,16 @@
+# Copyright 2009-2015 Ram Rachum.
+# This program is distributed under the MIT license.
+
+import sys
+
+import nose
+
+from python_toolbox.math_tools import binomial
+
+
+def test():
+    assert binomial(7, 3) == 35
+    assert binomial(0, 0) == 1
+    assert binomial(1, 0) == 1
+    assert binomial(0, 1) == 0
+    assert binomial(1543, 634) == 127103521979248139661884595050302692072114625333816461647571438364482801578062268185939019831927710543644891679108093639691467979466411177318250931548804667267192030646116875003881007119966764992383016174407823444352165249728639847571592229832113238415348489512831060701471487834812550521403788703534654431344329462541634971732197170414906629071055802381322184009159362499960475076746698583466181504060523973736761406471112019069930703149760846502951040
