Merge branch 'master' into patch-3

mathgenerator/funcs/__init__.py

@@ -71,4 +71,12 @@ from .multiplyComplexNumbersFunc import *
 from .geomProgrFunc import *
 from .geometricMeanFunc import *
 from .harmonicMeanFunc import *
+from .euclidianNormFunc import *
+from .angleBtwVectorsFunc import *
+from .absoluteDifferenceFunc import *
+from .vectorDotFunc import *
+from .binary2sComplement import *
+from .matrixInversion import *
+from .sectorAreaFunc import*
+from .meanMedianFunc import*
 from .determinantToMatrix22 import *

mathgenerator/funcs/absoluteDifferenceFunc.py

@@ -0,0 +1,10 @@
+from  .__init__ import *
+
+def absoluteDifferenceFunc (maxA = 100, maxB = 100):
+	a = random.randint(-1*maxA, maxA)
+	b = random.randint(-1*maxB, maxB)
+	absDiff = abs(a-b)
+
+	problem = "Absolute difference between numbers " + str(a) + " and " + str(b) + " = "
+	solution = absDiff
+	return problem, solution

mathgenerator/funcs/angleBtwVectorsFunc.py

@@ -0,0 +1,16 @@
+from .euclidianNormFunc import euclidianNormFunc
+import math
+from .__init__ import *
+
+
+def angleBtwVectorsFunc(v1: list, v2: list):
+    sum = 0
+    for i in v1:
+        for j in v2:
+            sum += i * j
+
+    mags = euclidianNormFunc(v1) * euclidianNormFunc(v2)
+    problem = f"angle between the vectors {v1} and {v2} is:"
+    solution = math.acos(sum / mags)
+    # would return the answer in radians
+    return problem, solution

mathgenerator/funcs/binary2sComplement.py

@@ -0,0 +1,26 @@
+from  .__init__ import *
+
+def binary2sComplementFunc(maxDigits=10):
+    digits = random.randint(1, maxDigits)
+    question = ''.join([str(random.randint(0, 1)) for i in range(digits)]).lstrip('0')
+
+    answer = []
+    for i in question:
+        answer.append(str(int(not bool(int(i)))))
+
+    carry = True
+    j = len(answer) - 1
+    while j >= 0:
+        if answer[j] == '0':
+            answer[j] = '1'
+            carry = False
+            break
+        answer[j] = '0'
+        j -= 1
+
+    if j == 0 and carry == True:
+        answer.insert(0, '1')
+
+    problem = "2's complement of " + question + " ="
+    solution = ''.join(answer).lstrip('0')
+    return problem, solution

mathgenerator/funcs/euclidianNormFunc.py

@@ -0,0 +1,7 @@
+from .__init__ import *
+
+
+def euclidianNormFunc(v1: list):
+    problem = f"Euclidian norm or L2 norm of the vector{v1} is:"
+    solution = sqrt(sum([i**2 for i in v1]))
+    return problem, solution

mathgenerator/funcs/matrixInversion.py

@@ -0,0 +1,69 @@
+from .__init__ import *
+import sympy
+
+def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerElementsInInvertedMatrix=False):
+    if OnlyIntegerElementsInInvertedMatrix is True:
+        isItOk = False
+        Mat = list()
+        while (isItOk is False):
+            Mat = list()
+            for i in range(0, SquareMatrixDimension):
+                z = list()
+                for j in range(0, SquareMatrixDimension):
+                    z.append(0)
+                z[i] = 1
+                Mat.append(z)
+            MaxAllowedMatrixElement = math.ceil(
+                pow(MaxMatrixElement, 1 / (SquareMatrixDimension)))
+            randomlist = random.sample(
+                range(0, MaxAllowedMatrixElement + 1), SquareMatrixDimension)
+
+            for i in range(0, SquareMatrixDimension):
+                if i == SquareMatrixDimension - 1:
+                    Mat[0] = [j + (k * randomlist[i])
+                              for j, k in zip(Mat[0], Mat[i])]
+                else:
+                    Mat[i + 1] = [j + (k * randomlist[i])
+                                  for j, k in zip(Mat[i + 1], Mat[i])]
+
+            for i in range(1, SquareMatrixDimension - 1):
+                Mat[i] = [sum(i)
+                          for i in zip(Mat[SquareMatrixDimension - 1], Mat[i])]
+
+            isItOk = True
+            for i in Mat:
+                for j in i:
+                    if j > MaxMatrixElement:
+                        isItOk = False
+                        break
+                if isItOk is False:
+                    break
+
+        random.shuffle(Mat)
+        Mat = sympy.Matrix(Mat)
+        Mat = sympy.Matrix.transpose(Mat)
+        Mat = Mat.tolist()
+        random.shuffle(Mat)
+        Mat = sympy.Matrix(Mat)
+        Mat = sympy.Matrix.transpose(Mat)
+
+    else:
+        randomlist = list(sympy.primerange(0, MaxMatrixElement + 1))
+        plist = random.sample(randomlist, SquareMatrixDimension)
+        randomlist = random.sample(
+            range(0, MaxMatrixElement + 1), SquareMatrixDimension * SquareMatrixDimension)
+        randomlist = list(set(randomlist) - set(plist))
+        n_list = random.sample(
+            randomlist, SquareMatrixDimension * (SquareMatrixDimension - 1))
+        Mat = list()
+        for i in range(0, SquareMatrixDimension):
+            z = list()
+            z.append(plist[i])
+            for j in range(0, SquareMatrixDimension - 1):
+                z.append(n_list[(i * SquareMatrixDimension) + j - i])
+            random.shuffle(z)
+            Mat.append(z)
+        Mat = sympy.Matrix(Mat)
+    problem = 'Inverse of Matrix ' + str(Mat) + ' is:'
+    solution = str(sympy.Matrix.inv(Mat))
+    return problem, solution

