diff --git a/dev-requirements.txt b/dev-requirements.txt index 7b33738..259022d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,5 @@ pytest hypothesis flake8 autopep8 -sympy \ No newline at end of file +sympy +numpy diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 0a261d0..956697a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -20,4 +20,5 @@ class Generator: def getGenList(): - return genList + correctedList = genList[-1:] + genList[:-1] + return correctedList diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index 9d2b25d..01fb780 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def BinaryToDecimalFunc(max_dig=10): @@ -10,3 +11,7 @@ def BinaryToDecimalFunc(max_dig=10): solution = int(problem, 2) return problem, solution + + +binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + BinaryToDecimalFunc) diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 872e105..a2aa043 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DecimalToBinaryFunc(max_dec=99): @@ -9,3 +10,7 @@ def DecimalToBinaryFunc(max_dec=99): solution = str(b) return problem, solution + + +decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", + DecimalToBinaryFunc) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 8f05a4f..720490e 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DiceSumProbFunc(maxDice=3): @@ -24,3 +25,9 @@ def DiceSumProbFunc(maxDice=3): a, b) solution = "{}/{}".format(count, 6**a) return problem, solution + + +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) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index f8cd8a1..1a126b2 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def MidPointOfTwoPointFunc(maxValue=20): @@ -10,3 +11,8 @@ def MidPointOfTwoPointFunc(maxValue=20): problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution + + +midPointOfTwoPoint = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bf9803e..12bf15e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -11,8 +11,8 @@ from .moduloFunc import * from .squareRootFunc import * from .powerRuleDifferentiationFunc import * from .squareFunc import * -from .gcdFunc import * from .lcmFunc import * +from .gcdFunc import * from .basicAlgebraFunc import * from .logFunc import * from .divisionToIntFunc import * @@ -35,10 +35,10 @@ from .regularPolygonAngleFunc import * from .combinationsFunc import * from .factorialFunc import * from .surfaceAreaCube import * -from .volumeCube import * from .surfaceAreaCuboid import * -from .volumeCuboid import * from .surfaceAreaCylinder import * +from .volumeCube import * +from .volumeCuboid import * from .volumeCylinder import * from .surfaceAreaCone import * from .volumeCone import * @@ -84,5 +84,9 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * -from .arithmeticProgressionSumFunc import * from .arithmeticProgressionTermFunc import * +from .arithmeticProgressionSumFunc import * +from .decimalToOctalFunc import * +from .decimalToRomanNumeralsFunc import * +from .degreeToRadFunc import * +from .radianToDegFunc import * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 138c8de..755e049 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): @@ -10,3 +11,9 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): str(a) + " and " + str(b) + " = " solution = absDiff return problem, solution + + +absoluteDifference = Generator( + "Absolute difference between two numbers", 71, + "Absolute difference betweeen two numbers a and b =", "|a-b|", + absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index 927ca38..65ec973 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def angleBtwVectorsFunc(maxEltAmt=20): @@ -19,3 +20,9 @@ def angleBtwVectorsFunc(maxEltAmt=20): solution = 'NaN' # would return the answer in radians return problem, solution + + +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) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index a795a99..c49167c 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -13,3 +14,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): str(a) + " " + str(b) + " " + str(c) + " = " solution = area return problem, solution + + +areaOfTriangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index 517d713..294cb7f 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): @@ -11,3 +12,8 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString solution = n * ((2 * a1) + ((n - 1) * d)) / 2 return problem, solution + + +arithmeticProgressionSum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index 63cca09..e549c18 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): @@ -11,3 +12,8 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString solution = a1 + ((n - 1) * d) return problem, solution + + +arithmeticProgressionTerm = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index d11000d..504ac41 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): @@ -23,3 +24,7 @@ def basicAlgebraFunc(maxVariable=10): problem = f"{a}x + {b} = {c}" solution = x return problem, solution + + +basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 520b8a3..da6d97c 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator # Handles degrees in quadrant one @@ -23,3 +24,7 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], solution = result_fraction_map[round(eval(expression), 2)] if round( eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition return problem, solution + + +basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 01af731..891990d 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): @@ -26,3 +27,8 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') return problem, solution + + +binary2sComplement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 009feea..f748af5 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): @@ -13,3 +14,7 @@ def binaryComplement1sFunc(maxDigits=10): problem = question + "=" solution = answer return problem, solution + + +binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index f06fcfc..12dbe7f 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryToHexFunc(max_dig=10): @@ -9,3 +10,7 @@ def binaryToHexFunc(max_dig=10): solution = hex(int(problem, 2)) return problem, solution + + +binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index f213222..ca42532 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def combinationsFunc(maxlength=20): @@ -17,3 +18,9 @@ def combinationsFunc(maxlength=20): a, b) return problem, solution + + +combinations = Generator( + "Combinations of Objects", 30, + "Combinations available for picking 4 objects at a time from 6 distinct objects =", + " 15", combinationsFunc) diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index 82a0e3b..929c48e 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def commonFactorsFunc(maxVal=100): @@ -22,3 +23,8 @@ def commonFactorsFunc(maxVal=100): problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution + + +commonFactors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index 1c4072a..19ba5c9 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def compareFractionsFunc(maxVal=10): @@ -24,3 +25,9 @@ def compareFractionsFunc(maxVal=10): problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution + + +compareFractions = Generator( + "Compare Fractions", 44, + "Which symbol represents the comparison between a/b and c/d?", ">/=", + compareFractionsFunc) diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 5dc6596..9c9d290 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator <<<<<<< HEAD @@ -21,3 +22,9 @@ def compoundInterestFunc(maxPrinciple=10000, t) + " compounded monthly is = " solution = round(A, 2) return problem, solution + + +compoundInterest = Generator( + "Compound Interest", 78, + "Compound interest for a principle amount of p dollars, r% rate of interest and for a time period of t years with n times compounded annually is = ", + "A dollars", compoundInterestFunc) diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index b631caf..9b13c81 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def confidenceIntervalFunc(): @@ -29,3 +30,8 @@ def confidenceIntervalFunc(): [x for x in lst], lst_per[j]) solution = '({}, {})'.format(mean + standard_error, mean - standard_error) return problem, solution + + +confidenceInterval = Generator("Confidence interval For sample S", 54, + "With X% confidence", "is (A,B)", + confidenceIntervalFunc) diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cubeRootFunc.py index 97b978d..3f18831 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cubeRootFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def cubeRootFunc(minNo=1, maxNo=1000): @@ -8,3 +9,7 @@ def cubeRootFunc(minNo=1, maxNo=1000): problem = "cuberoot of " + str(b) + " upto 2 decimal places is:" solution = str(round(a, 2)) return problem, solution + + +CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", + "b", cubeRootFunc) diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index 1059b1f..cd5db00 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def dataSummaryFunc(number_values=15, minval=5, maxval=50): @@ -26,3 +27,7 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format( mean, var / number_values, (var / number_values)**0.5) return problem, solution + + +dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", + "Mean:a+b+c/3,Std,Var", dataSummaryFunc) diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/deciToHexaFunc.py index 5958dfa..e1ac230 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/deciToHexaFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def deciToHexaFunc(max_dec=1000): @@ -8,3 +9,7 @@ def deciToHexaFunc(max_dec=1000): solution = str(b) return problem, solution + + +decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", + "b", deciToHexaFunc) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py new file mode 100644 index 0000000..4a5c7ab --- /dev/null +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -0,0 +1,12 @@ +from .__init__ import * + + +def decimalToOctalFunc(maxDecimal=4096): + x = random.randint(0, maxDecimal) + problem = "The decimal number " + str(x) + " in Octal is: " + solution = oct(x) + return problem, solution + + +decimalToOctal = Generator("Converts decimal to octal", 84, + "What's the octal representation of 98?", "0o142", decimalToOctalFunc) diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py new file mode 100644 index 0000000..03e369b --- /dev/null +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -0,0 +1,29 @@ +from .__init__ import * + + +def decimalToRomanNumeralsFunc(maxDecimal=4000): + x = random.randint(0, maxDecimal) + problem = "The number " + str(x) + " in Roman Numerals is: " + roman_dict = {1: "I", 5: "V", 10: "X", 50: "L", 100: "C", 500: "D", 1000: "M"} + divisor = 1 + while x >= divisor: + divisor *= 10 + divisor /= 10 + solution = "" + while x: + last_value = int(x / divisor) + if last_value <= 3: + solution += (roman_dict[divisor] * last_value) + elif last_value == 4: + solution += (roman_dict[divisor] * roman_dict[divisor * 5]) + elif 5 <= last_value <= 8: + solution += (roman_dict[divisor * 5] + (roman_dict[divisor] * (last_value - 5))) + elif last_value == 9: + solution += (roman_dict[divisor] + roman_dict[divisor * 10]) + x = math.floor(x % divisor) + divisor /= 10 + return problem, solution + + +decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", + 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py new file mode 100644 index 0000000..7ca4080 --- /dev/null +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -0,0 +1,16 @@ +from .__init__ import * +from numpy import pi + + +def degreeToRadFunc(max_deg=360): + a = random.randint(0, max_deg) + b = (pi * a) / 180 + b = round(b, 2) + + problem = "Angle " + str(a) + " in radians is = " + solution = str(b) + + return problem, solution + + +degreeToRad = Generator("Degrees to Radians", 86, "Angle a in radians is = ", "b", degreeToRadFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index 33b4004..0117389 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def determinantToMatrix22(maxMatrixVal=100): @@ -11,3 +12,8 @@ def determinantToMatrix22(maxMatrixVal=100): problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution + + +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 9fa85c8..e5de6ae 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): @@ -12,3 +13,8 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" return problem, solution + + +distance2Point = Generator("Distance between 2 points", 24, + "Find the distance between (x1,y1) and (x2,y2)", + "sqrt(distanceSquared)", distanceTwoPointsFunc) diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 970b28f..6d90b77 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divideFractionsFunc(maxVal=10): @@ -30,3 +31,7 @@ def divideFractionsFunc(maxVal=10): problem = f"({a}/{b})/({c}/{d})" solution = x return problem, solution + + +fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", + divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index 930e34b..a99d9f7 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionFunc(maxRes=99, maxDivid=99): @@ -9,3 +10,6 @@ def divisionFunc(maxRes=99, maxDivid=99): problem = str(a) + "/" + str(b) + "=" solution = str(c) return problem, solution + + +division = Generator("Division", 3, "a/b=", "c", divisionFunc) diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index fcc62f5..fa0514b 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionToIntFunc(maxA=25, maxB=25): @@ -11,3 +12,6 @@ def divisionToIntFunc(maxA=25, maxB=25): problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution + + +intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index 28c85c5..9b66167 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def euclidianNormFunc(maxEltAmt=20): @@ -6,3 +7,8 @@ def euclidianNormFunc(maxEltAmt=20): problem = f"Euclidian norm or L2 norm of the vector{vec} is:" solution = math.sqrt(sum([i**2 for i in vec])) return problem, solution + + +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) diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index a74f378..1b4cc0c 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def exponentiationFunc(maxBase=20, maxExpo=10): @@ -8,3 +9,7 @@ def exponentiationFunc(maxBase=20, maxExpo=10): problem = f"{base}^{expo} =" solution = str(base**expo) return problem, solution + + +exponentiation = Generator("Exponentiation", 53, "a^b = ", "c", + exponentiationFunc) diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index 71dc3a2..463d936 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factorialFunc(maxInput=6): @@ -13,3 +14,6 @@ def factorialFunc(maxInput=6): n -= 1 solution = str(b) return problem, solution + + +factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc) diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index 1cb43c0..a0ef82e 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factoringFunc(range_x1=10, range_x2=10): @@ -27,3 +28,7 @@ def factoringFunc(range_x1=10, range_x2=10): x2 = intParser(x2) solution = f"(x{x1})(x{x2})" return problem, solution + + +factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", + "(x-x1)(x-x2)", factoringFunc) diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index 60391cb..117befd 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fibonacciSeriesFunc(minNo=1): @@ -19,3 +20,8 @@ def fibonacciSeriesFunc(minNo=1): problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution + + +fibonacciSeries = Generator( + "Fibonacci Series", 56, "fibonacci series of first a numbers", + "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index 59a05c4..871b725 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fourthAngleOfQuadriFunc(maxAngle=180): @@ -12,3 +13,9 @@ def fourthAngleOfQuadriFunc(maxAngle=180): problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution + + +fourthAngleOfQuadrilateral = Generator( + "Fourth Angle of Quadrilateral", 49, + "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", + fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcdFunc.py index 505c7fb..4f271d1 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcdFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def gcdFunc(maxVal=20): @@ -10,3 +11,7 @@ def gcdFunc(maxVal=20): problem = f"GCD of {a} and {b} = " solution = str(x) return problem, solution + + +gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", + "c", gcdFunc) diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 7c80a7e..0683c3c 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geomProgrFunc(number_values=6, @@ -21,3 +22,9 @@ def geomProgrFunc(number_values=6, solution = "The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format( a, r, n_term, value_nth_term, sum_term, sum_till_nth_term) return problem, solution + + +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) diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 0980979..ad80594 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geometricMeanFunc(maxValue=100, maxNum=4): @@ -25,3 +26,8 @@ def geometricMeanFunc(maxValue=100, maxNum=4): problem = f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" return problem, solution + + +geometricMean = Generator("Geometric Mean of N Numbers", 67, + "Geometric mean of n numbers A1 , A2 , ... , An = ", + "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 8aefb41..5febc7e 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def harmonicMeanFunc(maxValue=100, maxNum=4): @@ -26,3 +27,9 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): problem = f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}" return problem, solution + + +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) diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 047fb0c..aaab950 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def hcfFunc(maxVal=20): @@ -10,3 +11,7 @@ def hcfFunc(maxVal=20): problem = f"HCF of {a} and {b} = " solution = str(x) return problem, solution + + +hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", + hcfFunc) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index eda508e..4697201 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def intersectionOfTwoLinesFunc(minM=-10, @@ -64,3 +65,9 @@ def intersectionOfTwoLinesFunc(minM=-10, solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" return problem, solution + + +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) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index 13c7240..19a4240 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): @@ -18,3 +19,8 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution solution = "No" return problem, solution + + +doesTriangleExist = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index 32e1868..ef57c2c 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def lcmFunc(maxVal=20): @@ -15,3 +16,7 @@ def lcmFunc(maxVal=20): solution = str(d) return problem, solution + + +lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", + lcmFunc) diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index e2eeb26..62dc081 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def linearEquationsFunc(n=2, varRange=20, coeffRange=20): @@ -27,3 +28,7 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): problem = "\n".join(problem) return problem, solution + + +linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", + "x=-20 & y=12", linearEquationsFunc) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 6fc651b..dcc7c05 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def logFunc(maxBase=3, maxVal=8): @@ -10,3 +11,6 @@ def logFunc(maxBase=3, maxVal=8): solution = str(a) return problem, solution + + +log = Generator("Logarithm", 12, "log2(8)", "3", logFunc) diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 72c01ca..4eb2787 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator import sympy @@ -76,3 +77,7 @@ def matrixInversion(SquareMatrixDimension=3, problem = 'Inverse of Matrix ' + str(Mat) + ' is:' solution = str(sympy.Matrix.inv(Mat)) return problem, solution + + +invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index 3b1f20b..9706782 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def matrixMultiplicationFunc(maxVal=100, max_dim=10): @@ -51,3 +52,8 @@ def matrixMultiplicationFuncHelper(inp): string += "]]" return string + + +matrixMultiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 4b17846..cd20310 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def meanMedianFunc(maxlen=10): @@ -12,3 +13,8 @@ def meanMedianFunc(maxlen=10): 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 + + +meanMedian = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 2a447c4..3d97d52 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def moduloFunc(maxRes=99, maxModulo=99): @@ -9,3 +10,6 @@ def moduloFunc(maxRes=99, maxModulo=99): problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution + + +moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 8ad25f6..1d1d339 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): @@ -9,3 +10,7 @@ def multiplicationFunc(maxRes=99, maxMulti=99): problem = str(a) + "*" + str(b) + "=" solution = str(c) return problem, solution + + +multiplication = Generator("Multiplication", 2, "a*b=", "c", + multiplicationFunc) diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index f1842c2..8f825d0 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, @@ -10,3 +11,8 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, problem = f"{num1} * {num2} = " solution = num1 * num2 return problem, solution + + +complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 1ec38bb..39857c4 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyFractionsFunc(maxVal=10): @@ -30,3 +31,8 @@ def multiplyFractionsFunc(maxVal=10): problem = f"({a}/{b})*({c}/{d})" solution = x return problem, solution + + +fractionMultiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index 7808afe..1409a5b 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): @@ -11,3 +12,9 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = " solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]" return problem, solution + + +intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", + 17, "k * [[a,b],[c,d]]=", + "[[k*a,k*b],[k*c,k*d]]", + multiplyIntToMatrix22) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index b7475ee..1983a0d 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def nthFibonacciNumberFunc(maxN=100): @@ -8,3 +9,8 @@ def nthFibonacciNumberFunc(maxN=100): ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / (math.sqrt(5))) solution = f"{ans}" return problem, solution + + +nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index f064f2a..36d72be 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def percentageFunc(maxValue=99, maxpercentage=99): @@ -9,3 +10,7 @@ def percentageFunc(maxValue=99, maxpercentage=99): formatted_float = "{:.2f}".format(percentage) solution = f"Required percentage = {formatted_float}%" return problem, solution + + +percentage = Generator("Percentage of a number", 80, "What is a% of b?", + "percentage", percentageFunc) diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index c62841f..f4764c0 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def permutationFunc(maxlength=20): @@ -9,3 +10,9 @@ def permutationFunc(maxlength=20): problem = "Number of Permutations from {} objects picked {} at a time = ".format( a, b) return problem, solution + + +permutations = Generator( + "Permutations", 42, + "Total permutations of 4 objects at a time from 10 objects is", "5040", + permutationFunc) diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index a14bd90..6e41170 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -16,3 +17,8 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): problem += str(coefficient) + "x^" + str(exponent) solution += str(coefficient * exponent) + "x^" + str(exponent - 1) return problem, solution + + +powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index fb1f62d..4b5684b 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -19,3 +20,7 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + c" return problem, solution + + +powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 852821c..6eed7a9 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def primeFactorsFunc(minVal=1, maxVal=200): @@ -20,3 +21,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution + + +primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index da99f94..c9d1d4d 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def profitLossPercentFunc(maxCP=1000, maxSP=1000): @@ -14,3 +15,9 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): solution = percent return problem, solution + + +profitLossPercent = Generator( + "Profit or Loss Percent", 63, + "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", + profitLossPercentFunc) diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 17bcd82..26dc744 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def pythagoreanTheoremFunc(maxLength=20): @@ -9,3 +10,9 @@ def pythagoreanTheoremFunc(maxLength=20): problem = f"The hypotenuse of a right triangle given the other two lengths {a} and {b} = " solution = f"{c:.0f}" if c.is_integer() else f"{c:.2f}" return problem, solution + + +pythagoreanTheorem = Generator( + "Pythagorean Theorem", 25, + "The hypotenuse of a right triangle given the other two lengths a and b = ", + "hypotenuse", pythagoreanTheoremFunc) diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 7f784fc..021faff 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def quadraticEquation(maxVal=100): @@ -13,3 +14,9 @@ def quadraticEquation(maxVal=100): [round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)]) return problem, solution + + +quadraticEquationSolve = Generator( + "Quadratic Equation", 50, + "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", + quadraticEquation) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py new file mode 100644 index 0000000..b9c7b56 --- /dev/null +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -0,0 +1,16 @@ +from .__init__ import * +from numpy import pi + + +def radianToDegFunc(max_rad=pi): + a = random.randint(0, max_rad) + b = (180 * a) / pi + b = round(b, 2) + + problem = "Angle " + str(a) + " in degrees is = " + solution = str(b) + + return problem, solution + + +radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index 5275bef..a264c5a 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): @@ -8,3 +9,9 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution + + +angleRegularPolygon = Generator( + "Angle of a Regular Polygon", 29, + "Find the angle of a regular polygon with 6 sides", "120", + regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index c2ab0bf..db9dc7e 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sectorAreaFunc(maxRadius=49, maxAngle=359): @@ -9,3 +10,8 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution + + +sectorArea = Generator("Area of a Sector", 75, + "Area of a sector with radius, r and angle, a ", "Area", + sectorAreaFunc) diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index 30ca938..23f1afc 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): @@ -13,3 +14,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): c) + " years is = " solution = round(d, 2) return problem, solution + + +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) diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 1d159dc..dbe284c 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareFunc(maxSquareNum=20): @@ -8,3 +9,6 @@ def squareFunc(maxSquareNum=20): problem = str(a) + "^2" + "=" solution = str(b) return problem, solution + + +square = Generator("Square", 8, "a^2", "b", squareFunc) diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index e5d2418..6cc410a 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareRootFunc(minNo=1, maxNo=12): @@ -8,3 +9,6 @@ def squareRootFunc(minNo=1, maxNo=12): problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution + + +squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index a50537e..9298037 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def subtractionFunc(maxMinuend=99, maxDiff=99): @@ -9,3 +10,6 @@ def subtractionFunc(maxMinuend=99, maxDiff=99): problem = str(a) + "-" + str(b) + "=" solution = str(c) return problem, solution + + +subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 8338698..c0a9d7b 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sumOfAnglesOfPolygonFunc(maxSides=12): @@ -8,3 +9,8 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution + + +sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, + "Sum of angles of polygon with n sides = ", + "sum", sumOfAnglesOfPolygonFunc) diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index e005d3f..278c3c4 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surdsComparisonFunc(maxValue=100, maxRoot=10): @@ -15,3 +16,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): elif first < second: solution = "<" return problem, solution + + +surdsComparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", ">/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index 53799aa..8497460 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): @@ -11,3 +12,9 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaConeGen = Generator( + "Surface Area of cone", 38, + "Surface area of cone with height = a units and radius = b units is", + "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surfaceAreaCube.py index 9f9d07f..42b07f4 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surfaceAreaCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): @@ -7,3 +8,8 @@ def surfaceAreaCube(maxSide=20, unit='m'): ans = 6 * a * a solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index 95fee71..0889441 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): @@ -10,3 +11,9 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCuboidGen = Generator( + "Surface Area of Cuboid", 33, + "Surface area of cuboid with sides = a units, b units, c units is", + "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index eacc0be..3a7a1e8 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(2 * math.pi * a * b + 2 * math.pi * b * b) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCylinderGen = Generator( + "Surface Area of Cylinder", 34, + "Surface area of cylinder with height = a units and radius = b units is", + "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 6b9110d..86a9456 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): @@ -8,3 +9,9 @@ def surfaceAreaSphere(maxSide=20, unit='m'): ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaSphereGen = Generator( + "Surface Area of Sphere", 60, + "Surface area of sphere with radius = a units is", "d units^2", + surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index ef63c73..ef00b0e 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): @@ -45,3 +46,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): solution = f"x = {x}, y = {y}" return problem, solution # Add random (non-zero) multiple of equations to each other + + +systemOfEquations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 5268ceb..f5f7afb 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): @@ -9,3 +10,8 @@ def thirdAngleOfTriangleFunc(maxAngle=89): problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution + + +thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 7506283..318beec 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): @@ -12,3 +13,7 @@ def vectorCrossFunc(minVal=-20, maxVal=20): problem = str(a) + " X " + str(b) + " = " solution = str(c) return problem, solution + + +vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 011beb3..0ca2609 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): @@ -9,3 +10,7 @@ def vectorDotFunc(minVal=-20, maxVal=20): problem = str(a) + " . " + str(b) + " = " solution = str(c) return problem, solution + + +vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index c237bca..85dbd55 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a * (1 / 3)) solution = f"{ans} {unit}^3" return problem, solution + + +volumeConeGen = Generator( + "Volume of cone", 39, + "Volume of cone with height = a units and radius = b units is", + "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index 6a52da4..ff1ac76 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): @@ -8,3 +9,8 @@ def volumeCube(maxSide=20, unit='m'): ans = a * a * a solution = f"{ans} {unit}^3" return problem, solution + + +volumeCubeGen = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index b0a2490..d25d753 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): @@ -10,3 +11,9 @@ def volumeCuboid(maxSide=20, unit='m'): ans = a * b * c solution = f"{ans} {unit}^3" return problem, solution + + +volumeCuboidGen = Generator( + "Volume of Cuboid", 36, + "Volume of cuboid with sides = a units, b units, c units is", "d units^3", + volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index 38dfd64..e021aab 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" return problem, solution + + +volumeCylinderGen = Generator( + "Volume of cylinder", 37, + "Volume of cylinder with height = a units and radius = b units is", + "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 1f94c7f..038607e 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): @@ -8,3 +9,8 @@ def volumeSphereFunc(maxRadius=100): ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution + + +volumeSphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 14597e5..389f8dd 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -33,12 +33,9 @@ def genById(id): return (generator()) -# -# def getGenList(): -# return(genList) - # Format is: #