From ed77e8b986f680ce94f89cc02990fff474f6aab2 Mon Sep 17 00:00:00 2001
From: lukew3 <lukew25073@gmail.com>
Date: Tue, 20 Oct 2020 13:21:31 -0400
Subject: [PATCH] isprime fix

---
 mathgen.py                                    | 43 -------------------
 mathgenerator/funcs/__init__.py               |  2 +-
 .../funcs/{isprime.py => is_prime.py}         |  4 ++
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 mathgen.py
 rename mathgenerator/funcs/{isprime.py => is_prime.py} (80%)

diff --git a/mathgen.py b/mathgen.py
deleted file mode 100644
index ffb2ebe..0000000
--- a/mathgen.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import random
-
-
-genList = []
-
-
-# || Generator class
-class Generator:
-    def __init__(self, title, id, generalProb, generalSol, func):
-        self.title = title
-        self.id = id
-        self.generalProb = generalProb
-        self.generalSol = generalSol
-        self.func = func
-        genList.append([id, title, self])
-
-    def __str__(self):
-        return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol
-
-    def __call__(self, **kwargs):
-        return self.func(**kwargs)
-
-
-def isprime(max_a=100):
-    a = random.randint(2, max_a)
-    problem = a
-    if a == 2:
-        solution = True
-        return (problem, solution)
-    if a % 2 == 0:
-        solution = False
-        return (problem, solution)
-    for i in range(3, a // 2 + 1, 2):
-        if a % i == 0:
-            solution = False
-            return (problem, solution)
-    solution = True
-    return (problem, solution)
-
-
-is_prime = Generator('isprime', 74, 'a any positive integer',
-                     'True/False', isprime)
-print(is_prime.func)
diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py
index bf59c56..56a2fd5 100644
--- a/mathgenerator/funcs/__init__.py
+++ b/mathgenerator/funcs/__init__.py
@@ -94,4 +94,4 @@ from .degree_to_rad import *
 from .radian_to_deg import *
 from .differentiation import *
 from .definite_integral import *
-from .isprime import *
\ No newline at end of file
+from .is_prime import *
diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/is_prime.py
similarity index 80%
rename from mathgenerator/funcs/isprime.py
rename to mathgenerator/funcs/is_prime.py
index 9da7bfb..143f4d3 100644
--- a/mathgenerator/funcs/isprime.py
+++ b/mathgenerator/funcs/is_prime.py
@@ -16,3 +16,7 @@ def isprime(max_a=100):
             return (problem, solution)
     solution = True
     return (problem, solution)
+
+
+is_prime = Generator('isprime', 90, 'a any positive integer',
+                     'True/False', isprime)