mathgenerator/funcs/matrixMultiplicationFunc.py

@@ -40,11 +40,12 @@ def matrixMultiplicationFuncHelper(inp):
     m = len(inp)
     n = len(inp[0])
 
-    string = ""
+    string = "[["
     for i in range(m):
         for j in range(n):
             string += f"{inp[i][j]: 6d}"
-            string += "  "
-        string += "\n"
+            string += ", "if j < n-1 else ""
+        string += "]\n [" if i < m-1 else ""
+    string += "]]"
         
     return string

mathgenerator/funcs/meanMedianFunc.py

@@ -0,0 +1,13 @@
+.__init__ import *
+
+def meanMedianFunc(maxlen = 10):
+    randomlist = random.sample(range(1, 99), maxlen)
+    total = 0
+    for n in randomlist:
+        total = total + n
+    mean = total/10
+    problem = f"Given the series of numbers {randomlist}. find the arithmatic mean and mdian of the series"
+    randomlist.sort()
+    median = (randomlist[4]+randomlist[5])/2
+    solution = f"Arithmetic mean of the series is {mean} and Arithmetic median of this series is {median}"
+    return problem, solution

mathgenerator/funcs/moduloFunc.py

@@ -4,7 +4,7 @@ from .__init__ import *
 def moduloFunc(maxRes=99, maxModulo=99):
     a = random.randint(0, maxModulo)
     b = random.randint(0, min(maxRes, maxModulo))
-    c = a % b
+    c = a % b if b != 0 else 0
     
     problem = str(a) + "%" + str(b) + "="
     solution = str(c)

mathgenerator/funcs/profitLossPercentFunc.py

@@ -12,3 +12,5 @@ def profitLossPercentFunc(maxCP = 1000, maxSP = 1000):
     percent = diff/cP * 100
     problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: "
     solution = percent
+    
+    return problem, solution

mathgenerator/funcs/sectorAreaFunc.py

@@ -0,0 +1,10 @@
+.__init__ import *
+
+def sectorAreaFunc(maxRadius = 49,maxAngle = 359):
+    Radius = random.randint(1, maxRadius)
+    Angle = random.randint(1, maxAngle)
+    problem = f"Given radius, {Radius} and angle, {Angle}. Find the area of the sector."
+    secArea = float((Angle / 360) * math.pi*Radius*Radius)
+    formatted_float = "{:.5f}".format(secArea)
+    solution =  f"Area of sector = {formatted_float}"
+    return problem, solution

mathgenerator/funcs/vectorDotFunc.py

@@ -0,0 +1,11 @@
+from .__init__ import *
+
+
+def vectorDotFunc(minVal=-20, maxVal=20):
+     a = [random.randint(minVal, maxVal) for i in range(3)]
+     b = [random.randint(minVal, maxVal) for i in range(3)]
+     c = a[0] * b[0] +  a[1] * b[1] + a[2] * b[2] 
+
+     problem = str(a) + " . " + str(b) + " = "
+     solution = str(c)
+     return problem, solution

mathgenerator/mathgen.py

@@ -33,127 +33,82 @@ def getGenList():
 
 # Format is:
 # <title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>)
