From bac53548085b8fac4375ca93fb614f74489eaa5c Mon Sep 17 00:00:00 2001
From: Shiven Tripathi <58358532+ShivenTripathi@users.noreply.github.com>
Date: Fri, 16 Oct 2020 23:56:22 +0530
Subject: [PATCH 1/3] add problem to find roots of quadratic equation

---
 mathgenerator/mathgen.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 917fccc..90cd1ac 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -531,6 +531,15 @@ def commonFactorsFunc(maxVal=100):
     problem = f"Common Factors of {a} and {b} = "
     solution = arr
     return problem, solution
+
+def quadraticEquation(maxVal=100):
+	a = random.randint(1,maxVal)
+	c = random.randint(1,maxVal)
+	b = random.randint(4*a*c,4*maxVal*maxVal)
+	
+	problem = "Zeros of the Quadratic Equation {a}x^2+{b}x+{c}=0".format(a,b,c)
+	solution = str[(-b+sqrt(b^2-4*a*c))/2*a,(-b-sqrt(b^2-4*a*c))/2*a]
+	return problem,solution
 # || Class Instances
 
 #Format is:
@@ -577,3 +586,4 @@ volumeCylinderGen = Generator("Volume of cylinder", 37, "Volume of cylinder with
 surfaceAreaConeGen = Generator("Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is","c units^2", surfaceAreaCone)
 volumeConeGen = Generator("Volume of cone", 39, "Volume of cone with height = a units and radius = b units is","c units^3", volumeCone)
 commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ","[c, d, ...]",commonFactorsFunc)
+quadraticEquationSolve = Generator("Quadratic Equation", 41, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)

From 2b5a8135dc47f1209103fbbb75804ffb3a82bd09 Mon Sep 17 00:00:00 2001
From: Shiven Tripathi <58358532+ShivenTripathi@users.noreply.github.com>
Date: Sat, 17 Oct 2020 18:22:20 +0530
Subject: [PATCH 2/3] debug, tested

---
 mathgenerator/mathgen.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 90cd1ac..fda0d0e 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -535,10 +535,13 @@ def commonFactorsFunc(maxVal=100):
 def quadraticEquation(maxVal=100):
 	a = random.randint(1,maxVal)
 	c = random.randint(1,maxVal)
-	b = random.randint(4*a*c,4*maxVal*maxVal)
+	b = random.randint(round(math.sqrt(4*a*c))+1,round(math.sqrt(4*maxVal*maxVal)))
 	
-	problem = "Zeros of the Quadratic Equation {a}x^2+{b}x+{c}=0".format(a,b,c)
-	solution = str[(-b+sqrt(b^2-4*a*c))/2*a,(-b-sqrt(b^2-4*a*c))/2*a]
+	problem = "Zeros of the Quadratic Equation {}x^2+{}x+{}=0".format(a,b,c)
+
+	D = math.sqrt(b*b-4*a*c)
+	
+	solution = str([(-b+D)/(2*a),(-b-D)/(2*a)])
 	return problem,solution
 # || Class Instances
 

From e2bbbee7c6957ac6276c9b95dad579fcc93745ac Mon Sep 17 00:00:00 2001
From: Luke Weiler <lukew25073@gmail.com>
Date: Sat, 17 Oct 2020 12:54:30 -0400
Subject: [PATCH 3/3] Rounded solution

---
 mathgenerator/mathgen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 3a44119..72eb108 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -723,7 +723,7 @@ def quadraticEquation(maxVal=100):
 
 	D = math.sqrt(b*b-4*a*c)
 	
-	solution = str([(-b+D)/(2*a),(-b-D)/(2*a)])
+	solution = str([round((-b+D)/(2*a), 2),round((-b-D)/(2*a), 2)])
 	return problem,solution
 
 # || Class Instances