From c00af459fe0a18ae6adca2aec5ca8c7ff64864c8 Mon Sep 17 00:00:00 2001
From: Caeden Perelli-Harris <caedenperelliharris@gmail.com>
Date: Thu, 26 Jan 2023 07:12:11 +0000
Subject: [PATCH] feat: Concatenate both factorial implementations (#8099)

* feat: Concatenate both factorial implementations

* fix: Rename factorial recursive method
---
 .../{factorial_iterative.py => factorial.py}  | 24 ++++++++++++++++
 maths/factorial_recursive.py                  | 28 -------------------
 2 files changed, 24 insertions(+), 28 deletions(-)
 rename maths/{factorial_iterative.py => factorial.py} (58%)
 delete mode 100644 maths/factorial_recursive.py

diff --git a/maths/factorial_iterative.py b/maths/factorial.py
similarity index 58%
rename from maths/factorial_iterative.py
rename to maths/factorial.py
index c6cf7de57..bbf0efc01 100644
--- a/maths/factorial_iterative.py
+++ b/maths/factorial.py
@@ -34,6 +34,30 @@ def factorial(number: int) -> int:
     return value
 
 
+def factorial_recursive(n: int) -> int:
+    """
+    Calculate the factorial of a positive integer
+    https://en.wikipedia.org/wiki/Factorial
+
+    >>> import math
+    >>> all(factorial(i) == math.factorial(i) for i in range(20))
+    True
+    >>> factorial(0.1)
+    Traceback (most recent call last):
+        ...
+    ValueError: factorial() only accepts integral values
+    >>> factorial(-1)
+    Traceback (most recent call last):
+        ...
+    ValueError: factorial() not defined for negative values
+    """
+    if not isinstance(n, int):
+        raise ValueError("factorial() only accepts integral values")
+    if n < 0:
+        raise ValueError("factorial() not defined for negative values")
+    return 1 if n == 0 or n == 1 else n * factorial(n - 1)
+
+
 if __name__ == "__main__":
     import doctest
 
diff --git a/maths/factorial_recursive.py b/maths/factorial_recursive.py
deleted file mode 100644
index 137112738..000000000
--- a/maths/factorial_recursive.py
+++ /dev/null
@@ -1,28 +0,0 @@
-def factorial(n: int) -> int:
-    """
-    Calculate the factorial of a positive integer
-    https://en.wikipedia.org/wiki/Factorial
-
-    >>> import math
-    >>> all(factorial(i) == math.factorial(i) for i in range(20))
-    True
-    >>> factorial(0.1)
-    Traceback (most recent call last):
-        ...
-    ValueError: factorial() only accepts integral values
-    >>> factorial(-1)
-    Traceback (most recent call last):
-        ...
-    ValueError: factorial() not defined for negative values
-    """
-    if not isinstance(n, int):
-        raise ValueError("factorial() only accepts integral values")
-    if n < 0:
-        raise ValueError("factorial() not defined for negative values")
-    return 1 if n == 0 or n == 1 else n * factorial(n - 1)
-
-
-if __name__ == "__main__":
-    import doctest
-
-    doctest.testmod()