Created combination.py in maths (keon#304)

geon0325 · goswami-rahul · commit bb9d6c195665 · 2018-06-04T17:07:07.000+05:30
* Create combination.py

* Update __init__.py

* Update test_maths.py

* Update README.md

* Update README_CN.md

* Update README_GE.md

* Update README_JP.md

* Update README_KR.md
diff --git a/README.md b/README.md
@@ -172,6 +172,7 @@ If you want to uninstall algorithms, it is as simple as:
     - [valid_sudoku](algorithms/map/valid_sudoku.py)
 - [maths](algorithms/maths)
     - [base_conversion](algorithms/maths/base_conversion.py)
+    - [combination](algorithms/maths/combination.py)
     - [extended_gcd](algorithms/maths/extended_gcd.py)
     - [gcd/lcm](algorithms/maths/gcd.py)
     - [generate_strobogrammtic](algorithms/maths/generate_strobogrammtic.py)
diff --git a/README_CN.md b/README_CN.md
@@ -164,6 +164,7 @@ pip3 uninstall -y algorithms
     - [valid_sudoku&#65306;&#26377;&#25928;&#25968;&#29420;](algorithms/map/valid_sudoku.py)
 - [math&#65306;&#25968;&#23398;&#38382;&#39064;](algorithms/maths)
     - [extended_gcd&#65306;&#25193;&#23637;&#27431;&#20960;&#37324;&#24471;&#31639;&#27861;](algorithms/maths/extended_gcd.py)
+    - [combination](algorithms/maths/combination.py)
     - [gcd/lcm&#65306;&#26368;&#22823;&#20844;&#32422;&#25968;&#21644;&#26368;&#23567;&#20844;&#20493;&#25968;](algorithms/maths/gcd.py)
     - [prime_test&#65306;&#20027;&#35201;&#27979;&#35797;](algorithms/maths/prime_test.py)
     - [primes_sieve_of_eratosthenes&#65306;&#22467;&#25289;&#25176;&#33394;&#23612;&#30340;&#36136;&#25968;&#31579;](algorithms/maths/primes_sieve_of_eratosthenes.py)
diff --git a/README_GE.md b/README_GE.md
@@ -179,6 +179,7 @@ Um das Projekt zu deinstallieren tippen Sie folgendes:
     - [valid_sudoku](algorithms/map/valid_sudoku.py)
 - [maths](algorithms/maths)
     - [base_conversion](algorithms/maths/base_conversion.py)
+    - [combination](algorithms/maths/combination.py)
     - [extended_gcd](algorithms/maths/extended_gcd.py)
     - [gcd/lcm](algorithms/maths/gcd.py)
     - [generate_strobogrammtic](algorithms/maths/generate_strobogrammtic.py)
diff --git a/README_JP.md b/README_JP.md
@@ -1,6 +1,6 @@
 [English](README.md) | [&#31616;&#20307;&#20013;&#25991;](README_CN.md) | [Deutsch](README_GE.md) | &#26085;&#26412;&#35486; | [&#54620;&#44397;&#50612;](README_KR.md)
 
-python&#12398;&#12487;&#12540;&#12479;&#27083;&#36896;&#12392;&#12450;&#12523;&#12468;&#12522;&#12474;&#12512;
+Python&#12398;&#12487;&#12540;&#12479;&#27083;&#36896;&#12392;&#12450;&#12523;&#12468;&#12522;&#12474;&#12512;
 =========================================
 
 Python 3&#12391;&#38283;&#30330;&#12373;&#12428;&#12383;&#31777;&#21336;&#12391;&#26126;&#30906;&#12394;&#12487;&#12540;&#12479;&#27083;&#36896;&#12392;&#12450;&#12523;&#12468;&#12522;&#12474;&#12512;&#12398;&#20363;&#12434;&#32057;&#20171;&#12375;&#12414;&#12377;&#12290;
@@ -169,6 +169,7 @@ if __name__ == "__main__":
     - [valid_sudoku](algorithms/map/valid_sudoku.py)
 - [maths : &#25968;&#23398;](algorithms/maths)
     - [base_conversion](algorithms/maths/base_conversion.py)
+    - [combination](algorithms/maths/combination.py)
     - [extended_gcd](algorithms/maths/extended_gcd.py)
     - [gcd/lcm](algorithms/maths/gcd.py)
     - [generate_strobogrammtic](algorithms/maths/generate_strobogrammtic.py)
diff --git a/README_KR.md b/README_KR.md
@@ -165,6 +165,7 @@ if __name__ == "__main__":
     - [valid_sudoku](algorithms/map/valid_sudoku.py)
 - [maths : &#49688;&#54617; &#44228;&#49328;](algorithms/maths)
     - [base_conversion](algorithms/maths/base_conversion.py)
+    - [combination](algorithms/maths/combination.py)
     - [extended_gcd](algorithms/maths/extended_gcd.py)
     - [gcd/lcm](algorithms/maths/gcd.py)
     - [generate_strobogrammtic](algorithms/maths/generate_strobogrammtic.py)
diff --git a/algorithms/maths/__init__.py b/algorithms/maths/__init__.py
@@ -9,3 +9,4 @@
 from .pythagoras import *
 from .rabin_miller import *
 from .rsa import *
+from .combination import *
diff --git a/algorithms/maths/combination.py b/algorithms/maths/combination.py
@@ -0,0 +1,6 @@
+def combination(n, r):
+    # This function calculates nCr
+    if n == r or r == 0:
+        return 1
+    else:
+        return combination(n-1, r-1) + combination(n-1, r)
diff --git a/tests/test_maths.py b/tests/test_maths.py
@@ -9,7 +9,8 @@
     primes,
     pythagoras,
     is_prime,
-    encrypt, decrypt, generate_key
+    encrypt, decrypt, generate_key,
+    combination
 )
 
 import unittest
@@ -202,6 +203,17 @@ def test_encrypt_decrypt(self):
     #         dec = decrypt(en, d, n)
     #         self.assertEqual(data,dec)
 
+class TestCombination(unittest.TestCase):
+    """[summary]
+    Test for the file rsa.py
+
+    Arguments:
+        unittest {[type]} -- [description]
+    """
 
+    def test_combination(self):
+        self.assertEqual(10, combination(5, 2))
+        self.assertEqual(252, combination(10, 5))
+        
 if __name__ == "__main__":
     unittest.main()

-Original file line number
+Diff line change
     - [valid_sudoku：有效数独](algorithms/map/valid_sudoku.py)
 - [math：数学问题](algorithms/maths)
     - [extended_gcd：扩展欧几里得算法](algorithms/maths/extended_gcd.py)
 +    - [combination](algorithms/maths/combination.py)
     - [gcd/lcm：最大公约数和最小公倍数](algorithms/maths/gcd.py)
     - [prime_test：主要测试](algorithms/maths/prime_test.py)
     - [primes_sieve_of_eratosthenes：埃拉托色尼的质数筛](algorithms/maths/primes_sieve_of_eratosthenes.py)