Fix lint errors, adding a formatter

Makefile

@@ -1,7 +1,11 @@
-FLAKE_FLAGS = --ignore=E501,F401,F403,F405
+IGNORE_ERRORS = E501,F401,F403,F405
+PKG = mathgenerator
+
+format:
+	python -m autopep8 --ignore=$(IGNORE_ERRORS) -i $(PKG)/*
 
 lint:
-	python -m flake8 $(FLAKE_FLAGS)
+	python -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG)
 
 test:
 	python -m pytest --verbose -s tests

dev-requirements.txt

@@ -1,3 +1,4 @@
 pytest
 hypothesis
 flake8
+autopep8

mathgenerator/mathgen.py

@@ -36,7 +36,8 @@ def getGenList():
 
 def additionFunc(maxSum=99, maxAddend=50):
     a = random.randint(0, maxAddend)
-    b = random.randint(0, min((maxSum - a), maxAddend))  # The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
+    # The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
+    b = random.randint(0, min((maxSum - a), maxAddend))
     c = a + b
     problem = str(a) + "+" + str(b) + "="
     solution = str(c)
@@ -248,7 +249,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20):
     c = random.randint(1, maxC)
     s = (a + b + c) / 2
     area = (s * (s - a) * (s - b) * (s - c)) ** 0.5
-    problem = "Area of triangle with side lengths: " + str(a) + " " + str(b) + " " + str(c) + " = "
+    problem = "Area of triangle with side lengths: " + \
+        str(a) + " " + str(b) + " " + str(c) + " = "
     solution = area
     return problem, solution
 
@@ -259,7 +261,8 @@ def isTriangleValidFunc(maxSideLength=50):
     sideC = random.randint(1, maxSideLength)
     sideSums = [sideA + sideB, sideB + sideC, sideC + sideA]
     sides = [sideC, sideA, sideB]
-    exists = True & (sides[0] < sideSums[0]) & (sides[1] < sideSums[1]) & (sides[2] < sideSums[2])
+    exists = True & (sides[0] < sideSums[0]) & (
+        sides[1] < sideSums[1]) & (sides[2] < sideSums[2])
     problem = f"Does triangle with sides {sideA}, {sideB} and {sideC} exist?"
     if exists:
         solution = "Yes"
@@ -352,7 +355,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10):
         # No redundant 1s
         y_coeff = abs(coeffs[1]) if abs(coeffs[1]) != 1 else ''
         # Don't include if 0, unless x is also 0 (probably never happens)
-        y_str = f'{y_coeff}y' if coeffs[1] != 0 else ('' if x_str != '' else '0')
+        y_str = f'{y_coeff}y' if coeffs[1] != 0 else (
+            '' if x_str != '' else '0')
         return f'{x_str}{op}{y_str} = {coeffs[2]}'
 
     problem = f"{coeffToFuncString(new_c1)}, {coeffToFuncString(new_c2)}"
@@ -391,7 +395,8 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20):
     soln = [random.randint(-varRange, varRange) for i in range(n)]
 
     problem = list()
-    solution = ", ".join(["{} = {}".format(vars[i], soln[i]) for i in range(n)])
+    solution = ", ".join(["{} = {}".format(vars[i], soln[i])
+                          for i in range(n)])
     for _ in range(n):
         coeff = [random.randint(-coeffRange, coeffRange) for i in range(n)]
         res = sum([coeff[i] * soln[i] for i in range(n)])
@@ -469,7 +474,8 @@ def combinationsFunc(maxlength=20):
     b = random.randint(0, 9)
 
     solution = int(factorial(a) / (factorial(b) * factorial(a - b)))
-    problem = "Number of combinations from {} objects picked {} at a time ".format(a, b)
+    problem = "Number of combinations from {} objects picked {} at a time ".format(
+        a, b)
 
     return problem, solution
 
@@ -615,8 +621,10 @@ def intersectionOfTwoLinesFunc(
             x = f"{x.numerator}/{x.denominator}"
         return x
 
-    m1 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
+    m1 = (random.randint(minM, maxM), random.randint(
-    m2 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
+        minDenominator, maxDenominator))
+    m2 = (random.randint(minM, maxM), random.randint(
+        minDenominator, maxDenominator))
     b1 = random.randint(minB, maxB)
     b2 = random.randint(minB, maxB)
     equation1 = generateEquationString(m1, b1)
@@ -642,7 +650,8 @@ def permutationFunc(maxlength=20):
     a = random.randint(10, maxlength)
     b = random.randint(0, 9)
     solution = int(math.factorial(a) / (math.factorial(a - b)))
-    problem = "Number of Permutations from {} objects picked {} at a time =  ".format(a, b)
+    problem = "Number of Permutations from {} objects picked {} at a time =  ".format(
+        a, b)
     return problem, solution
 
 
@@ -685,7 +694,8 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10):
     b = random.randint(1, maxRate)
     c = random.randint(1, maxTime)
     d = (a * b * c) / 100
-    problem = "Simple interest for a principle amount of " + str(a) + " dollars, " + str(b) + "% rate of interest and for a time period of " + str(c) + " years is = "
+    problem = "Simple interest for a principle amount of " + str(a) + " dollars, " + str(
+        b) + "% rate of interest and for a time period of " + str(c) + " years is = "
     solution = round(d, 2)
     return problem, solution
 
@@ -718,7 +728,8 @@ def matrixMultiplicationFunc(maxVal=100):
             for t in range(n):
                 temp += a[r][t] * b[t][c]
             res[r].append(temp)
-    problem = f"Multiply \n{a_string}\n and \n\n{b_string}"  # consider using a, b instead of a_string, b_string if the problem doesn't look right
+    # consider using a, b instead of a_string, b_string if the problem doesn't look right
+    problem = f"Multiply \n{a_string}\n and \n\n{b_string}"
     solution = matrixMultiplicationFuncHelper(res)
     return problem, solution
 
@@ -754,7 +765,8 @@ 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) + ")x^" + str(exponent + 1)
     solution = solution + " + c"
     return problem, solution
 
@@ -773,15 +785,18 @@ def fourthAngleOfQuadriFunc(maxAngle=180):
 def quadraticEquation(maxVal=100):
     a = random.randint(1, maxVal)
     c = random.randint(1, maxVal)
-    b = random.randint(round(math.sqrt(4 * a * c)) + 1, round(math.sqrt(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 {}x^2+{}x+{}=0".format(a, b, c)
 
     D = math.sqrt(b * b - 4 * a * c)
 
-    solution = str([round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)])
+    solution = str([round((-b + D) / (2 * a), 2),
+                    round((-b - D) / (2 * a), 2)])
     return problem, solution
 
+
 def hcfFunc(maxVal=20):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
@@ -792,6 +807,7 @@ def hcfFunc(maxVal=20):
     solution = str(x)
     return problem, solution
 
+
 def DiceSumProbFunc(maxDice=3):
     a = random.randint(1, maxDice)
     b = random.randint(a, 6 * a)
@@ -809,10 +825,12 @@ def DiceSumProbFunc(maxDice=3):
                 for k in [1, 2, 3, 4, 5, 6]:
                     if i + j + k == b:
                         count = count + 1
-    problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(a,b)
+    problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(
+        a, b)
     solution = "{}/{}".format(count, 6**a)
     return problem, solution
 
+
 def exponentiationFunc(maxBase=20, maxExpo=10):
     base = random.randint(1, maxBase)
     expo = random.randint(1, maxExpo)
@@ -820,6 +838,7 @@ def exponentiationFunc(maxBase = 20,maxExpo = 10):
     solution = str(base ** expo)
     return problem, solution
 
+
 def confidenceIntervalFunc():
     n = random.randint(20, 40)
     j = random.randint(0, 3)
@@ -837,10 +856,12 @@ def confidenceIntervalFunc():
         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])
+    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
 
+
 def surdsComparisonFunc(maxValue=100, maxRoot=10):
     radicand1, radicand2 = tuple(random.sample(range(1, maxValue), 2))
     degree1, degree2 = tuple(random.sample(range(1, maxRoot), 2))
@@ -854,34 +875,41 @@ def surdsComparisonFunc(maxValue = 100, maxRoot = 10):
         solution = "<"
     return problem, solution
 
+
 def fibonacciSeriesFunc(minNo=1):
     n = random.randint(minNo, 20)
+
     def createFibList(n):
-        l=[]
+        fibList = []
         for i in range(n):
             if i < 2:
-                l.append(i)
+                fibList.append(i)
             else:
-                val = l[i-1]+l[i-2]
+                val = fibList[i - 1] + fibList[i - 2]
-                l.append(val)
+                fibList.append(val)
-        return l
+        return fibList
     fibList = createFibList(n)
     problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?"
     solution = fibList
     return problem, solution
 
-def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one
+
+# Handles degrees in quadrant one
+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})?"
     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"}
+    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
+    solution = result_fraction_map[round(eval(expression), 2)] if round(
+        eval(expression), 2) <= 99999 else "∞"  # for handling the ∞ condition
 
     return problem, solution
 
+
 def sumOfAnglesOfPolygonFunc(maxSides=12):
     side = random.randint(3, maxSides)
     sum = (side - 2) * 180
@@ -889,6 +917,7 @@ def sumOfAnglesOfPolygonFunc(maxSides = 12):
     solution = sum
     return problem, solution
 
+
 def dataSummaryFunc(number_values=15, minval=5, maxval=50):
     random_list = []
     for i in range(number_values):
@@ -903,10 +932,13 @@ def dataSummaryFunc(number_values=15,minval=5,maxval=50):
     print(mean)
     print(var / number_values)
     print((var / number_values)**0.5)
-    problem="Find the mean,standard deviation and variance for the data"+str(random_list)
+    problem = "Find the mean,standard deviation and variance for the data" + \
-    solution="The Mean is {} , Standard Deviation is {}, Variance is {}".format(mean,var/number_values,(var/number_values)**0.5)
+        str(random_list)
+    solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format(
+        mean, var / number_values, (var / number_values)**0.5)
     return problem, solution
 
+
 def surfaceAreaSphere(maxSide=20, unit='m'):
     r = random.randint(1, maxSide)
 
@@ -914,6 +946,8 @@ def surfaceAreaSphere(maxSide = 20, unit = 'm'):
     ans = 4 * math.pi * r * r
     solution = f"{ans} {unit}^2"
     return problem, solution
+
+
 def volumeSphereFunc(maxRadius=100):
     r = random.randint(1, maxRadius)
     problem = f"Volume of sphere with radius {r} m = "
@@ -922,67 +956,122 @@ def volumeSphereFunc(maxRadius = 100):
     return problem, solution
 # || Class Instances
 
+
 # Format is:
 # <title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>)
 addition = Generator("Addition", 0, "a+b=", "c", additionFunc)
 subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc)
-multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc)
+multiplication = Generator(
+    "Multiplication", 2, "a*b=", "c", multiplicationFunc)
 division = Generator("Division", 3, "a/b=", "c", divisionFunc)
-binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", binaryComplement1sFunc)
+binaryComplement1s = Generator(
+    "Binary Complement 1s", 4, "1010=", "0101", binaryComplement1sFunc)
 moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc)
 squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc)
-powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", "(n*m)x^(m-1)", powerRuleDifferentiationFunc)
+powerRuleDifferentiation = Generator(
+    "Power Rule Differentiation", 7, "nx^m=", "(n*m)x^(m-1)", powerRuleDifferentiationFunc)
 square = Generator("Square", 8, "a^2", "b", squareFunc)
-lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", lcmFunc)
+lcm = Generator("LCM (Least Common Multiple)", 9,
-gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", "c", gcdFunc)
+                "LCM of a and b = ", "c", lcmFunc)
-basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
+gcd = Generator("GCD (Greatest Common Denominator)",
+                10, "GCD of a and b = ", "c", gcdFunc)
+basicAlgebra = Generator(
+    "Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
 log = Generator("Logarithm", 12, "log2(8)", "3", logFunc)
 intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc)
-decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", DecimalToBinaryFunc)
+decimalToBinary = Generator("Decimal to Binary", 14,
-binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", BinaryToDecimalFunc)
+                            "Binary of a=", "b", DecimalToBinaryFunc)
-fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
+binaryToDecimal = Generator("Binary to Decimal", 15,
-intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", 17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
+                            "Decimal of a=", "b", BinaryToDecimalFunc)
-areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
+fractionDivision = Generator(
-doesTriangleExist = Generator("Triangle exists check", 19, "Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
+    "Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
-midPointOfTwoPoint = Generator("Midpoint of the two point", 20, "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
+intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",
-factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
+                                      17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
-thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc)
+areaOfTriangle = Generator(
-systemOfEquations = Generator("Solve a System of Equations in R^2", 23, "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3",systemOfEquationsFunc)
+    "Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
-distance2Point = Generator("Distance between 2 points", 24, "Find the distance between (x1,y1) and (x2,y2)", "sqrt(distanceSquared)", distanceTwoPointsFunc)
+doesTriangleExist = Generator("Triangle exists check", 19,
-pythagoreanTheorem = Generator("Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc)
+                              "Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
-linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", "x=-20 & y=12", linearEquationsFunc)  # This has multiple variables whereas #23 has only x and y
+midPointOfTwoPoint = Generator("Midpoint of the two point", 20,
-primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", "[b, c, d, ...]", primeFactorsFunc)
+                               "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
-fractionMultiplication = Generator("Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc)
+factoring = Generator("Factoring Quadratic", 21,
-angleRegularPolygon = Generator("Angle of a Regular Polygon", 29, "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc)
+                      "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
-combinations = Generator("Combinations of Objects", 30, "Combinations available for picking 4 objects at a time from 6 distinct objects =", " 15", combinationsFunc)
+thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22,
+                                 "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc)
+systemOfEquations = Generator("Solve a System of Equations in R^2", 23,
+                              "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", systemOfEquationsFunc)
+distance2Point = Generator("Distance between 2 points", 24,
+                           "Find the distance between (x1,y1) and (x2,y2)", "sqrt(distanceSquared)", distanceTwoPointsFunc)
+pythagoreanTheorem = Generator(
+    "Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc)
+# This has multiple variables whereas #23 has only x and y
+linearEquations = Generator(
+    "Linear Equations", 26, "2x+5y=20 & 3x+6y=12", "x=-20 & y=12", linearEquationsFunc)
+primeFactors = Generator("Prime Factorisation", 27,
+                         "Prime Factors of a =", "[b, c, d, ...]", primeFactorsFunc)
+fractionMultiplication = Generator(
+    "Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc)
+angleRegularPolygon = Generator("Angle of a Regular Polygon", 29,
+                                "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc)
+combinations = Generator("Combinations of Objects", 30,
+                         "Combinations available for picking 4 objects at a time from 6 distinct objects =", " 15", combinationsFunc)
 factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc)
-surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
+surfaceAreaCubeGen = Generator(
-surfaceAreaCuboidGen = Generator("Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
+    "Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
-surfaceAreaCylinderGen = Generator("Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
+surfaceAreaCuboidGen = Generator(
-volumeCubeGen = Generator("Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
+    "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
-volumeCuboidGen = Generator("Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
+surfaceAreaCylinderGen = Generator(
-volumeCylinderGen = Generator("Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
+    "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
-surfaceAreaConeGen = Generator("Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone)
+volumeCubeGen = Generator(
-volumeConeGen = Generator("Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone)
+    "Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
-commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ", "[c, d, ...]", commonFactorsFunc)
+volumeCuboidGen = Generator(
-intersectionOfTwoLines = Generator("Intersection of Two Lines", 41, "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
+    "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
-permutations = Generator("Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
+volumeCylinderGen = Generator(
-vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", vectorCrossFunc)
+    "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
-compareFractions = Generator("Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc)
+surfaceAreaConeGen = Generator(
-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)
+    "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone)
-matrixMultiplication = Generator("Multiplication of two matrices", 46, "Multiply two matrices A and B", "C", matrixMultiplicationFunc)
+volumeConeGen = Generator(
-CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", "b", cubeRootFunc)
+    "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone)
-powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
+commonFactors = Generator(
-fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral", 49, "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc)
+    "Common Factors", 40, "Common Factors of {a} and {b} = ", "[c, d, ...]", commonFactorsFunc)
-quadraticEquationSolve = Generator("Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)
+intersectionOfTwoLines = Generator("Intersection of Two Lines", 41,
-hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", hcfFunc)
+                                   "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
-diceSumProbability=Generator("Probability of a certain sum appearing on faces of dice", 52,"If n dices are rolled then probabilty of getting sum of x is =","z", DiceSumProbFunc)
+permutations = Generator(
-exponentiation = Generator("Exponentiation", 53,"a^b = ","c",exponentiationFunc)
+    "Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
-confidenceInterval = Generator("Confidence interval For sample S", 54, "With X% confidence", "is (A,B)", confidenceIntervalFunc)
+vectorCross = Generator("Cross Product of 2 Vectors",
-surdsComparison = Generator("Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", surdsComparisonFunc)
+                        43, "a X b = ", "c", vectorCrossFunc)
-fibonacciSeries = Generator("Fibonacci Series",56,"fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a",fibonacciSeriesFunc)
+compareFractions = Generator(
-basicTrigonometry=Generator("Trigonometric Values",57,"What is sin(X)?","ans",basicTrigonometryFunc)
+    "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc)
-sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, "Sum of angles of polygon with n sides = ", "sum", sumOfAnglesOfPolygonFunc)
+simpleInterest = Generator(
-dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", "Mean:a+b+c/3,Std,Var", dataSummaryFunc)
+    "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)
-surfaceAreaSphereGen = Generator("Surface Area of Sphere", 59, "Surface area of sphere with radius = a units is","d units^2", surfaceAreaSphere)
+matrixMultiplication = Generator("Multiplication of two matrices",
-volumeSphere=Generator("Volume of Sphere",60,"Volume of sphere with radius r m = ","(4*pi/3)*r*r*r",volumeSphereFunc)
+                                 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)
+fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral", 49,
+                                       "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc)
+quadraticEquationSolve = Generator(
+    "Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)
+hcf = Generator("HCF (Highest Common Factor)", 51,
+                "HCF of a and b = ", "c", hcfFunc)
+diceSumProbability = Generator("Probability of a certain sum appearing on faces of dice",
+                               52, "If n dices are rolled then probabilty of getting sum of x is =", "z", DiceSumProbFunc)
+exponentiation = Generator(
+    "Exponentiation", 53, "a^b = ", "c", exponentiationFunc)
+confidenceInterval = Generator("Confidence interval For sample S",
+                               54, "With X% confidence", "is (A,B)", confidenceIntervalFunc)
+surdsComparison = Generator(
+    "Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", surdsComparisonFunc)
+fibonacciSeries = Generator("Fibonacci Series", 56, "fibonacci series of first a numbers",
+                            "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc)
+basicTrigonometry = Generator(
+    "Trigonometric Values", 57, "What is sin(X)?", "ans", basicTrigonometryFunc)
+sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58,
+                                 "Sum of angles of polygon with n sides = ", "sum", sumOfAnglesOfPolygonFunc)
+dataSummary = Generator("Mean,Standard Deviation,Variance",
+                        59, "a,b,c", "Mean:a+b+c/3,Std,Var", dataSummaryFunc)
+surfaceAreaSphereGen = Generator(
+    "Surface Area of Sphere", 59, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere)
+volumeSphere = Generator("Volume of Sphere", 60,
+                         "Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc)