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 01/15] 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 1572bd616c473906914c2e72f7fcff6b9971600f Mon Sep 17 00:00:00 2001
From: c0d3nh4ck <50226641+c0d3nh4ck@users.noreply.github.com>
Date: Sat, 17 Oct 2020 08:01:21 +0530
Subject: [PATCH 02/15] added HCF function

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..660a961 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -714,6 +714,17 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     solution = angle4
     return problem, solution
 
+
+def hcfFunc(maxVal=20):
+    a = random.randint(1, maxVal)
+    b = random.randint(1, maxVal)
+    x, y = a, b
+    while(y):
+       x, y = y, x % y
+    problem = f"HCF of {a} and {b} = "
+    solution = str(x)
+    return problem, solution
+
 # || Class Instances
 
 #Format is:
@@ -769,3 +780,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+hcf = Generator("HCF (Highest Common Factor)", 50, "HCF of a and b = ", "c", hcfFunc)

From dedbb7027e1f53cad75608991fdd6d50de75589d Mon Sep 17 00:00:00 2001
From: Ritu Raj <68614399+Ritu1611@users.noreply.github.com>
Date: Sat, 17 Oct 2020 11:47:30 +0530
Subject: [PATCH 03/15] Probability Function for Sum on dice faces

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..866a2f2 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -714,6 +714,27 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     solution = angle4
     return problem, solution
 
+def DiceSumProbFunc(maxDice=3):
+    a = random.randint(1,maxDice)
+    b = random.randint(a,6*a)
+    count=0
+    for i in [1,2,3,4,5,6]:
+        if a==1:
+            if i==b:
+                count=count+1
+        elif a==2:
+            for j in [1,2,3,4,5,6]:
+                if i+j==b:
+                    count=count+1
+        elif a==3:
+            for j in [1,2,3,4,5,6]:
+                for k in [1,2,3,4,5,6]:
+                    if i+j+k==b:
+                        count=count+1
+    problem = "If {} dices rolled at the same time, Probability of getting a sum of {} =".format(a,b)
+    solution="{}/{}".format(count, 6**a)
+    return problem, solution
+
 # || Class Instances
 
 #Format is:
@@ -769,3 +790,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+DiceSumProbability=Generator("Probability of a certain sum appearing on faces of dice",50,"If n dices are rolled then probabilty of getting sum of x is", DiceSumProbFunc)

From e3834b2c8951be2670dc6a8a3ea64c7eca81725a Mon Sep 17 00:00:00 2001
From: Ritu Raj <68614399+Ritu1611@users.noreply.github.com>
Date: Sat, 17 Oct 2020 11:54:50 +0530
Subject: [PATCH 04/15] Update mathgen.py

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 866a2f2..a5164a1 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -790,4 +790,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
-DiceSumProbability=Generator("Probability of a certain sum appearing on faces of dice",50,"If n dices are rolled then probabilty of getting sum of x is", DiceSumProbFunc)
+DiceSumProbability=Generator("Probability of a certain sum appearing on faces of dice",50,"If n dices are rolled then probabilty of getting sum of x is =","z", DiceSumProbFunc)

From 91b42f8ab6287219c767ed38937db1508f853414 Mon Sep 17 00:00:00 2001
From: palmcm <palmermonkeyboy@gmail.com>
Date: Sat, 17 Oct 2020 13:38:19 +0700
Subject: [PATCH 05/15] Add exponentiation function

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..0722c35 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -714,6 +714,12 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     solution = angle4
     return problem, solution
 
+def exponentiationFunc(maxBase = 20,maxExpo = 10):
+    base = random.randint(1, maxBase)
+    expo = random.randint(1, maxExpo)
+    problem = f"{base}^{expo} ="
+    solution = str(base ** expo)
+    return problem, solution
 # || Class Instances
 
 #Format is:
@@ -769,3 +775,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+exponentiation = Generator("Exponentiation",50,"a^b = ","c",exponentiationFunc)
\ No newline at end of file

From efc3df0b275784b1cce4fa3e182b4f974317e427 Mon Sep 17 00:00:00 2001
From: Ritu Raj <68614399+Ritu1611@users.noreply.github.com>
Date: Sat, 17 Oct 2020 13:22:26 +0530
Subject: [PATCH 06/15] Confidence Interval Problem Generator

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..e7da9a6 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -713,6 +713,27 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} ="
     solution = angle4
     return problem, solution
+def confidenceIntervalFunc():
+    n=random.randint(20,40)
+    j=random.randint(1,4)
+    lst=random.sample(range(200,300),n)
+    lst_per=[80 ,90, 95, 99]
+    lst_t = [1.282, 1.645, 1.960, 2.576]
+    mean=0
+    sd=0
+    for i in lst:
+        count= i + mean
+        mean=count
+    mean = mean/n
+    for i in lst:
+        x=(i-mean)**2+sd
+        sd=x
+    sd=sd/n
+    standard_error = lst_t[j]*math.sqrt(sd/n)
+    problem= 'The confidence interval for sample {} with {}% confidence is'.format([x for x in lst], lst_per[j])
+    solution= '({}, {})'.format(mean+standard_error, mean-standard_error)
+    return problem, solution
+
 
 # || Class Instances
 