+# Funcs_start - DO NOT REMOVE!
 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)
-gcd = Generator("GCD (Greatest Common Denominator)",
-                10, "GCD of a and b = ", "c", gcdFunc)
-basicAlgebra = Generator(
-    "Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
+lcm = Generator("LCM (Least Common Multiple)", 9,"LCM of a and b = ", "c", lcmFunc)
+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)
-binaryToDecimal = Generator("Binary to Decimal", 15,
-                            "Decimal of a=", "b", BinaryToDecimalFunc)
-fractionDivision = Generator(
-    "Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
-intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",
-                                      17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
-areaOfTriangle = Generator(
-    "Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
-doesTriangleExist = Generator("Triangle exists check", 19,
-                              "Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
-midPointOfTwoPoint = Generator("Midpoint of the two point", 20,
-                               "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
-factoring = Generator("Factoring Quadratic", 21,
-                      "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
-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)
+decimalToBinary = Generator("Decimal to Binary", 14,"Binary of a=", "b", DecimalToBinaryFunc)
+binaryToDecimal = Generator("Binary to Decimal", 15,"Decimal of a=", "b", BinaryToDecimalFunc)
+fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
+intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
+areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
+doesTriangleExist = Generator("Triangle exists check", 19,"Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
+midPointOfTwoPoint = Generator("Midpoint of the two point", 20,"((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
+factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
+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)
+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
+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)
-surfaceAreaCuboidGen = Generator(
-    "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
-surfaceAreaCylinderGen = Generator(
-    "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
-volumeCubeGen = Generator(
-    "Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
-volumeCuboidGen = Generator(
-    "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
-volumeCylinderGen = Generator(
-    "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
-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)
-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)
-permutations = Generator(
-    "Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
-vectorCross = Generator("Cross Product of 2 Vectors",
-                        43, "a X b = ", "c", vectorCrossFunc)
-compareFractions = Generator(
-    "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc)
-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)
-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)
-nthFibonacciNumberGen = Generator("nth Fibonacci number", 61, "What is the nth Fibonacci number", "Fn", nthFibonacciNumberFunc)
-profitLossPercent = Generator("Profit or Loss Percent", 62, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)
-binaryToHex = Generator("Binary to Hexidecimal", 63, "Hexidecimal of a=", "b", binaryToHexFunc)
-complexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + j) (y + j) = ", "xy + xj + yj -1", multiplyComplexNumbersFunc)
-geometricprogression=Generator("Geometric Progression", 65, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc)
-geometricMean=Generator("Geometric Mean of N Numbers",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)
-harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)
-intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 68, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) 
+surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
+surfaceAreaCuboidGen = Generator("Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
+surfaceAreaCylinderGen = Generator("Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
+volumeCubeGen = Generator("Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
+volumeCuboidGen = Generator("Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
+volumeCylinderGen = Generator( "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
+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)
+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)
+permutations = Generator("Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
+vectorCross = Generator("Cross Product of 2 Vectors",43, "a X b = ", "c", vectorCrossFunc)
+compareFractions = Generator("Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc)
+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)
+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", 60, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere)
+volumeSphere = Generator("Volume of Sphere", 61, "Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc)
+nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, "What is the nth Fibonacci number", "Fn", nthFibonacciNumberFunc)
+profitLossPercent = Generator("Profit or Loss Percent", 63, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)
+binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", binaryToHexFunc)
+complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, "(x + j) (y + j) = ", "xy + xj + yj -1", multiplyComplexNumbersFunc)
+geometricprogression=Generator("Geometric Progression", 66, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc)
+geometricMean=Generator("Geometric Mean of N Numbers",67,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)
+harmonicMean=Generator("Harmonic Mean of N Numbers",68,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)
+eucldianNorm=Generator("Euclidian norm or L2 norm of a vector", 69, "Euclidian Norm of a vector V:[v1, v2, ......., vn]", "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc)
+angleBtwVectors=Generator("Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc)
+absoluteDifference=Generator("Absolute difference between two numbers", 71, "Absolute difference betweeen two numbers a and b =", "|a-b|", absoluteDifferenceFunc)
+vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", vectorDotFunc)
+binary2sComplement = Generator("Binary 2's Complement", 73, "2's complement of 11010110 =", "101010", binary2sComplementFunc)
+invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", "A^(-1)", matrixInversion)
+sectorArea=Generator("Area of a Sector", 75,"Area of a sector with radius, r and angle, a ","Area",sectorAreaFunc)
+meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numbers","Mean, Median",meanMedianFunc)
+intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22)