@@ -769,3 +790,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+ConfidenceInterval = Generator("Confidence interval For sample S", 51, "With X% confidence", "is (A,B)", confidenceIntervalFunc)

From 6651379fb82862edd1b970fec65ddbebbd3c7549 Mon Sep 17 00:00:00 2001
From: MaxwellJpg <70202524+MaxwellJpg@users.noreply.github.com>
Date: Sat, 17 Oct 2020 10:26:46 +0100
Subject: [PATCH 07/15] Update README.md

correct row 26 of table
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dfc7d41..3f3ab03 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,7 @@ problem, solution = mathgen.genById(0)
 | 23 | Solve a System of Equations in R^2 | 4x - 8y = 48, 3x - 8y = 40 | x = 8, y = -2 | systemOfEquations |
 | 24 | Distance between 2 points | Find the distance between (-9, -20) and (18, -19) | sqrt(730) | distance2Point |
 | 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 13 =  | 22.20 | pythagoreanTheorem |
-| 26 | Linear Equations | -11x + -16y = -302
-1x + 20y = 250 | x = 10, y = 12 | linearEquations |
+| 26 | Linear Equations | -11x + -16y = -302 , 1x + 20y = 250 | x = 10, y = 12 | linearEquations |
 | 27 | Prime Factorisation | Find prime factors of 55 | [5, 11] | primeFactors |
 | 28 | Fraction Multiplication | (4/9)*(8/10) | 16/45 | fractionMultiplication |
 | 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | angleRegularPolygon |

From e2857e8f18aff94aee4fb02265842d6d075374d8 Mon Sep 17 00:00:00 2001
From: MaxwellJpg <MaxwellRJermy@yahoo.co.uk>
Date: Sat, 17 Oct 2020 12:26:10 +0100
Subject: [PATCH 08/15] correct int powerRuleIntegrationFunc

---
 mathgenerator/mathgen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..3c67452 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -699,7 +699,7 @@ def powerRuleIntegrationFunc(maxCoef = 10, maxExp = 10, maxTerms = 5):
         coefficient = random.randint(1, maxCoef)
         exponent = random.randint(1, maxExp)
         problem += str(coefficient) + "x^" + str(exponent)
-        solution += "("+str(coefficient) +"/"+str(exponent) +")x^" + str(exponent +1)
+        solution += "("+str(coefficient) +"/"+str(exponent + 1) +")x^" + str(exponent +1)
     solution = solution + " + c"
     return problem, solution
 
@@ -767,5 +767,5 @@ compareFractions=Generator("Compare Fractions",44,"Which symbol represents the c
 simpleInterest = Generator("Simple Interest", 45, "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", simpleInterestFunc)
 matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multiply two matrices A and B", "C", matrixMultiplicationFunc)
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
-powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
+powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m+1)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)

From 7bbfec529ff49cdfb7b61f46067df81eb09cf399 Mon Sep 17 00:00:00 2001
From: ieshaan12 <ieshaan1999@gmail.com>
Date: Sat, 17 Oct 2020 17:24:23 +0530
Subject: [PATCH 09/15] Surds comparison

---
 README.md                |  1 +
 mathgenerator/mathgen.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/README.md b/README.md
index dfc7d41..621b2a4 100644
--- a/README.md
+++ b/README.md
@@ -81,3 +81,4 @@ problem, solution = mathgen.genById(0)
 | 47 | Cube Root | cuberoot of 711 upto 2 decimal places is: | 8.93 | CubeRoot |
 | 48 | Power Rule Integration | 3x^1 | (3/1)x^2 + c | powerRuleIntegration |
 | 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 94 , 101, 102 = | 63 | fourthAngleOfQuadrilateral |
+| 50 | Surd Comparison | 25^(1/3) _ 37^(1/2)  | < | surdsComparisonGen |
diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..fb435d2 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -714,6 +714,20 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     solution = angle4
     return problem, solution
 
+def surdsComparison(maxValue = 100, maxRoot = 10):
+    radicand1,radicand2 = tuple(random.sample(range(1,maxValue),2))
+    degree1, degree2 = tuple(random.sample(range(1,maxRoot),2))
+    problem = f"Fill in the blanks {radicand1}^(1/{degree1}) _ {radicand2}^(1/{degree2})"
+    first = math.pow(radicand1, 1/degree1)
+    second = math.pow(radicand2, 1/degree2)
+    solution = "="
+    if first > second:
+        solution = ">"
+    elif first < second:
+        solution = "<"
+    return problem, solution
+    
+
 # || Class Instances
 
 #Format is:
@@ -769,3 +783,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+surdsComparisonGen = Generator("Comparing surds", 50, "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", surdsComparison)

From b8a5741ecd424ce57bf76d23dd6380fb91f33020 Mon Sep 17 00:00:00 2001
From: vishnudk <vishnudk179@gmail.com>
Date: Sat, 17 Oct 2020 17:31:20 +0530
Subject: [PATCH 10/15] add a

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..0791512 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -713,6 +713,22 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} ="
     solution = angle4
     return problem, solution
+def createFibList(n):
+    l=[]
+    for i in range(n):
+        if i<2:
+            l.append(i)
+        else:
+            val = l[i-1]+l[i-2]
+            l.append(val)
+    return l
+        
+def fibonacciSeriesFunc(minNo=1):
+    n = random.randint(minNo,20)
+    fibList=createFibList(n)
+    problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?"
+    solution = fibList
+    return problem,solution
 
 # || Class Instances
 
@@ -769,3 +785,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+fibonacciSeries = Generator("Fibonacci Series",50,"fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a",fibonacciSeriesFunc)
\ No newline at end of file

From 783f0ce953c3bc844341ca79f6a7bf2f2c9191b0 Mon Sep 17 00:00:00 2001
From: Dark Prince <aniruddhav25@gmail.com>
Date: Sat, 17 Oct 2020 17:42:43 +0530
Subject: [PATCH 11/15] Added Trigonometric Values Generator for Standard
 Angles in Degrees

---
 .../__pycache__/mathgen.cpython-37.pyc        | Bin 19103 -> 29724 bytes
 mathgenerator/mathgen.py                      |  13 +++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/mathgenerator/__pycache__/mathgen.cpython-37.pyc b/mathgenerator/__pycache__/mathgen.cpython-37.pyc
index 418e0a56baea2c94655d34c4eac76225870c1ea8..82bcec4b454f2a62c9cf0b2088c33baea54dfaef 100644
GIT binary patch
delta 13355
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
J5DS7qBmnEkhsXc`

delta 3461
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
W{9Hm@vXc)Kt4zL7%r*H*u^0fiPjV#y

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 1041a55..1306a95 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -714,6 +714,18 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     solution = angle4
     return problem, solution
 
+def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]):
+    angle=random.choice(angles)
+    function=random.choice(functions)
+
+    problem=f"What is {function}({angle})?\n"
+    expression='math.'+function+'(math.radians(angle))'
+    result_fraction_map={0.0:"0",0.5:"1/2",0.71:"1/√2",0.87:"√3/2",1.0:"1",0.58:"1/√3",1.73:"√3"}
+    
+    solution=result_fraction_map[round(eval(expression),2)] if round(eval(expression),2)<=99999 else "∞"  #for handling the ∞ condition
+
+    return problem,solution
+
 # || Class Instances
 
 #Format is:
@@ -769,3 +781,4 @@ matrixMultiplication =  Generator("Multiplication of two matrices", 46, "Multipl
 CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc)
 powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
 fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc)
+basicTrigonometry=Generator("Trigonometric Values",50,"What is sin(X)?","ans",basicTrigonometryFunc)

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 12/15] 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 13/15] 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

From 8c326f827842044c719b7883aec392c58d144660 Mon Sep 17 00:00:00 2001
From: Ritu Raj <68614399+Ritu1611@users.noreply.github.com>
Date: Sat, 17 Oct 2020 22:58:11 +0530
Subject: [PATCH 14/15] Update mathgen.py

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

diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index e7da9a6..2515683 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -715,7 +715,7 @@ def fourthAngleOfQuadriFunc(maxAngle = 180):
     return problem, solution
 def confidenceIntervalFunc():
     n=random.randint(20,40)
-    j=random.randint(1,4)
+    j=random.randint(0,3)
     lst=random.sample(range(200,300),n)
     lst_per=[80 ,90, 95, 99]
     lst_t = [1.282, 1.645, 1.960, 2.576]

From ec10674a7923354579f0d26beb922c1b90ef224f Mon Sep 17 00:00:00 2001
From: Luke Weiler <lukew25073@gmail.com>
Date: Sat, 17 Oct 2020 13:38:09 -0400
Subject: [PATCH 15/15] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 621b2a4..dfc7d41 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,3 @@ problem, solution = mathgen.genById(0)
 | 47 | Cube Root | cuberoot of 711 upto 2 decimal places is: | 8.93 | CubeRoot |
 | 48 | Power Rule Integration | 3x^1 | (3/1)x^2 + c | powerRuleIntegration |
 | 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 94 , 101, 102 = | 63 | fourthAngleOfQuadrilateral |
-| 50 | Surd Comparison | 25^(1/3) _ 37^(1/2)  | < | surdsComparisonGen |