From 131cf5badf29f4aafbadabf7254e147c89adda03 Mon Sep 17 00:00:00 2001 From: Anshita Date: Sat, 17 Oct 2020 18:56:41 +0530 Subject: [PATCH 01/24] AP series term/sum problem --- mathgenerator/mathgen.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 1041a55..cf87780 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -714,6 +714,24 @@ def fourthAngleOfQuadriFunc(maxAngle = 180): solution = angle4 return problem, solution +def arithmeticProgressionFunc (maxd = 100, maxa = 100, maxn = 100): + sumOrTerm = random.randint (0,1) + d = random.randint (-1 * maxd, maxd) + a1 = random.randint (-1 * maxa, maxa) + a2 = a1 + d + a3 = a2 + d + n = random.randint (4, maxn) + apString = str(a1) +'\t' + str(a2) +'\t' + str(a3) + '\t...' + if (sumOrTerm == 0) : #sum + problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString + solution = n * ((2*a1) + ((n-1)*d))/2 + else : #term + problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString + solution = a1 + ((n-1)*d) + return problem, solution + + + # || Class Instances #Format is: @@ -769,3 +787,4 @@ matrixMultiplication = Generator("Multiplication of two matrices", 46, "Multipl CubeRoot = Generator("Cube Root",47,"Cuberoot of a upto 2 decimal places is","b",cubeRootFunc) powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc) fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral",49,"Fourth angle of Quadrilateral with angles a,b,c =","angle4",fourthAngleOfQuadriFunc) +arithmeticProgression = Generator ("Arithmetic Progression", 50, "n-Sum or n-Term of an Arithmetic Progression", "Sum or term", arithmeticProgressionFunc) From 53071a276d70e2c2a14184066f78646598cea426 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 18:08:20 +0400 Subject: [PATCH 02/24] =?UTF-8?q?=F0=9F=94=A7=20fixed=20some=20stuff=20wit?= =?UTF-8?q?h=20gen#69F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 154 +++++++++++---------- makeReadme.py | 5 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 19 ++- mathgenerator/funcs/euclidianNormFunc.py | 7 +- 4 files changed, 97 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 6c692b0..46f8a00 100644 --- a/README.md +++ b/README.md @@ -31,79 +31,85 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 33+23= | 56 | addition | -| 1 | Subtraction | 14-1= | 13 | subtraction | -| 2 | Multiplication | 52*1= | 52 | multiplication | -| 3 | Division | 14/26= | 0.5384615384615384 | division | -| 4 | Binary Complement 1s | 0110111= | 1001000 | binaryComplement1s | -| 5 | Modulo Division | 23%70= | 23 | moduloDivision | -| 6 | Square Root | sqrt(121)= | 11 | squareRoot | -| 7 | Power Rule Differentiation | 3x^2 + 3x^5 + 1x^2 + 6x^4 + 6x^3 | 6x^1 + 15x^4 + 2x^1 + 24x^3 + 18x^2 | powerRuleDifferentiation | -| 8 | Square | 18^2= | 324 | square | -| 9 | LCM (Least Common Multiple) | LCM of 17 and 11 = | 187 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 12 = | 3 | gcd | -| 11 | Basic Algebra | 2x + 3 = 10 | 7/2 | basicAlgebra | -| 12 | Logarithm | log2(32) | 5 | log | -| 13 | Easy Division | 196/14 = | 14 | intDivision | -| 14 | Decimal to Binary | Binary of 61= | 111101 | decimalToBinary | -| 15 | Binary to Decimal | 1 | 1 | binaryToDecimal | -| 16 | Fraction Division | (2/1)/(10/5) | 1 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 16 * [[4, 1], [1, 2]] = | [[64,16],[16,32]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 11 = | 69.62892717829278 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 35, 14 and 37 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (15,5),(9,10)= | (12.0,7.5) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 37 and 54 = | 89 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | -4x - 8y = 60, -9x + 10y = 51 | x = -9, y = -3 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (16, 7) and (19, 14) | sqrt(58) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 8 = | 19.70 | pythagoreanTheorem | -| 26 | Linear Equations | -8x + 15y = -109 -6x + -14y = 90 | x = 8, y = -3 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 130 | [2, 5, 13] | primeFactors | -| 28 | Fraction Multiplication | (8/9)*(3/2) | 4/3 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 8 sides | 135.0 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 11 objects picked 9 at a time | 55 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 8m, 4m, 17m is | 472 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 32m and radius = 18m is | 5654 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 19m, 1m is | 266 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 16m and radius = 18m is | 16286 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 48m and radius = 20m is | 4523 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 29m and radius = 6m is | 1093 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 59 and 57 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -1/4x - 2 and y = 4/5x + 3 | (-100/21, -17/21) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 13 objects picked 8 at a time = | 51891840 | permutations | -| 43 | Cross Product of 2 Vectors | [4, -11, 9] X [-8, -19, -5] = | [226, -52, -164] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/7 and 2/4? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2398 dollars, 9% rate of interest and for a time period of 5 years is = | 1079.1 | simpleInterest | +| 0 | Addition | 0+0= | 0 | addition | +| 1 | Subtraction | 46-14= | 32 | subtraction | +| 2 | Multiplication | 6*12= | 72 | multiplication | +| 3 | Division | 39/11= | 3.5454545454545454 | division | +| 4 | Binary Complement 1s | 0000= | 1111 | binaryComplement1s | +| 5 | Modulo Division | 98%34= | 30 | moduloDivision | +| 6 | Square Root | sqrt(9)= | 3 | squareRoot | +| 7 | Power Rule Differentiation | 5x^5 + 2x^9 + 4x^3 + 3x^3 | 25x^4 + 18x^8 + 12x^2 + 9x^2 | powerRuleDifferentiation | +| 8 | Square | 20^2= | 400 | square | +| 9 | LCM (Least Common Multiple) | LCM of 13 and 13 = | 13 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 13 = | 1 | gcd | +| 11 | Basic Algebra | 3x + 2 = 7 | 5/3 | basicAlgebra | +| 12 | Logarithm | log3(243) | 5 | log | +| 13 | Easy Division | 154/14 = | 11 | intDivision | +| 14 | Decimal to Binary | Binary of 86= | 1010110 | decimalToBinary | +| 15 | Binary to Decimal | 10 | 2 | binaryToDecimal | +| 16 | Fraction Division | (5/1)/(3/2) | 10/3 | fractionDivision | +| 17 | Integer Multiplication with 2x2 Matrix | 4 * [[2, 6], [8, 6]] = | [[8,24],[32,24]] | intMatrix22Multiplication | +| 18 | Area of Triangle | Area of triangle with side lengths: 9 15 6 = | 0.0 | areaOfTriangle | +| 19 | Triangle exists check | Does triangle with sides 23, 8 and 32 exist? | No | doesTriangleExist | +| 20 | Midpoint of the two point | (-19,9),(-9,8)= | (-14.0,8.5) | midPointOfTwoPoint | +| 21 | Factoring Quadratic | x^2-1x-42 | (x-7)(x+6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 41 and 80 = | 59 | thirdAngleOfTriangle | +| 23 | Solve a System of Equations in R^2 | -6x + 3y = -39, -10x + 5y = -65 | x = 6, y = -1 | systemOfEquations | +| 24 | Distance between 2 points | Find the distance between (20, 0) and (-18, 0) | sqrt(1444) | distance2Point | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 3 = | 16.28 | pythagoreanTheorem | +| 26 | Linear Equations | 8x + 11y = 91 +-10x + 17y = -83 | x = 10, y = 1 | linearEquations | +| 27 | Prime Factorisation | Find prime factors of 69 | [3, 23] | primeFactors | +| 28 | Fraction Multiplication | (1/2)*(2/1) | 1 | fractionMultiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | angleRegularPolygon | +| 30 | Combinations of Objects | Number of combinations from 10 objects picked 1 at a time | 10 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 20m is | 2400 m^2 | surfaceAreaCubeGen | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 19m, 6m, 13m is | 878 m^2 | surfaceAreaCuboidGen | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 8m and radius = 9m is | 961 m^2 | surfaceAreaCylinderGen | +| 35 | Volum of Cube | Volume of cube with side = 20m is | 8000 m^3 | volumeCubeGen | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 15m, 7m, 5m is | 525 m^3 | volumeCuboidGen | +| 37 | Volume of cylinder | Volume of cylinder with height = 15m and radius = 15m is | 10602 m^3 | volumeCylinderGen | +| 38 | Surface Area of cone | Surface area of cone with height = 29m and radius = 15m is | 2245 m^2 | surfaceAreaConeGen | +| 39 | Volume of cone | Volume of cone with height = 5m and radius = 7m is | 256 m^3 | volumeConeGen | +| 40 | Common Factors | Common Factors of 84 and 58 = | [1, 2] | commonFactors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -6/3x and y = 3/5x - 1 | (5/13, -10/13) | intersectionOfTwoLines | +| 42 | Permutations | Number of Permutations from 11 objects picked 9 at a time = | 19958400 | permutations | +| 43 | Cross Product of 2 Vectors | [-11, -12, -17] X [-12, -20, 13] = | [-496, 347, 76] | vectorCross | +| 44 | Compare Fractions | Which symbol represents the comparison between 3/5 and 6/9? | < | compareFractions | +| 45 | Simple Interest | Simple interest for a principle amount of 6089 dollars, 3% rate of interest and for a time period of 8 years is = | 1461.36 | simpleInterest | | 46 | Multiplication of two matrices | Multiply -
-83 6 91 4 -58 91 -91 47 -87
4 -2 24 66 -58 -58 -46 -96 52
-5 5 -53 74 31 -67 65 -31 56
77 -16 -73 50 54 -46 -11 91 64
and +
35 -82 -90 -70 -68
11 15 -23 94 -93
-85 -30 -79 2 -71
40 -33 -24 87 70
94 -86 -62 -40 58
and -") + prob = prob.replace(" ", "") + prob = prob.replace("\n", "") instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 5f06a1c..f1d2596 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,4 +1,4 @@ -.__init__ import * +from .__init__ import * def meanMedianFunc(maxlen = 10): randomlist = random.sample(range(1, 99), maxlen) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index aaf4573..6130ad0 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,4 +1,4 @@ -.__init__ import * +from .__init__ import * def sectorAreaFunc(maxRadius = 49,maxAngle = 359): Radius = random.randint(1, maxRadius) From 6a0aff765280e1f9772b1d92e13f8b39cd95053a Mon Sep 17 00:00:00 2001 From: lukew3 Date: Mon, 19 Oct 2020 12:16:03 -0400 Subject: [PATCH 04/24] Improved module format --- mathgenerator/__init__.py | 20 +++++++++++++++++++ mathgenerator/funcs/__init__.py | 2 +- .../funcs/{additionFunc.py => addition.py} | 4 +++- mathgenerator/mathgen.py | 11 +++++----- test.py | 2 +- 5 files changed, 31 insertions(+), 8 deletions(-) rename mathgenerator/funcs/{additionFunc.py => addition.py} (80%) diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index e69de29..9a5f3ea 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -0,0 +1,20 @@ + +genList = [] + +class Generator: + def __init__(self, title, id, generalProb, generalSol, func): + self.title = title + self.id = id + self.generalProb = generalProb + self.generalSol = generalSol + self.func = func + genList.append([id, title, self]) + + def __str__(self): + return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + + def __call__(self, **kwargs): + return self.func(**kwargs) + +def getGenList(): + return genList diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 4bfd99e..0cca17b 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,7 +2,7 @@ import random import math import fractions -from .additionFunc import * +from .addition import * from .subtractionFunc import * from .multiplicationFunc import * from .divisionFunc import * diff --git a/mathgenerator/funcs/additionFunc.py b/mathgenerator/funcs/addition.py similarity index 80% rename from mathgenerator/funcs/additionFunc.py rename to mathgenerator/funcs/addition.py index 30dfefe..b1cc1d6 100644 --- a/mathgenerator/funcs/additionFunc.py +++ b/mathgenerator/funcs/addition.py @@ -1,5 +1,5 @@ from .__init__ import * - +from ..__init__ import Generator def additionFunc(maxSum=99, maxAddend=50): a = random.randint(0, maxAddend) @@ -8,3 +8,5 @@ def additionFunc(maxSum=99, maxAddend=50): problem = str(a) + "+" + str(b) + "=" solution = str(c) return problem, solution + +addition = Generator("Addition", 0, "a+b=", "c", additionFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 89bf086..064c69a 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -2,8 +2,9 @@ import random import math import fractions from .funcs import * +from .__init__ import getGenList -genList = [] +genList = getGenList() # || Generator class class Generator: @@ -28,13 +29,13 @@ def genById(id): return(generator()) # -def getGenList(): - return(genList) +#def getGenList(): +# return(genList) # Format is: # = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) # Funcs_start - DO NOT REMOVE! -addition = Generator("Addition", 0, "a+b=", "c", additionFunc) +#addition = Generator("Addition", 0, "a+b=", "c", additionFunc) subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc) division = Generator("Division", 3, "a/b=", "c", divisionFunc) @@ -111,4 +112,4 @@ binary2sComplement = Generator("Binary 2's Complement", 73, "2's complement of 1 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) +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) diff --git a/test.py b/test.py index e5bb2c1..a1fb4dd 100644 --- a/test.py +++ b/test.py @@ -3,4 +3,4 @@ from mathgenerator import mathgen #test your generators here print(mathgen.addition()) -print(mathgen.genById(74)) +print(mathgen.genById(10)) From 74aaec3fc60c450fe2409ba6769f14efcdcb5baa Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:51:14 +0530 Subject: [PATCH 05/24] Create percentageFunc.py --- mathgenerator/funcs/percentageFunc.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mathgenerator/funcs/percentageFunc.py diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py new file mode 100644 index 0000000..19a4203 --- /dev/null +++ b/mathgenerator/funcs/percentageFunc.py @@ -0,0 +1,10 @@ +from .__init__ import * + +def percentageFunc(maxValue = 99, maxpercentage=99): + a = random.randint(1, maxpercentage) + b = random.randint(1, maxValue) + problem = f"What is {a}% of {b}?" + percentage = a/100*b + formatted_float = "{:.2f}".format(percentage) + solution = f"Required percentage = {formatted_float}%" + return problem, solution From 848454787fa9627863e98951c5e880c676ff55b1 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:51:42 +0530 Subject: [PATCH 06/24] Update __init__.py --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 73849f0..b0cc39e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -82,3 +82,4 @@ from .meanMedianFunc import* from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * +from .percentageFunc import * From 290e6852694641ff5cc73ef85fd6be88ffd3284f Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:53:51 +0530 Subject: [PATCH 07/24] Update mathgen.py --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 997b8e2..ae84143 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -115,3 +115,4 @@ meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numb intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) 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) decimalToHexadeci = Generator("Decimal to Hexadecimal", 79,"Binary of a=", "b", deciToHexaFunc) +percentage = Generator("Percentage of a number",80,"What is a% of b?","percentage",percentageFunc) From 91358f5b1bd1099857f6efa411d5550beb3fadd9 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 13:54:31 -0400 Subject: [PATCH 08/24] pep8 fixes --- makeReadme.py | 11 +- mathgenerator/__init__.py | 2 + mathgenerator/funcs/BinaryToDecimalFunc.py | 6 +- mathgenerator/funcs/DecimalToBinaryFunc.py | 2 +- mathgenerator/funcs/DiceSumProbFunc.py | 39 +-- mathgenerator/funcs/MidPointOfTwoPointFunc.py | 2 +- mathgenerator/funcs/absoluteDifferenceFunc.py | 18 +- mathgenerator/funcs/addition.py | 7 +- mathgenerator/funcs/areaOfTriangleFunc.py | 5 +- mathgenerator/funcs/basicAlgebraFunc.py | 4 +- mathgenerator/funcs/basicTrigonometryFunc.py | 23 +- mathgenerator/funcs/binary2sComplement.py | 8 +- mathgenerator/funcs/binaryComplement1sFunc.py | 4 +- mathgenerator/funcs/binaryToHexFunc.py | 2 +- mathgenerator/funcs/combinationsFunc.py | 7 +- mathgenerator/funcs/commonFactorsFunc.py | 4 +- mathgenerator/funcs/compareFractionsFunc.py | 2 +- mathgenerator/funcs/compoundInterestFunc.py | 6 +- mathgenerator/funcs/confidenceIntervalFunc.py | 29 +-- mathgenerator/funcs/cubeRootFunc.py | 2 +- mathgenerator/funcs/dataSummaryFunc.py | 22 +- mathgenerator/funcs/deciToHexaFunc.py | 2 +- mathgenerator/funcs/determinantToMatrix22.py | 5 +- mathgenerator/funcs/distanceTwoPointsFunc.py | 2 +- mathgenerator/funcs/divideFractionsFunc.py | 2 +- mathgenerator/funcs/divisionFunc.py | 2 +- mathgenerator/funcs/divisionToIntFunc.py | 2 +- mathgenerator/funcs/exponentiationFunc.py | 4 +- mathgenerator/funcs/factorialFunc.py | 6 +- mathgenerator/funcs/factoringFunc.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 12 +- .../funcs/fourthAngleOfQuadriFunc.py | 2 +- mathgenerator/funcs/geomProgrFunc.py | 25 +- mathgenerator/funcs/geometricMeanFunc.py | 46 ++-- mathgenerator/funcs/harmonicMeanFunc.py | 46 ++-- mathgenerator/funcs/hcfFunc.py | 3 +- .../funcs/intersectionOfTwoLinesFunc.py | 8 +- mathgenerator/funcs/isTriangleValidFunc.py | 3 +- mathgenerator/funcs/lcmFunc.py | 2 +- mathgenerator/funcs/linearEquationsFunc.py | 8 +- mathgenerator/funcs/logFunc.py | 2 +- mathgenerator/funcs/matrixInversion.py | 1 + .../funcs/matrixMultiplicationFunc.py | 8 +- mathgenerator/funcs/meanMedianFunc.py | 3 +- mathgenerator/funcs/moduloFunc.py | 2 +- mathgenerator/funcs/multiplicationFunc.py | 2 +- .../funcs/multiplyComplexNumbersFunc.py | 10 +- mathgenerator/funcs/multiplyFractionsFunc.py | 2 +- mathgenerator/funcs/multiplyIntToMatrix22.py | 2 +- mathgenerator/funcs/nthFibonacciNumberFunc.py | 9 +- mathgenerator/funcs/percentageFunc.py | 3 +- mathgenerator/funcs/permutationFunc.py | 3 +- .../funcs/powerRuleDifferentiationFunc.py | 2 +- .../funcs/powerRuleIntegrationFunc.py | 3 +- mathgenerator/funcs/primeFactorsFunc.py | 2 +- mathgenerator/funcs/profitLossPercentFunc.py | 8 +- mathgenerator/funcs/pythagoreanTheoremFunc.py | 2 +- mathgenerator/funcs/quadraticEquation.py | 8 +- .../funcs/regularPolygonAngleFunc.py | 2 +- mathgenerator/funcs/sectorAreaFunc.py | 5 +- mathgenerator/funcs/simpleInterestFunc.py | 5 +- mathgenerator/funcs/squareFunc.py | 2 +- mathgenerator/funcs/squareRootFunc.py | 2 +- mathgenerator/funcs/subtractionFunc.py | 2 +- .../funcs/sumOfAnglesOfPolygonFunc.py | 4 +- mathgenerator/funcs/surdsComparisonFunc.py | 8 +- mathgenerator/funcs/surfaceAreaCone.py | 2 +- mathgenerator/funcs/surfaceAreaCuboid.py | 2 +- mathgenerator/funcs/surfaceAreaCylinder.py | 2 +- mathgenerator/funcs/surfaceAreaSphere.py | 4 +- mathgenerator/funcs/systemOfEquationsFunc.py | 5 +- .../funcs/thirdAngleOfTriangleFunc.py | 2 +- mathgenerator/funcs/vectorCrossFunc.py | 12 +- mathgenerator/funcs/vectorDotFunc.py | 12 +- mathgenerator/funcs/volumeCone.py | 2 +- mathgenerator/funcs/volumeCube.py | 2 +- mathgenerator/funcs/volumeCuboid.py | 2 +- mathgenerator/funcs/volumeCylinder.py | 2 +- mathgenerator/funcs/volumeSphereFunc.py | 12 +- mathgenerator/mathgen.py | 222 ++++++++++++------ setup.py | 2 +- test.py | 2 +- 82 files changed, 450 insertions(+), 326 deletions(-) diff --git a/makeReadme.py b/makeReadme.py index 796dc00..35c3b8a 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -5,10 +5,11 @@ from mathgenerator.mathgen import * wList = getGenList() lines = [] with open('mathgenerator/mathgen.py', 'r') as f: - lines=f.readlines() + lines = f.readlines() allRows = [] -line = lines.index('# Funcs_start - DO NOT REMOVE!\n')+1 # get the first line of the functions in mathgen.py +# get the first line of the functions in mathgen.py +line = lines.index('# Funcs_start - DO NOT REMOVE!\n')+1 for item in wList: myGen = item[2] # NOTE: renamed 'sol' to 'solu' to make it look nicer @@ -27,7 +28,8 @@ for item in wList: print(prob) instName = lines[line] - func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more + # NOTE: renamed 'def_name' to 'func_name' because it suits it more + func_name = instName[:instName.find('=')].strip() row = [myGen.id, myGen.title, prob, solu, func_name] # print(item[1], func_name) line += 1 @@ -42,7 +44,8 @@ with open('README.md', "r") as g: lines = lines[:line+1] for row in allRows: - tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str(row[2]) + " | " + str(row[3]) + " | " + str(row[4]) + " |\n" + tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str( + row[2]) + " | " + str(row[3]) + " | " + str(row[4]) + " |\n" lines.append(tableLine) with open('README.md', "w") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 9a5f3ea..01875a9 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,6 +1,7 @@ genList = [] + class Generator: def __init__(self, title, id, generalProb, generalSol, func): self.title = title @@ -16,5 +17,6 @@ class Generator: def __call__(self, **kwargs): return self.func(**kwargs) + def getGenList(): return genList diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index 27b165d..9d2b25d 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -1,12 +1,12 @@ -from .__init__ import * +from .__init__ import * def BinaryToDecimalFunc(max_dig=10): problem = '' - + for i in range(random.randint(1, max_dig)): temp = str(random.randint(0, 1)) problem += temp - + solution = int(problem, 2) return problem, solution diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 8df2d8a..872e105 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -7,5 +7,5 @@ def DecimalToBinaryFunc(max_dec=99): problem = "Binary of " + str(a) + "=" solution = str(b) - + return problem, solution diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 2180ee4..f9be9aa 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -2,24 +2,25 @@ from .__init__ import * def DiceSumProbFunc(maxDice=3): - a = random.randint(1,maxDice) - b = random.randint(a,6*a) + a = random.randint(1, maxDice) + b = random.randint(a, 6*a) - count=0 - for i in [1,2,3,4,5,6]: - if a==1: - if i==b: - count=count+1 - elif a==2: - for j in [1,2,3,4,5,6]: - if i+j==b: - count=count+1 - elif a==3: - for j in [1,2,3,4,5,6]: - for k in [1,2,3,4,5,6]: - if i+j+k==b: - count=count+1 - - problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(a,b) - solution="{}/{}".format(count, 6**a) + count = 0 + for i in [1, 2, 3, 4, 5, 6]: + if a == 1: + if i == b: + count = count+1 + elif a == 2: + for j in [1, 2, 3, 4, 5, 6]: + if i+j == b: + count = count+1 + elif a == 3: + for j in [1, 2, 3, 4, 5, 6]: + for k in [1, 2, 3, 4, 5, 6]: + if i+j+k == b: + count = count+1 + + problem = "If {} 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 diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index 3c9202a..f8cd8a1 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -6,7 +6,7 @@ def MidPointOfTwoPointFunc(maxValue=20): y1 = random.randint(-20, maxValue) x2 = random.randint(-20, maxValue) y2 = random.randint(-20, maxValue) - + problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index d578d19..075d1c2 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -1,10 +1,12 @@ -from .__init__ import * +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 \ No newline at end of file +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 diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/addition.py index b1cc1d6..df74496 100644 --- a/mathgenerator/funcs/addition.py +++ b/mathgenerator/funcs/addition.py @@ -1,12 +1,15 @@ -from .__init__ import * +from .__init__ import * from ..__init__ import Generator + 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) return problem, solution + addition = Generator("Addition", 0, "a+b=", "c", additionFunc) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index a5e1250..8506b55 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -9,6 +9,7 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): 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 diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index 939ac5e..1d927ef 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def basicAlgebraFunc(maxVariable=10): @@ -19,7 +19,7 @@ def basicAlgebraFunc(maxVariable=10): x = "0" elif a == 1 or a == i: x = f"{c - b}" - + problem = f"{a}x + {b} = {c}" solution = x return problem, solution diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index dd4fe5d..8ce32a4 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -1,14 +1,17 @@ -from .__init__ import * +from .__init__ import * -def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one - angle=random.choice(angles) - function=random.choice(functions) +# 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"} + problem = f"What is {function}({angle})?" - solution=result_fraction_map[round(eval(expression),2)] if round(eval(expression),2)<=99999 else "∞" #for handling the ∞ condition - return problem,solution + expression = 'math.'+function+'(math.radians(angle))' + result_fraction_map = {0.0: "0", 0.5: "1/2", 0.71: "1/√2", + 0.87: "√3/2", 1.0: "1", 0.58: "1/√3", 1.73: "√3"} + + solution = result_fraction_map[round(eval(expression), 2)] if round( + eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition + return problem, solution diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index f51b797..478b2c9 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -1,8 +1,10 @@ -from .__init__ import * +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') + question = ''.join([str(random.randint(0, 1)) + for i in range(digits)]).lstrip('0') answer = [] for i in question: @@ -23,4 +25,4 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') - return problem, solution \ No newline at end of file + return problem, solution diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 2568303..1dbb1b2 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def binaryComplement1sFunc(maxDigits=10): @@ -9,7 +9,7 @@ def binaryComplement1sFunc(maxDigits=10): temp = str(random.randint(0, 1)) question += temp answer += "0" if temp == "1" else "1" - + problem = question+"=" solution = answer return problem, solution diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index 0f3e962..f06fcfc 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def binaryToHexFunc(max_dig=10): diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index 79390a6..6ea2e6d 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def combinationsFunc(maxlength=20): @@ -14,6 +14,7 @@ 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 diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index 633abb3..82a0e3b 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def commonFactorsFunc(maxVal=100): @@ -18,7 +18,7 @@ def commonFactorsFunc(maxVal=100): if (y % i == 0): count = count + 1 arr.append(i) - + problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index d0d08a4..56c4714 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -21,6 +21,6 @@ def compareFractionsFunc(maxVal=10): solution = "<" else: solution = "=" - + problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 6f4fba3..59cac26 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,11 +1,13 @@ from .__init__ import * -def compoundInterestFunc(maxPrinciple = 10000, maxRate = 10, maxTime = 10, maxPeriod = 10): + +def compoundInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10, maxPeriod=10): p = random.randint(100, maxPrinciple) r = random.randint(1, maxRate) t = random.randint(1, maxTime) n = random.randint(1, maxPeriod) A = p * ((1 + (r/(100*n))**(n*t))) - problem = "Compound Interest for a principle amount of " + str(p) + " dollars, " + str(r) + "% rate of interest and for a time period of " + str(t) + " compounded monthly is = " + problem = "Compound Interest for a principle amount of " + str(p) + " dollars, " + str( + r) + "% rate of interest and for a time period of " + str(t) + " compounded monthly is = " solution = round(A, 2) return problem, solution diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index 32bd26a..babdabe 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -2,29 +2,30 @@ from .__init__ import * def confidenceIntervalFunc(): - n=random.randint(20,40) - j=random.randint(0,3) + n = random.randint(20, 40) + j = random.randint(0, 3) - lst=random.sample(range(200,300),n) - lst_per=[80 ,90, 95, 99] + lst = random.sample(range(200, 300), n) + lst_per = [80, 90, 95, 99] lst_t = [1.282, 1.645, 1.960, 2.576] - mean=0 - sd=0 + mean = 0 + sd = 0 for i in lst: - count= i + mean - mean=count + count = i + mean + mean = count mean = mean/n for i in lst: - x=(i-mean)**2+sd - sd=x + x = (i-mean)**2+sd + sd = x - sd=sd/n + sd = sd/n standard_error = lst_t[j]*math.sqrt(sd/n) - - problem= 'The confidence interval for sample {} with {}% confidence is'.format([x for x in lst], lst_per[j]) - solution= '({}, {})'.format(mean+standard_error, mean-standard_error) + + 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 diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cubeRootFunc.py index c9de53c..97b978d 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cubeRootFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def cubeRootFunc(minNo=1, maxNo=1000): b = random.randint(minNo, maxNo) a = b**(1 / 3) - + problem = "cuberoot of " + str(b) + " upto 2 decimal places is:" solution = str(round(a, 2)) return problem, solution diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index 016737c..e0e0bad 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -1,19 +1,19 @@ from .__init__ import * -def dataSummaryFunc(number_values=15,minval=5,maxval=50): - random_list=[] +def dataSummaryFunc(number_values=15, minval=5, maxval=50): + random_list = [] for i in range(number_values): - n=random.randint(minval,maxval) + n = random.randint(minval, maxval) random_list.append(n) - a=sum(random_list) - mean=a/number_values + a = sum(random_list) + mean = a/number_values - var=0 + var = 0 for i in range(number_values): - var+=(random_list[i]-mean)**2 + var += (random_list[i]-mean)**2 # we're printing stuff here? print(random_list) @@ -21,6 +21,8 @@ def dataSummaryFunc(number_values=15,minval=5,maxval=50): print(var/number_values) print((var/number_values)**0.5) - problem="Find the mean,standard deviation and variance for the data"+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 + problem = "Find the mean,standard deviation and variance for the data" + \ + 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 diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/deciToHexaFunc.py index a815e34..5958dfa 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/deciToHexaFunc.py @@ -5,6 +5,6 @@ def deciToHexaFunc(max_dec=1000): a = random.randint(0, max_dec) b = hex(a) problem = "Binary of " + str(a) + "=" - solution = str(b) + solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index a92ac76..c54028d 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -1,6 +1,7 @@ -from .__init__ import * +from .__init__ import * -def determinantToMatrix22(maxMatrixVal = 100): + +def determinantToMatrix22(maxMatrixVal=100): a = random.randint(0, maxMatrixVal) b = random.randint(0, maxMatrixVal) c = random.randint(0, maxMatrixVal) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 1f48f90..7bd1ef2 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -8,7 +8,7 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): point2Y = random.randint(minValXY, maxValXY + 1) distanceSq = (point1X - point2X) ** 2 + (point1Y - point2Y) ** 2 - + solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" return problem, solution diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index abfbec6..0f6bf30 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -20,7 +20,7 @@ def divideFractionsFunc(maxVal=10): tmp_n = a * d tmp_d = b * c - + gcd = calculate_gcd(tmp_n, tmp_d) x = f"{tmp_n//gcd}/{tmp_d//gcd}" diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index 60af33d..930e34b 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -5,7 +5,7 @@ def divisionFunc(maxRes=99, maxDivid=99): a = random.randint(0, maxDivid) b = random.randint(0, min(maxRes, maxDivid)) c = a / b - + problem = str(a) + "/" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index d5f3cfd..fcc62f5 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -7,7 +7,7 @@ def divisionToIntFunc(maxA=25, maxB=25): divisor = a * b dividend = random.choice([a, b]) - + problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index 4ff1ba1..d58f00d 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def exponentiationFunc(maxBase = 20,maxExpo = 10): +def exponentiationFunc(maxBase=20, maxExpo=10): base = random.randint(1, maxBase) expo = random.randint(1, maxExpo) - + problem = f"{base}^{expo} =" solution = str(base ** expo) return problem, solution diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index ac4536c..71dc3a2 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -4,12 +4,12 @@ from .__init__ import * def factorialFunc(maxInput=6): a = random.randint(0, maxInput) n = a - + problem = str(a) + "! = " b = 1 while a != 1 and n > 0: - b *= n - n -= 1 + b *= n + n -= 1 solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index c52482f..1cb43c0 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -26,4 +26,4 @@ def factoringFunc(range_x1=10, range_x2=10): x1 = intParser(x1) x2 = intParser(x2) solution = f"(x{x1})(x{x2})" - return problem, solution \ No newline at end of file + return problem, solution diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index 42de00d..c043567 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -2,20 +2,20 @@ from .__init__ import * def fibonacciSeriesFunc(minNo=1): - n = random.randint(minNo,20) + n = random.randint(minNo, 20) def createFibList(n): - l=[] + l = [] for i in range(n): - if i<2: + if i < 2: l.append(i) else: val = l[i-1]+l[i-2] l.append(val) return l - fibList=createFibList(n) - + fibList = createFibList(n) + problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" solution = fibList - return problem,solution + return problem, solution diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index d183e17..59a05c4 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -8,7 +8,7 @@ def fourthAngleOfQuadriFunc(maxAngle=180): sum_ = angle1 + angle2 + angle3 angle4 = 360 - sum_ - + problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 3e3ad5c..d051f85 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,15 +1,18 @@ -from .__init__ import * +from .__init__ import * + def geomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term=5): - r=random.randint(min_value,max_value) - a=random.randint(min_value,max_value) - n_term=random.randint(number_values,number_values+5) - sum_term=random.randint(number_values,number_values+5) - GP=[] + r = random.randint(min_value, max_value) + a = random.randint(min_value, max_value) + n_term = random.randint(number_values, number_values+5) + sum_term = random.randint(number_values, number_values+5) + GP = [] for i in range(number_values): GP.append(a*(r**i)) - problem="For the given GP "+str(GP)+" ,Find the value of a,common ratio,"+str(n_term)+"th term value, sum upto "+str(sum_term)+"th term" - value_nth_term=a*(r**(n_term-1)) - sum_till_nth_term=a*((r**sum_term-1)/(r-1)) - 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 + problem = "For the given GP "+str(GP)+" ,Find the value of a,common ratio,"+str( + n_term)+"th term value, sum upto "+str(sum_term)+"th term" + value_nth_term = a*(r**(n_term-1)) + sum_till_nth_term = a*((r**sum_term-1)/(r-1)) + 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 diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 05ded2b..07dc4cd 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -1,27 +1,27 @@ -from .__init__ import * +from .__init__ import * def geometricMeanFunc(maxValue=100, maxNum=4): - a=random.randint(1,maxValue) - b=random.randint(1,maxValue) - c=random.randint(1,maxValue) - d=random.randint(1,maxValue) - num=random.randint(2,4) - if num==2: - product=a*b - elif num==3: - product=a*b*c - elif num==4: - product=a*b*c*d + a = random.randint(1, maxValue) + b = random.randint(1, maxValue) + c = random.randint(1, maxValue) + d = random.randint(1, maxValue) + num = random.randint(2, 4) + if num == 2: + product = a*b + elif num == 3: + product = a*b*c + elif num == 4: + product = a*b*c*d - ans=product**(1/num) - if num==2: - problem=f"Geometric mean of {num} numbers {a} and {b} = " - solution = f"({a}*{b})^(1/{num}) = {ans}" - elif num==3: - problem=f"Geometric mean of {num} numbers {a} , {b} and {c} = " - solution = f"({a}*{b}*{c})^(1/{num}) = {ans}" - elif num==4: - problem=f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " - solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" - return problem,solution + ans = product**(1/num) + if num == 2: + problem = f"Geometric mean of {num} numbers {a} and {b} = " + solution = f"({a}*{b})^(1/{num}) = {ans}" + elif num == 3: + problem = f"Geometric mean of {num} numbers {a} , {b} and {c} = " + solution = f"({a}*{b}*{c})^(1/{num}) = {ans}" + elif num == 4: + problem = f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " + solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" + return problem, solution diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 035273f..1c9e397 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -1,28 +1,28 @@ -from .__init__ import * +from .__init__ import * def harmonicMeanFunc(maxValue=100, maxNum=4): - a=random.randint(1,maxValue) - b=random.randint(1,maxValue) - c=random.randint(1,maxValue) - d=random.randint(1,maxValue) - num=random.randint(2,4) - if num==2: - sum=(1/a)+(1/b) - elif num==3: - sum=(1/a)+(1/b)+(1/c) - elif num==4: - sum=(1/a)+(1/b)+(1/c)+(1/d) + a = random.randint(1, maxValue) + b = random.randint(1, maxValue) + c = random.randint(1, maxValue) + d = random.randint(1, maxValue) + num = random.randint(2, 4) + if num == 2: + sum = (1/a)+(1/b) + elif num == 3: + sum = (1/a)+(1/b)+(1/c) + elif num == 4: + sum = (1/a)+(1/b)+(1/c)+(1/d) - ans=num/sum - if num==2: - problem=f"Harmonic mean of {num} numbers {a} and {b} = " - solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" - elif num==3: - problem=f"Harmonic mean of {num} numbers {a} , {b} and {c} = " - solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c})) = {ans}" - elif num==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 + ans = num/sum + if num == 2: + problem = f"Harmonic mean of {num} numbers {a} and {b} = " + solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" + elif num == 3: + problem = f"Harmonic mean of {num} numbers {a} , {b} and {c} = " + solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c})) = {ans}" + elif num == 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 diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 40be783..a9f4e96 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -1,4 +1,5 @@ -from .__init__ import * +from .__init__ import * + def hcfFunc(maxVal=20): a = random.randint(1, maxVal) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index 96f681d..2e6fbb6 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -33,8 +33,10 @@ def intersectionOfTwoLinesFunc( x = f"{x.numerator}/{x.denominator}" return x - m1 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator)) - m2 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator)) + m1 = (random.randint(minM, maxM), random.randint( + minDenominator, maxDenominator)) + m2 = (random.randint(minM, maxM), random.randint( + minDenominator, maxDenominator)) b1 = random.randint(minB, maxB) b2 = random.randint(minB, maxB) @@ -58,5 +60,5 @@ def intersectionOfTwoLinesFunc( intersection_x = (b1 - b2) / (m2 - m1) intersection_y = ((m2 * b1) - (m1 * b2)) / (m2 - m1) solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" - + return problem, solution diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index a80a05d..304c549 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -9,7 +9,8 @@ def isTriangleValidFunc(maxSideLength=50): 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: diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index af2ee41..32e1868 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -13,5 +13,5 @@ def lcmFunc(maxVal=20): problem = f"LCM of {a} and {b} =" solution = str(d) - + return problem, solution diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index 4aa1fba..14a65f1 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -9,13 +9,15 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): vars = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'e', 'f', 'g'][:n] 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)]) - prob = ["{}{}".format(coeff[i], vars[i]) if coeff[i] != 0 else "" for i in range(n)] - + prob = ["{}{}".format(coeff[i], vars[i]) if coeff[i] + != 0 else "" for i in range(n)] + while "" in prob: prob.remove("") prob = " + ".join(prob) + " = " + str(res) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 8d16214..6fc651b 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -8,5 +8,5 @@ def logFunc(maxBase=3, maxVal=8): problem = "log" + str(b) + "(" + str(c) + ")" solution = str(a) - + return problem, solution diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 822cb83..28080e5 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -1,6 +1,7 @@ from .__init__ import * import sympy + def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerElementsInInvertedMatrix=False): if OnlyIntegerElementsInInvertedMatrix is True: isItOk = False diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index eeaa265..a85cca5 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -32,10 +32,12 @@ def matrixMultiplicationFunc(maxVal=100): 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 + def matrixMultiplicationFuncHelper(inp): m = len(inp) n = len(inp[0]) @@ -47,5 +49,5 @@ def matrixMultiplicationFuncHelper(inp): string += ", "if j < n-1 else "" string += "]\n [" if i < m-1 else "" string += "]]" - - return string \ No newline at end of file + + return string diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index f1d2596..36fc986 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,6 +1,7 @@ from .__init__ import * -def meanMedianFunc(maxlen = 10): + +def meanMedianFunc(maxlen=10): randomlist = random.sample(range(1, 99), maxlen) total = 0 for n in randomlist: diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 71f1421..2a447c4 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -5,7 +5,7 @@ def moduloFunc(maxRes=99, maxModulo=99): a = random.randint(0, maxModulo) b = random.randint(0, min(maxRes, maxModulo)) c = a % b if b != 0 else 0 - + problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 00ebb26..8ad25f6 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -5,7 +5,7 @@ def multiplicationFunc(maxRes=99, maxMulti=99): a = random.randint(0, maxMulti) b = random.randint(0, min(int(maxMulti / a), maxRes)) c = a * b - + problem = str(a) + "*" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index f959d4d..69ca238 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,9 +1,11 @@ -from .__init__ import * +from .__init__ import * -def multiplyComplexNumbersFunc(minRealImaginaryNum = -20, maxRealImaginaryNum = 20): - num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum)) - num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum)) +def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, maxRealImaginaryNum=20): + num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), + random.randint(minRealImaginaryNum, maxRealImaginaryNum)) + num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), + random.randint(minRealImaginaryNum, maxRealImaginaryNum)) problem = f"{num1} * {num2} = " solution = num1 * num2 return problem, solution diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 14614d6..67c5017 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -20,7 +20,7 @@ def multiplyFractionsFunc(maxVal=10): tmp_n = a * c tmp_d = b * d - + gcd = calculate_gcd(tmp_n, tmp_d) x = f"{tmp_n//gcd}/{tmp_d//gcd}" diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index 120c202..7808afe 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -6,7 +6,7 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): b = random.randint(0, maxMatrixVal) c = random.randint(0, maxMatrixVal) d = random.randint(0, maxMatrixVal) - + constant = random.randint(0, int(maxRes / max(a, b, c, d))) problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = " solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]" diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index 023a007..d559f1f 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -1,10 +1,11 @@ -from .__init__ import * +from .__init__ import * -def nthFibonacciNumberFunc(maxN = 100): +def nthFibonacciNumberFunc(maxN=100): golden_ratio = (1 + math.sqrt(5))/2 - n = random.randint(1,maxN) + n = random.randint(1, maxN) problem = f"What is the {n}th Fibonacci number?" - ans = round((math.pow(golden_ratio,n) - math.pow(-golden_ratio,-n))/(math.sqrt(5))) + ans = round((math.pow(golden_ratio, n) - + math.pow(-golden_ratio, -n))/(math.sqrt(5))) solution = f"{ans}" return problem, solution diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index 19a4203..e69749d 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -1,6 +1,7 @@ from .__init__ import * -def percentageFunc(maxValue = 99, maxpercentage=99): + +def percentageFunc(maxValue=99, maxpercentage=99): a = random.randint(1, maxpercentage) b = random.randint(1, maxValue) problem = f"What is {a}% of {b}?" diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index ffae44e..c62841f 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -6,5 +6,6 @@ def permutationFunc(maxlength=20): 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 diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index 9dac2db..a14bd90 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -12,7 +12,7 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + " coefficient = random.randint(1, maxCoef) exponent = random.randint(1, maxExp) - + problem += str(coefficient) + "x^" + str(exponent) solution += str(coefficient * exponent) + "x^" + str(exponent - 1) return problem, solution diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index 112f5b5..fb1f62d 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -14,7 +14,8 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): 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 += " + c" return problem, solution diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 5e645d2..852821c 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -16,7 +16,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): if n > 1: factors.append(n) - + problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index 05a3653..49d7f27 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -1,7 +1,7 @@ -from .__init__ import * +from .__init__ import * -def profitLossPercentFunc(maxCP = 1000, maxSP = 1000): +def profitLossPercentFunc(maxCP=1000, maxSP=1000): cP = random.randint(1, maxCP) sP = random.randint(1, maxSP) diff = abs(sP-cP) @@ -12,5 +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 \ No newline at end of file + + return problem, solution diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 2776592..17bcd82 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -5,7 +5,7 @@ def pythagoreanTheoremFunc(maxLength=20): a = random.randint(1, maxLength) b = random.randint(1, maxLength) c = (a**2 + b**2)**0.5 - + 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 diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 98f895e..73f0ea4 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -4,9 +4,11 @@ from .__init__ import * 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 diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index 569d2d5..5275bef 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def regularPolygonAngleFunc(minVal=3, maxVal=20): sideNum = random.randint(minVal, maxVal) problem = f"Find the angle of a regular polygon with {sideNum} sides" - + exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index 6130ad0..d7f9545 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,10 +1,11 @@ from .__init__ import * -def sectorAreaFunc(maxRadius = 49,maxAngle = 359): + +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}" + solution = f"Area of sector = {formatted_float}" return problem, solution diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index de997d0..08b0f3b 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -6,7 +6,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 diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 6384197..1d159dc 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def squareFunc(maxSquareNum=20): a = random.randint(1, maxSquareNum) b = a * a - + problem = str(a) + "^2" + "=" solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index 87152c8..e5d2418 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def squareRootFunc(minNo=1, maxNo=12): b = random.randint(minNo, maxNo) a = b * b - + problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index 91c8e74..a50537e 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -5,7 +5,7 @@ def subtractionFunc(maxMinuend=99, maxDiff=99): a = random.randint(0, maxMinuend) b = random.randint(max(0, (a - maxDiff)), a) c = a - b - + problem = str(a) + "-" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 6181e96..8338698 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def sumOfAnglesOfPolygonFunc(maxSides = 12): +def sumOfAnglesOfPolygonFunc(maxSides=12): side = random.randint(3, maxSides) sum = (side - 2) * 180 - + problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index 161aac3..3035265 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def surdsComparisonFunc(maxValue = 100, maxRoot = 10): - radicand1,radicand2 = tuple(random.sample(range(1,maxValue),2)) - degree1, degree2 = tuple(random.sample(range(1,maxRoot),2)) - +def surdsComparisonFunc(maxValue=100, maxRoot=10): + radicand1, radicand2 = tuple(random.sample(range(1, maxValue), 2)) + degree1, degree2 = tuple(random.sample(range(1, maxRoot), 2)) + problem = f"Fill in the blanks {radicand1}^(1/{degree1}) _ {radicand2}^(1/{degree2})" first = math.pow(radicand1, 1/degree1) second = math.pow(radicand2, 1/degree2) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index 8132e7d..53799aa 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -8,6 +8,6 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): slopingHeight = math.sqrt(a**2 + b**2) problem = f"Surface area of cone with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * slopingHeight + math.pi * b * b) - + solution = f"{ans} {unit}^2" return problem, solution diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index 3630abc..95fee71 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -5,7 +5,7 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): a = random.randint(1, maxSide) b = random.randint(1, maxSide) c = random.randint(1, maxSide) - + problem = f"Surface area of cuboid with sides = {a}{unit}, {b}{unit}, {c}{unit} is" ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index 92035ba..eacc0be 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -4,7 +4,7 @@ from .__init__ import * def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Surface area of cylinder with height = {a}{unit} and radius = {b}{unit} is" ans = int(2 * math.pi * a * b + 2 * math.pi * b * b) solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 84ce3e1..6b9110d 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -1,9 +1,9 @@ from .__init__ import * -def surfaceAreaSphere(maxSide = 20, unit = 'm'): +def surfaceAreaSphere(maxSide=20, unit='m'): r = random.randint(1, maxSide) - + problem = f"Surface area of Sphere with radius = {r}{unit} is" ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index fd28eaf..2e82f5f 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -36,9 +36,10 @@ 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)}" solution = f"x = {x}, y = {y}" return problem, solution diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 688b209..5268ceb 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -5,7 +5,7 @@ def thirdAngleOfTriangleFunc(maxAngle=89): angle1 = random.randint(1, maxAngle) angle2 = random.randint(1, maxAngle) angle3 = 180 - (angle1 + angle2) - + problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 07ff0b2..21bcb0e 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -2,12 +2,12 @@ from .__init__ import * def vectorCrossFunc(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[1] * b[2] - a[2] * b[1], + a = [random.randint(minVal, maxVal) for i in range(3)] + b = [random.randint(minVal, maxVal) for i in range(3)] + c = [a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0]] - problem = str(a) + " X " + str(b) + " = " - solution = str(c) - return problem, solution + problem = str(a) + " X " + str(b) + " = " + solution = str(c) + return problem, solution diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 0364c65..011beb3 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -2,10 +2,10 @@ 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] + 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 + problem = str(a) + " . " + str(b) + " = " + solution = str(c) + return problem, solution diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index 4cd5512..c237bca 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -4,7 +4,7 @@ from .__init__ import * def volumeCone(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Volume of cone with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * b * a * (1 / 3)) solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index e487173..6a52da4 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -3,7 +3,7 @@ from .__init__ import * def volumeCube(maxSide=20, unit='m'): a = random.randint(1, maxSide) - + problem = f"Volume of cube with side = {a}{unit} is" ans = a * a * a solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index a435784..b0a2490 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -5,7 +5,7 @@ def volumeCuboid(maxSide=20, unit='m'): a = random.randint(1, maxSide) b = random.randint(1, maxSide) c = random.randint(1, maxSide) - + problem = f"Volume of cuboid with sides = {a}{unit}, {b}{unit}, {c}{unit} is" ans = a * b * c solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index ecd78da..38dfd64 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -4,7 +4,7 @@ from .__init__ import * def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Volume of cylinder with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 618dbd3..137db4f 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def volumeSphereFunc(maxRadius = 100): - r=random.randint(1,maxRadius) - - problem=f"Volume of sphere with radius {r} m = " - ans=(4*math.pi/3)*r*r*r +def volumeSphereFunc(maxRadius=100): + r = random.randint(1, maxRadius) + + problem = f"Volume of sphere with radius {r} m = " + ans = (4*math.pi/3)*r*r*r solution = f"{ans} m^3" - return problem,solution + return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index ae84143..dc29a6e 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -7,6 +7,8 @@ from .__init__ import getGenList genList = getGenList() # || Generator class + + class Generator: def __init__(self, title, id, generalProb, generalSol, func): self.title = title @@ -29,90 +31,164 @@ def genById(id): return(generator()) # -#def getGenList(): +# def getGenList(): # return(genList) + # 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) -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) +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) 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", 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) -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) -decimalToHexadeci = Generator("Decimal to Hexadecimal", 79,"Binary of a=", "b", deciToHexaFunc) -percentage = Generator("Percentage of a number",80,"What is a% of b?","percentage",percentageFunc) +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) +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) +decimalToHexadeci = Generator( + "Decimal to Hexadecimal", 79, "Binary of a=", "b", deciToHexaFunc) +percentage = Generator("Percentage of a number", 80, + "What is a% of b?", "percentage", percentageFunc) diff --git a/setup.py b/setup.py index 8a88d21..981b662 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( license='MIT', packages=find_packages(), install_requires=[ - + ], entry_points={ } diff --git a/test.py b/test.py index 0de128e..1302ce5 100644 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ from mathgenerator import mathgen -#test your generators here +# test your generators here print(mathgen.addition()) print(mathgen.genById(79)) From 233f8bf180289199ce433ddd27fe59f227b33f7f Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:00:28 -0400 Subject: [PATCH 09/24] some more lint fixes --- mathgenerator/funcs/absoluteDifferenceFunc.py | 6 +++--- mathgenerator/funcs/determinantToMatrix22.py | 2 +- mathgenerator/funcs/geomProgrFunc.py | 14 +++++++------- mathgenerator/funcs/matrixMultiplicationFunc.py | 4 ++-- mathgenerator/funcs/surdsComparisonFunc.py | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 075d1c2..138c8de 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -2,9 +2,9 @@ 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) + 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) + " = " diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index c54028d..33b4004 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -7,7 +7,7 @@ def determinantToMatrix22(maxMatrixVal=100): c = random.randint(0, maxMatrixVal) d = random.randint(0, maxMatrixVal) - determinant = a*d - b*c + determinant = a * d - b * c problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index d051f85..70d3dcc 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -4,15 +4,15 @@ from .__init__ import * def geomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term=5): r = random.randint(min_value, max_value) a = random.randint(min_value, max_value) - n_term = random.randint(number_values, number_values+5) - sum_term = random.randint(number_values, number_values+5) + n_term = random.randint(number_values, number_values + 5) + sum_term = random.randint(number_values, number_values + 5) GP = [] for i in range(number_values): - GP.append(a*(r**i)) - problem = "For the given GP "+str(GP)+" ,Find the value of a,common ratio,"+str( - n_term)+"th term value, sum upto "+str(sum_term)+"th term" - value_nth_term = a*(r**(n_term-1)) - sum_till_nth_term = a*((r**sum_term-1)/(r-1)) + GP.append(a * (r ** i)) + problem = "For the given GP " + str(GP) + " ,Find the value of a,common ratio,"+str( + n_term) + "th term value, sum upto " + str(sum_term) + "th term" + value_nth_term = a * (r ** (n_term - 1)) + sum_till_nth_term = a * ((r ** sum_term - 1)/(r - 1)) 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 diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index a85cca5..727112e 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -46,8 +46,8 @@ def matrixMultiplicationFuncHelper(inp): for i in range(m): for j in range(n): string += f"{inp[i][j]: 6d}" - string += ", "if j < n-1 else "" - string += "]\n [" if i < m-1 else "" + string += ", "if j < n - 1 else "" + string += "]\n [" if i < m - 1 else "" string += "]]" return string diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index 3035265..e005d3f 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -6,8 +6,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): degree1, degree2 = tuple(random.sample(range(1, maxRoot), 2)) problem = f"Fill in the blanks {radicand1}^(1/{degree1}) _ {radicand2}^(1/{degree2})" - first = math.pow(radicand1, 1/degree1) - second = math.pow(radicand2, 1/degree2) + first = math.pow(radicand1, 1 / degree1) + second = math.pow(radicand2, 1 / degree2) solution = "=" if first > second: From 40f2ce1af3d3c7e9489a10cd355b668e9a8bbc05 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:04:35 -0400 Subject: [PATCH 10/24] Added Celsius to Fahrenheit Conversion formula --- mathgenerator/funcs/celsiustofahrenheit.py | 11 +++++++++++ mathgenerator/mathgen.py | 1 + 2 files changed, 12 insertions(+) create mode 100644 mathgenerator/funcs/celsiustofahrenheit.py diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py new file mode 100644 index 0000000..ec981db --- /dev/null +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -0,0 +1,11 @@ +from .__init__ import * +from ..__init__ import Generator + +def celsiustofahrenheit(maxTemp=100): + celsius = random.randint(-50, maxTemp) + fahrenheit = (celsius * (9/5)) +32 + problem = "Convert", str(celsius), "deg Celsius to degrees Fahrenheit =" + solution = str(fahrenheit) + return problem, solution + +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index ae84143..00bde03 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -116,3 +116,4 @@ intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b], 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) decimalToHexadeci = Generator("Decimal to Hexadecimal", 79,"Binary of a=", "b", deciToHexaFunc) percentage = Generator("Percentage of a number",80,"What is a% of b?","percentage",percentageFunc) +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit) From 2f7af1dfd8af78d2fe6e6be67a3eada2543c0d41 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:05:22 -0400 Subject: [PATCH 11/24] Changed deg to degrees --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index ec981db..fd2ca82 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -4,7 +4,7 @@ from ..__init__ import Generator def celsiustofahrenheit(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 - problem = "Convert", str(celsius), "deg Celsius to degrees Fahrenheit =" + problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution From 90a794cc05d898e9bac6052aa08e45b58e80e2c3 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:08:13 -0400 Subject: [PATCH 12/24] yapf edits --- makeReadme.py | 4 +- mathgenerator/__init__.py | 5 +- mathgenerator/funcs/DiceSumProbFunc.py | 12 +- mathgenerator/funcs/__init__.py | 4 +- mathgenerator/funcs/areaOfTriangleFunc.py | 2 +- mathgenerator/funcs/basicAlgebraFunc.py | 2 +- mathgenerator/funcs/basicTrigonometryFunc.py | 16 +- mathgenerator/funcs/binaryComplement1sFunc.py | 2 +- mathgenerator/funcs/combinationsFunc.py | 1 - mathgenerator/funcs/compareFractionsFunc.py | 4 +- mathgenerator/funcs/compoundInterestFunc.py | 13 +- mathgenerator/funcs/confidenceIntervalFunc.py | 10 +- mathgenerator/funcs/dataSummaryFunc.py | 10 +- mathgenerator/funcs/distanceTwoPointsFunc.py | 2 +- mathgenerator/funcs/divideFractionsFunc.py | 2 +- mathgenerator/funcs/exponentiationFunc.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 4 +- mathgenerator/funcs/geomProgrFunc.py | 17 +- mathgenerator/funcs/geometricMeanFunc.py | 8 +- mathgenerator/funcs/harmonicMeanFunc.py | 8 +- mathgenerator/funcs/hcfFunc.py | 2 +- .../funcs/intersectionOfTwoLinesFunc.py | 18 +- mathgenerator/funcs/isTriangleValidFunc.py | 4 +- mathgenerator/funcs/linearEquationsFunc.py | 10 +- mathgenerator/funcs/matrixInversion.py | 28 +- .../funcs/matrixMultiplicationFunc.py | 2 +- mathgenerator/funcs/meanMedianFunc.py | 4 +- .../funcs/multiplyComplexNumbersFunc.py | 3 +- mathgenerator/funcs/multiplyFractionsFunc.py | 2 +- mathgenerator/funcs/nthFibonacciNumberFunc.py | 6 +- mathgenerator/funcs/percentageFunc.py | 2 +- mathgenerator/funcs/profitLossPercentFunc.py | 6 +- mathgenerator/funcs/quadraticEquation.py | 9 +- mathgenerator/funcs/sectorAreaFunc.py | 2 +- mathgenerator/funcs/simpleInterestFunc.py | 6 +- mathgenerator/funcs/systemOfEquationsFunc.py | 5 +- mathgenerator/funcs/vectorCrossFunc.py | 7 +- mathgenerator/funcs/volumeSphereFunc.py | 2 +- mathgenerator/mathgen.py | 313 +++++++++++------- setup.py | 25 +- tests/test_mathgen.py | 3 +- 41 files changed, 347 insertions(+), 240 deletions(-) diff --git a/makeReadme.py b/makeReadme.py index 35c3b8a..7a7a66d 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -9,7 +9,7 @@ with open('mathgenerator/mathgen.py', 'r') as f: allRows = [] # get the first line of the functions in mathgen.py -line = lines.index('# Funcs_start - DO NOT REMOVE!\n')+1 +line = lines.index('# Funcs_start - DO NOT REMOVE!\n') + 1 for item in wList: myGen = item[2] # NOTE: renamed 'sol' to 'solu' to make it look nicer @@ -41,7 +41,7 @@ with open('README.md', "r") as g: lines = g.readlines() line = lines.index('[//]: # list start\n') - lines = lines[:line+1] + lines = lines[:line + 1] for row in allRows: tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str( diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 01875a9..0a261d0 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,4 +1,3 @@ - genList = [] @@ -12,7 +11,9 @@ class Generator: genList.append([id, title, self]) def __str__(self): - return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + return str( + self.id + ) + " " + self.title + " " + self.generalProb + " " + self.generalSol def __call__(self, **kwargs): return self.func(**kwargs) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index f9be9aa..8f05a4f 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -3,22 +3,22 @@ from .__init__ import * def DiceSumProbFunc(maxDice=3): a = random.randint(1, maxDice) - b = random.randint(a, 6*a) + b = random.randint(a, 6 * a) count = 0 for i in [1, 2, 3, 4, 5, 6]: if a == 1: if i == b: - count = count+1 + count = count + 1 elif a == 2: for j in [1, 2, 3, 4, 5, 6]: - if i+j == b: - count = count+1 + if i + j == b: + count = count + 1 elif a == 3: for j in [1, 2, 3, 4, 5, 6]: for k in [1, 2, 3, 4, 5, 6]: - if i+j+k == b: - count = count+1 + 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) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index b0cc39e..7ef9c50 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -77,8 +77,8 @@ from .absoluteDifferenceFunc import * from .vectorDotFunc import * from .binary2sComplement import * from .matrixInversion import * -from .sectorAreaFunc import* -from .meanMedianFunc import* +from .sectorAreaFunc import * +from .meanMedianFunc import * from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index 8506b55..a795a99 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -7,7 +7,7 @@ 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 + area = (s * (s - a) * (s - b) * (s - c))**0.5 problem = "Area of triangle with side lengths: " + \ str(a) + " " + str(b) + " " + str(c) + " = " diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index 1d927ef..d11000d 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -8,7 +8,7 @@ def basicAlgebraFunc(maxVariable=10): # calculate gcd def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 8ce32a4..520b8a3 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -2,15 +2,23 @@ from .__init__ import * # Handles degrees in quadrant one -def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], functions=["sin", "cos", "tan"]): +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"} + expression = 'math.' + function + '(math.radians(angle))' + result_fraction_map = { + 0.0: "0", + 0.5: "1/2", + 0.71: "1/√2", + 0.87: "√3/2", + 1.0: "1", + 0.58: "1/√3", + 1.73: "√3" + } solution = result_fraction_map[round(eval(expression), 2)] if round( eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 1dbb1b2..009feea 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -10,6 +10,6 @@ def binaryComplement1sFunc(maxDigits=10): question += temp answer += "0" if temp == "1" else "1" - problem = question+"=" + problem = question + "=" solution = answer return problem, solution diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index 6ea2e6d..f213222 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -2,7 +2,6 @@ from .__init__ import * def combinationsFunc(maxlength=20): - def factorial(a): d = 1 for i in range(a): diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index 56c4714..1c4072a 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -15,9 +15,9 @@ def compareFractionsFunc(maxVal=10): first = a / b second = c / d - if(first > second): + if (first > second): solution = ">" - elif(first < second): + elif (first < second): solution = "<" else: solution = "=" diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 59cac26..7914828 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,13 +1,18 @@ from .__init__ import * -def compoundInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10, maxPeriod=10): +def compoundInterestFunc(maxPrinciple=10000, + maxRate=10, + maxTime=10, + maxPeriod=10): p = random.randint(100, maxPrinciple) r = random.randint(1, maxRate) t = random.randint(1, maxTime) n = random.randint(1, maxPeriod) - A = p * ((1 + (r/(100*n))**(n*t))) - problem = "Compound Interest for a principle amount of " + str(p) + " dollars, " + str( - r) + "% rate of interest and for a time period of " + str(t) + " compounded monthly is = " + A = p * ((1 + (r / (100 * n))**(n * t))) + problem = "Compound Interest for a principle amount of " + str( + p) + " dollars, " + str( + r) + "% rate of interest and for a time period of " + str( + t) + " compounded monthly is = " solution = round(A, 2) return problem, solution diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index babdabe..b631caf 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -16,16 +16,16 @@ def confidenceIntervalFunc(): count = i + mean mean = count - mean = mean/n + mean = mean / n for i in lst: - x = (i-mean)**2+sd + x = (i - mean)**2 + sd sd = x - sd = sd/n - standard_error = lst_t[j]*math.sqrt(sd/n) + sd = sd / n + standard_error = lst_t[j] * math.sqrt(sd / n) problem = 'The confidence interval for sample {} with {}% confidence is'.format( [x for x in lst], lst_per[j]) - solution = '({}, {})'.format(mean+standard_error, mean-standard_error) + solution = '({}, {})'.format(mean + standard_error, mean - standard_error) return problem, solution diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index e0e0bad..1059b1f 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -9,20 +9,20 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): random_list.append(n) a = sum(random_list) - mean = a/number_values + mean = a / number_values var = 0 for i in range(number_values): - var += (random_list[i]-mean)**2 + var += (random_list[i] - mean)**2 # we're printing stuff here? print(random_list) print(mean) - print(var/number_values) - print((var/number_values)**0.5) + print(var / number_values) + print((var / number_values)**0.5) problem = "Find the mean,standard deviation and variance for the data" + \ str(random_list) solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format( - mean, var/number_values, (var/number_values)**0.5) + mean, var / number_values, (var / number_values)**0.5) return problem, solution diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 7bd1ef2..9fa85c8 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -7,7 +7,7 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): point2X = random.randint(minValXY, maxValXY + 1) point2Y = random.randint(minValXY, maxValXY + 1) - distanceSq = (point1X - point2X) ** 2 + (point1Y - point2Y) ** 2 + distanceSq = (point1X - point2X)**2 + (point1Y - point2Y)**2 solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 0f6bf30..970b28f 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -14,7 +14,7 @@ def divideFractionsFunc(maxVal=10): d = random.randint(1, maxVal) def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index d58f00d..a74f378 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -6,5 +6,5 @@ def exponentiationFunc(maxBase=20, maxExpo=10): expo = random.randint(1, maxExpo) problem = f"{base}^{expo} =" - solution = str(base ** expo) + solution = str(base**expo) return problem, solution diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index c043567..a66e2f4 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -10,12 +10,12 @@ def fibonacciSeriesFunc(minNo=1): if i < 2: l.append(i) else: - val = l[i-1]+l[i-2] + val = l[i - 1] + l[i - 2] l.append(val) return l fibList = createFibList(n) - problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" + problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 70d3dcc..7c80a7e 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,18 +1,23 @@ from .__init__ import * -def geomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term=5): +def geomProgrFunc(number_values=6, + min_value=2, + max_value=12, + n_term=7, + sum_term=5): r = random.randint(min_value, max_value) a = random.randint(min_value, max_value) n_term = random.randint(number_values, number_values + 5) sum_term = random.randint(number_values, number_values + 5) GP = [] for i in range(number_values): - GP.append(a * (r ** i)) - problem = "For the given GP " + str(GP) + " ,Find the value of a,common ratio,"+str( - n_term) + "th term value, sum upto " + str(sum_term) + "th term" - value_nth_term = a * (r ** (n_term - 1)) - sum_till_nth_term = a * ((r ** sum_term - 1)/(r - 1)) + GP.append(a * (r**i)) + problem = "For the given GP " + str( + GP) + " ,Find the value of a,common ratio," + str( + n_term) + "th term value, sum upto " + str(sum_term) + "th term" + value_nth_term = a * (r**(n_term - 1)) + sum_till_nth_term = a * ((r**sum_term - 1) / (r - 1)) 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 diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 07dc4cd..0980979 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -8,13 +8,13 @@ def geometricMeanFunc(maxValue=100, maxNum=4): d = random.randint(1, maxValue) num = random.randint(2, 4) if num == 2: - product = a*b + product = a * b elif num == 3: - product = a*b*c + product = a * b * c elif num == 4: - product = a*b*c*d + product = a * b * c * d - ans = product**(1/num) + ans = product**(1 / num) if num == 2: problem = f"Geometric mean of {num} numbers {a} and {b} = " solution = f"({a}*{b})^(1/{num}) = {ans}" diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 1c9e397..8aefb41 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -9,13 +9,13 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): d = random.randint(1, maxValue) num = random.randint(2, 4) if num == 2: - sum = (1/a)+(1/b) + sum = (1 / a) + (1 / b) elif num == 3: - sum = (1/a)+(1/b)+(1/c) + sum = (1 / a) + (1 / b) + (1 / c) elif num == 4: - sum = (1/a)+(1/b)+(1/c)+(1/d) + sum = (1 / a) + (1 / b) + (1 / c) + (1 / d) - ans = num/sum + ans = num / sum if num == 2: problem = f"Harmonic mean of {num} numbers {a} and {b} = " solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index a9f4e96..047fb0c 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -5,7 +5,7 @@ def hcfFunc(maxVal=20): a = random.randint(1, maxVal) b = random.randint(1, maxVal) x, y = a, b - while(y): + while (y): x, y = y, x % y problem = f"HCF of {a} and {b} = " solution = str(x) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index 2e6fbb6..eda508e 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -1,10 +1,12 @@ from .__init__ import * -def intersectionOfTwoLinesFunc( - minM=-10, maxM=10, minB=-10, maxB=10, minDenominator=1, maxDenominator=6 -): - +def intersectionOfTwoLinesFunc(minM=-10, + maxM=10, + minB=-10, + maxB=10, + minDenominator=1, + maxDenominator=6): def generateEquationString(m, b): """ Generates an equation given the slope and intercept. @@ -33,10 +35,10 @@ def intersectionOfTwoLinesFunc( x = f"{x.numerator}/{x.denominator}" return x - m1 = (random.randint(minM, maxM), random.randint( - minDenominator, maxDenominator)) - m2 = (random.randint(minM, maxM), random.randint( - minDenominator, maxDenominator)) + m1 = (random.randint(minM, + maxM), random.randint(minDenominator, maxDenominator)) + m2 = (random.randint(minM, + maxM), random.randint(minDenominator, maxDenominator)) b1 = random.randint(minB, maxB) b2 = random.randint(minB, maxB) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index 304c549..13c7240 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -9,8 +9,8 @@ def isTriangleValidFunc(maxSideLength=50): 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: diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index 14a65f1..e2eeb26 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -9,14 +9,16 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): vars = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'e', 'f', 'g'][:n] 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)]) - prob = ["{}{}".format(coeff[i], vars[i]) if coeff[i] - != 0 else "" for i in range(n)] + prob = [ + "{}{}".format(coeff[i], vars[i]) if coeff[i] != 0 else "" + for i in range(n) + ] while "" in prob: prob.remove("") diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 28080e5..72c01ca 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -2,7 +2,9 @@ from .__init__ import * import sympy -def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerElementsInInvertedMatrix=False): +def matrixInversion(SquareMatrixDimension=3, + MaxMatrixElement=99, + OnlyIntegerElementsInInvertedMatrix=False): if OnlyIntegerElementsInInvertedMatrix is True: isItOk = False Mat = list() @@ -16,20 +18,25 @@ def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerEle Mat.append(z) MaxAllowedMatrixElement = math.ceil( pow(MaxMatrixElement, 1 / (SquareMatrixDimension))) - randomlist = random.sample( - range(0, MaxAllowedMatrixElement + 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])] + 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])] + 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])] + Mat[i] = [ + sum(i) for i in zip(Mat[SquareMatrixDimension - 1], Mat[i]) + ] isItOk = True for i in Mat: @@ -52,7 +59,8 @@ def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerEle randomlist = list(sympy.primerange(0, MaxMatrixElement + 1)) plist = random.sample(randomlist, SquareMatrixDimension) randomlist = random.sample( - range(0, MaxMatrixElement + 1), SquareMatrixDimension * SquareMatrixDimension) + range(0, MaxMatrixElement + 1), + SquareMatrixDimension * SquareMatrixDimension) randomlist = list(set(randomlist) - set(plist)) n_list = random.sample( randomlist, SquareMatrixDimension * (SquareMatrixDimension - 1)) diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index 727112e..e2e382f 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -46,7 +46,7 @@ def matrixMultiplicationFuncHelper(inp): for i in range(m): for j in range(n): string += f"{inp[i][j]: 6d}" - string += ", "if j < n - 1 else "" + string += ", " if j < n - 1 else "" string += "]\n [" if i < m - 1 else "" string += "]]" diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 36fc986..4b17846 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -6,9 +6,9 @@ def meanMedianFunc(maxlen=10): total = 0 for n in randomlist: total = total + n - mean = total/10 + 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 + 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 diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index 69ca238..f1842c2 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,7 +1,8 @@ from .__init__ import * -def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, maxRealImaginaryNum=20): +def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, + maxRealImaginaryNum=20): num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum)) num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 67c5017..1ec38bb 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -14,7 +14,7 @@ def multiplyFractionsFunc(maxVal=10): d = random.randint(1, maxVal) def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index d559f1f..a1a66fb 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -2,10 +2,10 @@ from .__init__ import * def nthFibonacciNumberFunc(maxN=100): - golden_ratio = (1 + math.sqrt(5))/2 + golden_ratio = (1 + math.sqrt(5)) / 2 n = random.randint(1, maxN) problem = f"What is the {n}th Fibonacci number?" - ans = round((math.pow(golden_ratio, n) - - math.pow(-golden_ratio, -n))/(math.sqrt(5))) + ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / + (math.sqrt(5))) solution = f"{ans}" return problem, solution diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index e69749d..f064f2a 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -5,7 +5,7 @@ def percentageFunc(maxValue=99, maxpercentage=99): a = random.randint(1, maxpercentage) b = random.randint(1, maxValue) problem = f"What is {a}% of {b}?" - percentage = a/100*b + percentage = a / 100 * b formatted_float = "{:.2f}".format(percentage) solution = f"Required percentage = {formatted_float}%" return problem, solution diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index 49d7f27..da99f94 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -4,12 +4,12 @@ from .__init__ import * def profitLossPercentFunc(maxCP=1000, maxSP=1000): cP = random.randint(1, maxCP) sP = random.randint(1, maxSP) - diff = abs(sP-cP) - if (sP-cP >= 0): + diff = abs(sP - cP) + if (sP - cP >= 0): profitOrLoss = "Profit" else: profitOrLoss = "Loss" - percent = diff/cP * 100 + percent = diff / cP * 100 problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: " solution = percent diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 73f0ea4..7f784fc 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -4,11 +4,12 @@ from .__init__ import * 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 diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index d7f9545..c2ab0bf 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -5,7 +5,7 @@ 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) + secArea = float((Angle / 360) * math.pi * Radius * Radius) formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index 08b0f3b..30ca938 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -7,7 +7,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): 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 diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index 2e82f5f..ef63c73 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -10,8 +10,9 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): c2 = [0, 1, y] def randNonZero(): - return random.choice([i for i in range(-coeff_mult_range, coeff_mult_range) - if i != 0]) + return random.choice( + [i for i in range(-coeff_mult_range, coeff_mult_range) if i != 0]) + # Add random (non-zero) multiple of equations (rows) to each other c1_mult = randNonZero() c2_mult = randNonZero() diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 21bcb0e..7506283 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -4,9 +4,10 @@ from .__init__ import * def vectorCrossFunc(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[1] * b[2] - a[2] * b[1], - a[2] * b[0] - a[0] * b[2], - a[0] * b[1] - a[1] * b[0]] + c = [ + a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], + a[0] * b[1] - a[1] * b[0] + ] problem = str(a) + " X " + str(b) + " = " solution = str(c) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 137db4f..1f94c7f 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -5,6 +5,6 @@ def volumeSphereFunc(maxRadius=100): r = random.randint(1, maxRadius) problem = f"Volume of sphere with radius {r} m = " - ans = (4*math.pi/3)*r*r*r + ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index dc29a6e..a9b2a98 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -19,7 +19,9 @@ class Generator: genList.append([id, title, self]) def __str__(self): - return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + return str( + self.id + ) + " " + self.title + " " + self.generalProb + " " + self.generalSol def __call__(self, **kwargs): return self.func(**kwargs) @@ -28,167 +30,240 @@ class Generator: # || Non-generator Functions def genById(id): generator = genList[id][2] - return(generator()) + return (generator()) + # # def getGenList(): # return(genList) - # 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) +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) + 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) + "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) + "((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) + "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) + "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) + "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) + "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) +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("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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "(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) + "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) + "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) + "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) + "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) + "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) + "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) 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) -decimalToHexadeci = Generator( - "Decimal to Hexadecimal", 79, "Binary of a=", "b", deciToHexaFunc) -percentage = Generator("Percentage of a number", 80, - "What is a% of b?", "percentage", percentageFunc) + "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) +decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", + "b", deciToHexaFunc) +percentage = Generator("Percentage of a number", 80, "What is a% of b?", + "percentage", percentageFunc) diff --git a/setup.py b/setup.py index 981b662..4bfbcd0 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,12 @@ from setuptools import setup, find_packages -setup( - name='mathgenerator', - version='1.1.3', - description='An open source solution for generating math problems', - url='https://github.com/todarith/mathgenerator', - author='Luke Weiler', - author_email='lukew25073@gmail.com', - license='MIT', - packages=find_packages(), - install_requires=[ - - ], - entry_points={ - } -) +setup(name='mathgenerator', + version='1.1.3', + description='An open source solution for generating math problems', + url='https://github.com/todarith/mathgenerator', + author='Luke Weiler', + author_email='lukew25073@gmail.com', + license='MIT', + packages=find_packages(), + install_requires=[], + entry_points={}) diff --git a/tests/test_mathgen.py b/tests/test_mathgen.py index 7555131..ed9066b 100644 --- a/tests/test_mathgen.py +++ b/tests/test_mathgen.py @@ -39,7 +39,8 @@ def test_moduloDivision(maxRes, maxModulo): assert eval(problem[:-1]) == int(solution) -@given(minNo=st.integers(min_value=1), maxNo=st.integers(min_value=1, max_value=2 ** 50)) +@given(minNo=st.integers(min_value=1), + maxNo=st.integers(min_value=1, max_value=2**50)) def test_squareRoot(minNo, maxNo): assume(maxNo > minNo) problem, solution = squareRoot.func(minNo, maxNo) From 4f03d1b035350372789e76c41aa2f0e4e46a0b4f Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:14:08 -0400 Subject: [PATCH 13/24] linter fix --- mathgenerator/funcs/binary2sComplement.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 10 +++++----- mathgenerator/funcs/nthFibonacciNumberFunc.py | 3 +-- mathgenerator/mathgen.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 478b2c9..01af731 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -20,7 +20,7 @@ def binary2sComplementFunc(maxDigits=10): answer[j] = '0' j -= 1 - if j == 0 and carry == True: + if j == 0 and carry is True: answer.insert(0, '1') problem = "2's complement of " + question + " =" diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index a66e2f4..60391cb 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -5,14 +5,14 @@ def fibonacciSeriesFunc(minNo=1): n = random.randint(minNo, 20) def createFibList(n): - l = [] + list = [] for i in range(n): if i < 2: - l.append(i) + list.append(i) else: - val = l[i - 1] + l[i - 2] - l.append(val) - return l + val = list[i - 1] + list[i - 2] + list.append(val) + return list fibList = createFibList(n) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index a1a66fb..b7475ee 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -5,7 +5,6 @@ def nthFibonacciNumberFunc(maxN=100): golden_ratio = (1 + math.sqrt(5)) / 2 n = random.randint(1, maxN) problem = f"What is the {n}th Fibonacci number?" - ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / - (math.sqrt(5))) + ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / (math.sqrt(5))) solution = f"{ans}" return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index a9b2a98..faa6cac 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -40,7 +40,7 @@ def genById(id): # 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) +# addition = Generator("Addition", 0, "a+b=", "c", additionFunc) subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc) From d628e2fb206dfa400a342ead802fa7fb398faa04 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:17:56 -0400 Subject: [PATCH 14/24] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7cf0eb..016ce41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,6 +35,7 @@ We currently just underwent a large reconstruction of the repository. Here is ho * Place `.__init__ import *` at the top of your file and then write your function in the lines beneath it * Add `from .<yourfunc> import *` at the bottom of the `__init__.py` file inside the funcs directory +If you have issues with checks you can try using yapf to fix linter errors or just go through them line by line. ### Provide Ideas If you have an idea for a generator but don't have the time or know-how to create it, you can add it as an issue. If you have a lot of ideas, I would suggest adding them to the table in README.md so that they are easier for our team to manage. From 9866c772f965557268aff073a9d7752a0cc03c55 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:19:09 -0400 Subject: [PATCH 15/24] Fixed string formatting... my bad --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index fd2ca82..1e2b8f5 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -4,7 +4,7 @@ from ..__init__ import Generator def celsiustofahrenheit(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 - problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" + problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit = " solution = str(fahrenheit) return problem, solution From c81d89bf25c5b554fed355f9641e77c1d62e4b7a Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:20:06 -0400 Subject: [PATCH 16/24] Update celsiustofahrenheit.py --- mathgenerator/funcs/celsiustofahrenheit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index fd2ca82..641663f 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -1,11 +1,11 @@ from .__init__ import * from ..__init__ import Generator -def celsiustofahrenheit(maxTemp=100): +def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit) +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) From 464478676a3b4388a9cbac14e191c76d72b3cb44 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:21:25 -0400 Subject: [PATCH 17/24] Fixed string formatting... my bad --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index 57a9f69..0e66be8 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -5,7 +5,7 @@ from ..__init__ import Generator def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9 / 5)) + 32 - problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" + problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution From f204de60f6a3d445e612890eb0ba1179efd596fb Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:24:24 -0400 Subject: [PATCH 18/24] linter fix --- mathgenerator/funcs/__init__.py | 1 + mathgenerator/funcs/celsiustofahrenheit.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 7ef9c50..83702eb 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -83,3 +83,4 @@ from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * +from .celsiustofahrenheit import * diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index 641663f..57a9f69 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -1,11 +1,14 @@ -from .__init__ import * +from .__init__ import * from ..__init__ import Generator + def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) - fahrenheit = (celsius * (9/5)) +32 + fahrenheit = (celsius * (9 / 5)) + 32 problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) + +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) From 339e279d0a929925d9ddef5283bd852cc6deab2e Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:02:18 +0400 Subject: [PATCH 19/24] =?UTF-8?q?=F0=9F=9B=A0=20some=20readme=20fixup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makeReadme.py | 23 +++++++++++++------ .../funcs/matrixMultiplicationFunc.py | 8 +++---- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/makeReadme.py b/makeReadme.py index 7692e35..9a4b762 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -2,6 +2,17 @@ # NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * +def array2markdown_table(string): + string = string.replace("[[", "<table><tr><td>") + string = string.replace("[", "<tr><td>") + string = string.replace(", ", "</td><td>") + string = string.replace("]]", "</td></tr></table>") + string = string.replace("]", "</td></tr>") + string = string.replace(" ", "") + string = string.replace("\n", "") + return string + + wList = getGenList() lines = [] with open('mathgenerator/mathgen.py', 'r') as f: @@ -17,13 +28,11 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - prob = prob.replace("[[", "<table><tr><td>") - prob = prob.replace("[", "<tr><td>") - prob = prob.replace(", ", "</td><td>") - prob = prob.replace("]]\n", "</td></tr></table>") - prob = prob.replace("]\n", "</td></tr>") - prob = prob.replace(" ", "") - prob = prob.replace("\n", "") + prob, solu = myGen(10, 4) + prob = str(prob).rstrip("\n") + solu = str(solu).rstrip("\n") + prob = array2markdown_table(prob) + solu = array2markdown_table(solu) instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index eeaa265..ffddb57 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def matrixMultiplicationFunc(maxVal=100): - m = random.randint(2, 10) - n = random.randint(2, 10) - k = random.randint(2, 10) +def matrixMultiplicationFunc(maxVal=100, max_dim=10): + m = random.randint(2, max_dim) + n = random.randint(2, max_dim) + k = random.randint(2, max_dim) # generate matrices a and b a = [] From 47b9c594fa10d9caf10d8e0cb28dfec19ccdf5d8 Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:06:34 +0400 Subject: [PATCH 20/24] =?UTF-8?q?=E2=AC=86=20updated=20readme=20and=20?= =?UTF-8?q?=E2=9E=95=20added=20*args=20to=20Generator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 169 +++++++++++++++++++-------------------- mathgenerator/mathgen.py | 4 +- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index dbf463c..56c81cf 100644 --- a/README.md +++ b/README.md @@ -31,88 +31,87 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 23+50= | 73 | addition | -| 1 | Subtraction | 68-41= | 27 | subtraction | -| 2 | Multiplication | 51*1= | 51 | multiplication | -| 3 | Division | 37/44= | 0.8409090909090909 | division | -| 4 | Binary Complement 1s | 01= | 10 | binaryComplement1s | -| 5 | Modulo Division | 49%54= | 49 | moduloDivision | -| 6 | Square Root | sqrt(16)= | 4 | squareRoot | -| 7 | Power Rule Differentiation | 1x^6 + 8x^4 + 5x^5 | 6x^5 + 32x^3 + 25x^4 | powerRuleDifferentiation | -| 8 | Square | 2^2= | 4 | square | -| 9 | LCM (Least Common Multiple) | LCM of 13 and 1 = | 13 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 8 = | 2 | gcd | -| 11 | Basic Algebra | 1x + 6 = 8 | 2 | basicAlgebra | -| 12 | Logarithm | log2(256) | 8 | log | -| 13 | Easy Division | 96/4 = | 24 | intDivision | -| 14 | Decimal to Binary | Binary of 12= | 1100 | decimalToBinary | -| 15 | Binary to Decimal | 010010100 | 148 | binaryToDecimal | -| 16 | Fraction Division | (5/10)/(5/2) | 1/5 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[2, 6], [6, 6]] = | [[2,6],[6,6]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 20 = | 97.48846085563153 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 30, 30 and 47 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (-8,11),(2,3)= | (-3.0,7.0) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-3x-28 | (x+4)(x-7) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 59 and 50 = | 71 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | 3x + 7y = -61, 6x + 7y = -52 | x = 3, y = -10 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (-10, -6) and (-2, 14) | sqrt(464) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 13 = | 21.40 | pythagoreanTheorem | -| 26 | Linear Equations | -2x + 9y = 16 --15x + 3y = -267 | x = 19, y = 6 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 94 | [2, 47] | primeFactors | -| 28 | Fraction Multiplication | (8/10)*(10/7) | 8/7 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 19 sides | 161.05 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 14 objects picked 8 at a time | 3003 | combinations | -| 31 | Factorial | 5! = | 120 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 9m, 16m, 12m is | 888 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 41m and radius = 11m is | 3593 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 2m, 8m, 14m is | 224 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 43m and radius = 15m is | 30394 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 49m and radius = 2m is | 320 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 31m and radius = 17m is | 9381 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 55 and 82 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 0/4x + 1 and y = 3/5x - 9 | (50/3, 1) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 11 objects picked 0 at a time = | 1 | permutations | -| 43 | Cross Product of 2 Vectors | [16, -20, -19] X [-16, -13, -11] = | [-27, 480, -528] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 6/7 and 8/5? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 7762 dollars, 2% rate of interest and for a time period of 2 years is = | 310.48 | simpleInterest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>18</td><td>-56</td><td>97</td><td>-66</td><td>-25</td><td>55</td><td>-99</td><td>86</td></tr><tr><td>2</td><td>-45</td><td>27</td><td>-87</td><td>-30</td><td>-15</td><td>93</td><td>-62</td></tr><tr><td>83</td><td>-25</td><td>55</td><td>-8</td><td>75</td><td>-34</td><td>-71</td><td>-22</td></tr><tr><td>-75</td><td>94</td><td>-6</td><td>84</td><td>-88</td><td>-38</td><td>60</td><td>98</td></tr><tr><td>20</td><td>-48</td><td>74</td><td>-73</td><td>-81</td><td>-25</td><td>60</td><td>-93</td></tr><tr><td>-23</td><td>-89</td><td>-63</td><td>90</td><td>36</td><td>30</td><td>18</td><td>19</td></tr><tr><td>-21</td><td>15</td><td>89</td><td>35</td><td>-60</td><td>-53</td><td>-85</td><td>22</td></tr><tr><td>-70</td><td>-76</td><td>-37</td><td>-98</td><td>-73</td><td>77</td><td>81</td><td>72</td></tr></table>and<table><tr><td>-14</td><td>13</td></tr><tr><td>-78</td><td>96</td></tr><tr><td>-17</td><td>95</td></tr><tr><td>72</td><td>69</td></tr><tr><td>67</td><td>41</td></tr><tr><td>85</td><td>49</td></tr><tr><td>-64</td><td>38</td></tr><tr><td>36</td><td>-44]] | [[ 10147, -6357] - [-14710, -3435] - [ 5164, 3031] - [ -9570, 5773] - [-17790, -529] - [ 19309, -5824] - [ -2162, 2782] - [ -457, -17793]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 402 upto 2 decimal places is: | 7.38 | CubeRoot | -| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 171 , 62, 4 = | 123 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+159x+79=0 | [-0.89, -1.12] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 18 and 16 = | 2 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 10 = | 27/216 | diceSumProbability | -| 53 | Exponentiation | 5^9 = | 1953125 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [259, 228, 251, 245, 222, 216, 209, 288, 229, 249, 278, 226, 256, 263, 248, 211, 210, 270, 260, 269] with 99% confidence is | (257.86513442744837, 230.83486557255162) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 70^(1/7) _ 61^(1/6) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 16 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610] | fibonacciSeries | -| 57 | Trigonometric Values | What is sin(45)? | 1/√2 | basicTrigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[48, 46, 29, 28, 17, 48, 24, 23, 5, 9, 27, 33, 46, 7, 36] | The Mean is 28.4 , Standard Deviation is 201.97333333333336, Variance is 14.211732242528823 | dataSummary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 19m is | 4536.459791783661 m^2 | surfaceAreaSphereGen | -| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphere | -| 62 | nth Fibonacci number | What is the 85th Fibonacci number? | 259695496911123328 | nthFibonacciNumberGen | -| 63 | Profit or Loss Percent | Loss percent when CP = 937 and SP = 72 is: | 92.31590181430096 | profitLossPercent | -| 64 | Binary to Hexidecimal | 1001111 | 0x4f | binaryToHex | -| 65 | Multiplication of 2 complex numbers | (-3+2j) * (-6+7j) = | (4-33j) | complexNumMultiply | -| 66 | Geometric Progression | For the given GP [6, 24, 96, 384, 1536, 6144] ,Find the value of a,common ratio,9th term value, sum upto 9th term | The value of a is 6, common ratio is 4 , 9th term is 393216 , sum upto 9th term is 524286.0 | geometricprogression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 54 , 80 , 35 , 39 = | (54*80*35*39)^(1/4) = 49.27811645529654 | geometricMean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 2 , 84 , 93 , 16 = | 4/((1/2) + (1/84) + (1/93) + (1/16)) = 6.835767022149303 | harmonicMean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[784.3594765936149, 831.2509235672187, 16.078601582030892, 985.0579481288806, 734.7344412338676, 998.0941258783216, 354.94078353536895, 413.5643355103187, 581.4239813447576, 903.949312712381, 806.494025130463] is: | 2432.1700989717465 | eucldianNorm | -| 70 | Angle between 2 vectors | angle between the vectors [689.0197023764115, 694.8793500248185] and [927.4787145023294, 343.6872076155678] is: | NaN | angleBtwVectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers -23 and 44 = | 67 | absoluteDifference | -| 72 | Dot Product of 2 Vectors | [17, 9, 8] . [18, 9, 4] = | 419 | vectorDot | -| 73 | Binary 2's Complement | 2's complement of 101 = | 11 | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[13, 88, 85], [65, 37, 52], [89, 45, 2]]) is: | Matrix([[-1133/167543, 3649/335086, 1431/335086], [2249/167543, -7539/335086, 4849/335086], [-184/167543, 7247/335086, -5239/335086]]) | invertmatrix | -| 75 | Area of a Sector | Given radius, 6 and angle, 328. Find the area of the sector. | Area of sector = 103.04424 | sectorArea | -| 76 | Mean and Median | Given the series of numbers [55, 61, 83, 85, 52, 78, 30, 58, 76, 37]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 61.5 and Arithmetic median of this series is 59.5 | meanMedian | +| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | # addition | +| 0 | Addition | 16+3= | 19 | subtraction | +| 1 | Subtraction | 96-17= | 79 | multiplication | +| 2 | Multiplication | 48*1= | 48 | multiplicationFunc) | +| 3 | Division | 83/97= | 0.8556701030927835 | division | +| 4 | Binary Complement 1s | 1110110111= | 0001001000 | binaryComplement1s | +| 5 | Modulo Division | 91%53= | 38 | binaryComplement1sFunc) | +| 6 | Square Root | sqrt(64)= | 8 | moduloDivision | +| 7 | Power Rule Differentiation | 6x^7 | 42x^6 | squareRoot | +| 8 | Square | 5^2= | 25 | powerRuleDifferentiation | +| 9 | LCM (Least Common Multiple) | LCM of 20 and 10 = | 20 | "(n*m)x^(m-1)", | +| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 20 = | 4 | powerRuleDifferentiationFunc) | +| 11 | Basic Algebra | 9x + 10 = 10 | 0 | square | +| 12 | Logarithm | log3(3) | 1 | lcm | +| 13 | Easy Division | 399/19 = | 21 | lcmFunc) | +| 14 | Decimal to Binary | Binary of 99= | 1100011 | gcd | +| 15 | Binary to Decimal | 011100 | 28 | "c", gcdFunc) | +| 16 | Fraction Division | (6/8)/(4/7) | 21/16 | basicAlgebra | +| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[3, 3], [6, 3]] = | [[6,6],[12,6]] | basicAlgebraFunc) | +| 18 | Area of Triangle | Area of triangle with side lengths: 11 11 17 = | 59.348020186018 | log | +| 19 | Triangle exists check | Does triangle with sides 23, 29 and 34 exist? | Yes | intDivision | +| 20 | Midpoint of the two point | (0,-20),(14,-16)= | (7.0,-18.0) | decimalToBinary | +| 21 | Factoring Quadratic | x^2-5x-36 | (x-9)(x+4) | DecimalToBinaryFunc) | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 32 and 60 = | 88 | binaryToDecimal | +| 23 | Solve a System of Equations in R^2 | 4x - 6y = 14, -7x - 2y = 88 | x = -10, y = -9 | BinaryToDecimalFunc) | +| 24 | Distance between 2 points | Find the distance between (14, -9) and (12, 13) | sqrt(488) | fractionDivision | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 1 = | 13.04 | divideFractionsFunc) | +| 26 | Linear Equations | -12x + 13y = -22 +-1x + -7y = -18 | x = 4, y = 2 | intMatrix22Multiplication | +| 27 | Prime Factorisation | Find prime factors of 2 | [2] | 17, "k * [[a,b],[c,d]] | +| 28 | Fraction Multiplication | (8/6)*(4/10) | 8/15 | "[[k*a,k*b],[k*c,k*d]]", | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | multiplyIntToMatrix22) | +| 30 | Combinations of Objects | Number of combinations from 15 objects picked 7 at a time | 6435 | areaOfTriangle | +| 31 | Factorial | 3! = | 6 | "Area of Triangle with side lengths a, b, c | +| 32 | Surface Area of Cube | Surface area of cube with side = 14m is | 1176 m^2 | "area", areaOfTriangleFunc) | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 17m, 7m, 10m is | 718 m^2 | doesTriangleExist | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 36m and radius = 7m is | 1891 m^2 | "Does triangle with sides a, b and c exist?", | +| 35 | Volum of Cube | Volume of cube with side = 10m is | 1000 m^3 | "Yes/No", isTriangleValidFunc) | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 20m, 17m, 4m is | 1360 m^3 | midPointOfTwoPoint | +| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 1m is | 40 m^3 | "((X1,Y1),(X2,Y2)) | +| 38 | Surface Area of cone | Surface area of cone with height = 17m and radius = 9m is | 798 m^2 | MidPointOfTwoPointFunc) | +| 39 | Volume of cone | Volume of cone with height = 15m and radius = 5m is | 392 m^3 | factoring | +| 40 | Common Factors | Common Factors of 69 and 51 = | [1, 3] | "(x-x1)(x-x2)", factoringFunc) | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6/3x + 9 and y = 6x + 2 | (7/4, 25/2) | thirdAngleOfTriangle | +| 42 | Permutations | Number of Permutations from 14 objects picked 1 at a time = | 14 | "Third Angle of the triangle | +| 43 | Cross Product of 2 Vectors | [19, 17, -9] X [10, -10, -2] = | [-124, -52, -360] | thirdAngleOfTriangleFunc) | +| 44 | Compare Fractions | Which symbol represents the comparison between 10/6 and 10/8? | > | systemOfEquations | +| 45 | Simple Interest | Simple interest for a principle amount of 7091 dollars, 10% rate of interest and for a time period of 4 years is = | 2836.4 | "2x + 5y | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>2</td><td>8</td><td>-4</td><td>5</td></tr><tr><td>6</td><td>-5</td><td>-6</td><td>4</td></tr></table>and<table><tr><td>-5</td><td>1</td><td>-3</td><td>2</td></tr><tr><td>5</td><td>8</td><td>5</td><td>-5</td></tr><tr><td>-6</td><td>-8</td><td>-6</td><td>-7</td></tr><tr><td>-1</td><td>-5</td><td>3</td><td>-7</td></tr></table> | <table><tr><td>49</td><td>73</td><td>73</td><td>-43</td></tr><tr><td>-23</td><td>-6</td><td>5</td><td>51</td></tr></table> | systemOfEquationsFunc) | +| 47 | Cube Root | cuberoot of 951 upto 2 decimal places is: | 9.83 | distance2Point | +| 48 | Power Rule Integration | 10x^1 + 10x^6 + 1x^4 + 1x^6 | (10/1)x^2 + (10/6)x^7 + (1/4)x^5 + (1/6)x^7 + c | "Find the distance between (x1,y1) and (x2,y2)", | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 15 , 191, 94 = | 60 | "sqrt(distanceSquared)", distanceTwoPointsFunc) | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 48x^2+119x+57=0 | [-0.65, -1.83] | pythagoreanTheorem | +| 51 | HCF (Highest Common Factor) | HCF of 5 and 18 = | 1 | "Pythagorean Theorem", 25, | +| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/6 | "The hypotenuse of a right triangle given the other two lengths a and b | +| 53 | Exponentiation | 17^7 = | 410338673 | "hypotenuse", pythagoreanTheoremFunc) | +| 54 | Confidence interval For sample S | The confidence interval for sample [247, 230, 236, 207, 226, 278, 221, 297, 280, 267, 240, 259, 291, 284, 242, 252, 257, 220, 260, 213, 294] with 90% confidence is | (262.13973862175516, 242.71740423538768) | # This has multiple variables whereas #23 has only x and y | +| 55 | Comparing surds | Fill in the blanks 17^(1/2) _ 3^(1/6) | > | linearEquations | +| 56 | Fibonacci Series | The Fibonacci Series of the first 14 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] | "x | +| 57 | Trigonometric Values | What is sin(90)? | 1 | primeFactors | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 7 sides = | 900 | "[b, c, d, ...]", primeFactorsFunc) | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[10, 47, 7, 37, 22, 44, 9, 30, 37, 8, 50, 29, 19, 12, 37] | The Mean is 26.533333333333335 , Standard Deviation is 214.38222222222217, Variance is 14.641797096744039 | fractionMultiplication | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 6m is | 452.3893421169302 m^2 | "(a/b)*(c/d) | +| 61 | Volume of Sphere | Volume of sphere with radius 54 m = | 659583.6608064842 m^3 | multiplyFractionsFunc) | +| 62 | nth Fibonacci number | What is the 5th Fibonacci number? | 5 | angleRegularPolygon | +| 63 | Profit or Loss Percent | Loss percent when CP = 801 and SP = 230 is: | 71.28589263420724 | "Angle of a Regular Polygon", 29, | +| 64 | Binary to Hexidecimal | 101111 | 0x2f | "Find the angle of a regular polygon with 6 sides", "120", | +| 65 | Multiplication of 2 complex numbers | (1+19j) * (-5+10j) = | (-195-85j) | regularPolygonAngleFunc) | +| 66 | Geometric Progression | For the given GP [8, 88, 968, 10648, 117128, 1288408] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 8, common ratio is 11 , 11th term is 207499396808 , sum upto 8th term is 171487104.0 | combinations | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 9 and 18 = | (9*18)^(1/2) = 12.727922061357855 | "Combinations of Objects", 30, | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 59 and 8 = | 2/((1/59) + (1/8)) = 14.08955223880597 | "Combinations available for picking 4 objects at a time from 6 distinct objects | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[868.2223524505417, 443.64852085459694, 828.1090462421802] is: | 1279.217986044348 | " 15", combinationsFunc) | +| 70 | Angle between 2 vectors | angle between the vectors [47.34750277983446, 802.0548522330859, 163.10760759590525, 544.7736923139344, 595.2668887448631, 781.8577226989729, 505.92984665962115, 212.21898772758718, 417.09503653850567, 498.8451357914803, 216.11050052884383, 316.85172611004697, 531.4467890864679] and [551.4845648456056, 524.0267675199452, 252.30514761182056, 256.4954536977715, 423.09002486817883, 861.6683390714214, 210.90265341510906, 918.3205871874211, 539.9315722140092, 988.4812675617247, 885.1803007416202, 566.6430154592439, 851.2210274645834] is: | NaN | factorial | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 51 and 3 = | 48 | surfaceAreaCubeGen | +| 72 | Dot Product of 2 Vectors | [4, 20, 12] . [15, 11, 9] = | 388 | "Surface area of cube with side a units is", | +| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | "b units^2", surfaceAreaCube) | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[2, 25, 60], [29, 30, 28], [23, 73, 95]]) is: | Matrix([[806/34457, 2005/34457, -1100/34457], [-2111/34457, -1190/34457, 1684/34457], [1427/34457, 429/34457, -665/34457]]) | surfaceAreaCuboidGen | +| 75 | Area of a Sector | Given radius, 28 and angle, 317. Find the area of the sector. | Area of sector = 2168.81594 | "Surface Area of Cuboid", 33, | +| 76 | Mean and Median | Given the series of numbers [67, 33, 40, 90, 81, 12, 91, 80, 5, 66]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 56.5 and Arithmetic median of this series is 66.5 | "Surface area of cuboid with sides | +| 77 | Determinant to 2x2 Matrix | Det([[10, 0], [95, 32]]) = | 320 | "d units^2", surfaceAreaCuboid) | +| 78 | Compound Interest | Compound Interest for a principle amount of 4156 dollars, 8% rate of interest and for a time period of 7 compounded monthly is = | 4156.0 | surfaceAreaCylinderGen | +| 79 | Decimal to Hexadecimal | Binary of 143= | 0x8f | "Surface Area of Cylinder", 34, | +| 80 | Percentage of a number | What is 49% of 13? | Required percentage = 6.37% | "Surface area of cylinder with height | +| 81 | Celsius To Fahrenheit | Convert 39 degrees Celsius to degrees Fahrenheit = | 102.2 | "c units^2", surfaceAreaCylinder) | diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index f679b0c..c5937db 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -23,8 +23,8 @@ class Generator: self.id ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) # || Non-generator Functions From ddc42a5638cce8d1df020a0909ff6a45d88c6b2c Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:44:41 +0530 Subject: [PATCH 21/24] Split AP into 2 funcs and reorganized --- mathgenerator/funcs/__init__.py | 2 ++ mathgenerator/funcs/arithmeticProgressionSumFunc.py | 1 + mathgenerator/funcs/arithmeticProgressionTermFunc.py | 3 ++- mathgenerator/mathgen.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 83702eb..bf9803e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -84,3 +84,5 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * +from .arithmeticProgressionSumFunc import * +from .arithmeticProgressionTermFunc import * diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index ca2ada3..d7e5589 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,5 +1,6 @@ from .__init__ import * + def arithmeticProgressionSumFunc (maxd = 100, maxa = 100, maxn = 100): d = random.randint (-1 * maxd, maxd) a1 = random.randint (-1 * maxa, maxa) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index f6662d5..9905b2b 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,5 +1,6 @@ from .__init__ import * + def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): d = random.randint (-1 * maxd, maxd) a1 = random.randint (-1 * maxa, maxa) @@ -9,4 +10,4 @@ def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString solution = a1 + ((n-1)*d) - return problen, solution + return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index f9ef504..1e9b4d7 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -275,4 +275,4 @@ arithmeticProgressionTerm = Generator ("AP Term Calculation", 82, arithmeticProgressionSum = Generator ("AP Sum Calculation", 83, "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) \ No newline at end of file + "Sum", arithmeticProgressionSumFunc) From a9c4249273eb72122add03fc04a7aff47366e1d0 Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:19:11 +0400 Subject: [PATCH 22/24] =?UTF-8?q?=E2=AC=9C=E2=AC=9C=20whitespace=20?= =?UTF-8?q?=E2=AC=9C=E2=AC=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 6 +++--- mathgenerator/funcs/euclidianNormFunc.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9414a0b..e5dca74 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IGNORE_ERRORS = E501,F401,F403,F405 PKG = mathgenerator format: - python -m autopep8 --ignore=$(IGNORE_ERRORS) -i $(PKG)/* + python -m autopep8 --ignore=$(IGNORE_ERRORS) -ir $(PKG)/* lint: python -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG) diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index b02b496..927ca38 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -3,18 +3,18 @@ from .__init__ import * def angleBtwVectorsFunc(maxEltAmt=20): s = 0 - v1 = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + v1 = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] v2 = [random.uniform(0, 1000) for i in v1] for i in v1: for j in v2: s += i * j - mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) problem = f"angle between the vectors {v1} and {v2} is:" solution = '' try: solution = str(math.acos(s / mags)) - except: + except MathDomainError: print('angleBtwVectorsFunc has some issues with math module, line 16') solution = 'NaN' # would return the answer in radians diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index 6a414a9..28c85c5 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -2,7 +2,7 @@ from .__init__ import * def euclidianNormFunc(maxEltAmt=20): - vec = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + vec = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] 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 From da48b28397f8e5cb23536db66c9a67264b8574b1 Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:51:54 +0530 Subject: [PATCH 23/24] linting improved --- .../funcs/arithmeticProgressionSumFunc.py | 15 ++++++++------- .../funcs/arithmeticProgressionTermFunc.py | 12 ++++++------ mathgenerator/mathgen.py | 12 ++++++------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index d7e5589..950f7c1 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,13 +1,14 @@ from .__init__ import * -def arithmeticProgressionSumFunc (maxd = 100, maxa = 100, maxn = 100): - d = random.randint (-1 * maxd, maxd) - a1 = random.randint (-1 * maxa, maxa) +def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) a2 = a1 + d a3 = a2 + d - n = random.randint (4, maxn) - apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' 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 \ No newline at end of file + solution = n * ((2 * a1) + ((n-1) * d)) / 2 + return problem, solution + \ No newline at end of file diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index 9905b2b..cba850d 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,13 +1,13 @@ from .__init__ import * -def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): - d = random.randint (-1 * maxd, maxd) - a1 = random.randint (-1 * maxa, maxa) +def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) a2 = a1 + d a3 = a2 + d - n = random.randint (4, maxn) - apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString - solution = a1 + ((n-1)*d) + solution = a1 + ((n-1) * d) return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 1e9b4d7..7df376f 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -269,10 +269,10 @@ percentage = Generator("Percentage of a number", 80, "What is a% of b?", "percentage", percentageFunc) celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) -arithmeticProgressionTerm = Generator ("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ..." , - "a-n", arithmeticProgressionTermFunc) +arithmeticProgressionTerm = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) -arithmeticProgressionSum = Generator ("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) +arithmeticProgressionSum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) From d95dd5e29c76561b35d5d18ab249d237d7a927e2 Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:55:15 +0530 Subject: [PATCH 24/24] linting improved v2 --- mathgenerator/funcs/arithmeticProgressionSumFunc.py | 3 +-- mathgenerator/funcs/arithmeticProgressionTermFunc.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index 950f7c1..517d713 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -9,6 +9,5 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): n = random.randint(4, maxn) apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString - solution = n * ((2 * a1) + ((n-1) * d)) / 2 + solution = n * ((2 * a1) + ((n - 1) * d)) / 2 return problem, solution - \ No newline at end of file diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index cba850d..63cca09 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -9,5 +9,5 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): n = random.randint(4, maxn) apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString - solution = a1 + ((n-1) * d) + solution = a1 + ((n - 1) * d) return problem, solution
-59 -20 -50 -79 75 96
-56 36 70 47 -79 64
6 0 -8 -53 -23 -83
-42 -84 21 -10 -42 98
-9 -62 -15 -68 -49 -59
-81 -84 3 58 -84 -59
-56 33 73 98 51 -19
-81 -96 -98 61 -32 73
-43 66 83 90 -22 -94]] | [[ 3120, -15765, -13401, -2683, -17993, -3354] - [ 10584, 13902, 11916, -7446, 4430, 554] - [ -1800, 6587, 14343, 6224, 4525, 4853] - [-12452, -10675, -8693, 427, 2955, 17691]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 221 upto 2 decimal places is: | 6.05 | CubeRoot | -| 48 | Power Rule Integration | 4x^5 + 2x^5 + 9x^8 + 9x^5 | (4/5)x^6 + (2/5)x^6 + (9/8)x^9 + (9/5)x^6 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 27 , 155, 116 = | 62 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 53x^2+200x+78=0 | [-0.44, -3.33] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 4 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability | -| 53 | Exponentiation | 9^10 = | 3486784401 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [266, 201, 278, 209, 229, 275, 216, 234, 219, 276, 282, 281, 208, 247, 265, 273, 286, 202, 231, 207, 251, 203, 259, 288, 291, 260, 210, 263, 222] with 99% confidence is | (260.5668079141175, 231.29526105139982) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 15^(1/9) _ 55^(1/1) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeries | -| 57 | Trigonometric Values | What is tan(30)? | 1/√3 | basicTrigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[36, 13, 31, 23, 38, 34, 24, 20, 41, 14, 19, 31, 11, 49, 49] | The Mean is 28.866666666666667 , Standard Deviation is 143.5822222222222, Variance is 11.982579948501167 | dataSummary | -| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 11m is | 1520.5308443374597 m^2 | surfaceAreaSphereGen | -| 60 | Volume of Sphere | Volume of sphere with radius 73 m = | 1629510.5990953872 m^3 | volumeSphere | -| 61 | nth Fibonacci number | What is the 68th Fibonacci number? | 72723460248141 | nthFibonacciNumberGen | -| 62 | Profit or Loss Percent | Profit percent when CP = 825 and SP = 972 is: | 17.81818181818182 | profitLossPercent | -| 63 | Binary to Hexidecimal | 100000 | 0x20 | binaryToHex | -| 64 | Multiplication of 2 complex numbers | (3+14j) * (-3+16j) = | (-233+6j) | complexNumMultiply | -| 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | -| 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | -| 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +") - print(prob) instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more row = [myGen.id, myGen.title, prob, solu, func_name] - # print(item[1], func_name) + print('added', item[1],'-', func_name, 'to the README.md') line += 1 if line > len(lines): break diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index bd2d0b5..b02b496 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,16 +1,21 @@ -from .euclidianNormFunc import euclidianNormFunc -import math from .__init__ import * -def angleBtwVectorsFunc(v1: list, v2: list): - sum = 0 +def angleBtwVectorsFunc(maxEltAmt=20): + s = 0 + v1 = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + v2 = [random.uniform(0, 1000) for i in v1] for i in v1: for j in v2: - sum += i * j + s += i * j - mags = euclidianNormFunc(v1) * euclidianNormFunc(v2) + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) problem = f"angle between the vectors {v1} and {v2} is:" - solution = math.acos(sum / mags) + solution = '' + try: + solution = str(math.acos(s / mags)) + except: + print('angleBtwVectorsFunc has some issues with math module, line 16') + solution = 'NaN' # would return the answer in radians return problem, solution diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index f66329e..6a414a9 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -1,7 +1,8 @@ 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])) +def euclidianNormFunc(maxEltAmt=20): + vec = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + 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 From 83d0eeb340f1687f5d103b80722eac0efb8abaa1 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 18:46:17 +0400 Subject: [PATCH 03/24] =?UTF-8?q?=F0=9F=94=A7=20fixed=20matrixMultiplicati?= =?UTF-8?q?on=20in=20makeReadme.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 156 ++++++++++++++------------ makeReadme.py | 2 + mathgenerator/funcs/meanMedianFunc.py | 2 +- mathgenerator/funcs/sectorAreaFunc.py | 2 +- 4 files changed, 88 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index f2d81dc..dbf463c 100644 --- a/README.md +++ b/README.md @@ -31,76 +31,88 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 33+23= | 56 | addition | -| 1 | Subtraction | 14-1= | 13 | subtraction | -| 2 | Multiplication | 52*1= | 52 | multiplication | -| 3 | Division | 14/26= | 0.5384615384615384 | division | -| 4 | Binary Complement 1s | 0110111= | 1001000 | binaryComplement1s | -| 5 | Modulo Division | 23%70= | 23 | moduloDivision | -| 6 | Square Root | sqrt(121)= | 11 | squareRoot | -| 7 | Power Rule Differentiation | 3x^2 + 3x^5 + 1x^2 + 6x^4 + 6x^3 | 6x^1 + 15x^4 + 2x^1 + 24x^3 + 18x^2 | powerRuleDifferentiation | -| 8 | Square | 18^2= | 324 | square | -| 9 | LCM (Least Common Multiple) | LCM of 17 and 11 = | 187 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 12 = | 3 | gcd | -| 11 | Basic Algebra | 2x + 3 = 10 | 7/2 | basicAlgebra | -| 12 | Logarithm | log2(32) | 5 | log | -| 13 | Easy Division | 196/14 = | 14 | intDivision | -| 14 | Decimal to Binary | Binary of 61= | 111101 | decimalToBinary | -| 15 | Binary to Decimal | 1 | 1 | binaryToDecimal | -| 16 | Fraction Division | (2/1)/(10/5) | 1 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 16 * [[4, 1], [1, 2]] = | [[64,16],[16,32]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 11 = | 69.62892717829278 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 35, 14 and 37 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (15,5),(9,10)= | (12.0,7.5) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 37 and 54 = | 89 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | -4x - 8y = 60, -9x + 10y = 51 | x = -9, y = -3 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (16, 7) and (19, 14) | sqrt(58) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 8 = | 19.70 | pythagoreanTheorem | -| 26 | Linear Equations | -8x + 15y = -109 -6x + -14y = 90 | x = 8, y = -3 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 130 | [2, 5, 13] | primeFactors | -| 28 | Fraction Multiplication | (8/9)*(3/2) | 4/3 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 8 sides | 135.0 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 11 objects picked 9 at a time | 55 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 8m, 4m, 17m is | 472 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 32m and radius = 18m is | 5654 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 19m, 1m is | 266 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 16m and radius = 18m is | 16286 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 48m and radius = 20m is | 4523 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 29m and radius = 6m is | 1093 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 59 and 57 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -1/4x - 2 and y = 4/5x + 3 | (-100/21, -17/21) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 13 objects picked 8 at a time = | 51891840 | permutations | -| 43 | Cross Product of 2 Vectors | [4, -11, 9] X [-8, -19, -5] = | [226, -52, -164] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/7 and 2/4? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2398 dollars, 9% rate of interest and for a time period of 5 years is = | 1079.1 | simpleInterest | -| 46 | Multiplication of two matrices | Multiply
-91 -4 -1 43 -22 -73 -29
44 24 90 -65 100 31 45
73 -64 55 -9 -21 51 7
5 65 -31 50 -62 -27 -51
55 -88 -83 -5 -41 -26 84]] | [[-17453, 5086, -4551, 4485, 48, -6029, -7477] + [ -6665, 16082, 4879, 4870, -274, -1631, -12411] + [ -3247, 11054, -1129, -539, 3316, 3038, -5504] + [ -2559, 79, -12837, 8081, -11940, -9336, -1370] + [-13874, -6176, -14818, 7900, -9264, -13118, -118]] | matrixMultiplication | +| 47 | Cube Root | cuberoot of 432 upto 2 decimal places is: | 7.56 | CubeRoot | +| 48 | Power Rule Integration | 2x^10 | (2/10)x^11 + c | powerRuleIntegration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 153, 130 = | 48 | fourthAngleOfQuadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 85x^2+188x+3=0 | [-0.02, -2.2] | quadraticEquationSolve | +| 51 | HCF (Highest Common Factor) | HCF of 5 and 7 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 5 = | 4/36 | diceSumProbability | +| 53 | Exponentiation | 13^9 = | 10604499373 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [232, 294, 245, 210, 221, 211, 257, 229, 258, 218, 290, 235, 203, 281, 296, 244, 243, 263, 251, 224, 276, 299, 298, 208, 285, 282, 266, 213, 270, 284, 297, 246, 230, 288, 207, 228, 279, 202, 240, 256] with 80% confidence is | (257.72581618790196, 245.224183812098) | confidenceInterval | +| 55 | Comparing surds | Fill in the blanks 96^(1/7) _ 15^(1/6) | > | surdsComparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 7 numbers is ? | [0, 1, 1, 2, 3, 5, 8] | fibonacciSeries | +| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 10 sides = | 1440 | sumOfAnglesOfPolygon | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[15, 24, 20, 12, 49, 43, 21, 27, 11, 44, 19, 25, 40, 40, 7] | The Mean is 26.466666666666665 , Standard Deviation is 169.98222222222222, Variance is 13.03772304592417 | dataSummary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 2m is | 50.26548245743669 m^2 | surfaceAreaSphereGen | +| 61 | Volume of Sphere | Volume of sphere with radius 15 m = | 14137.166941154068 m^3 | volumeSphere | +| 62 | nth Fibonacci number | What is the 100th Fibonacci number? | 354224848179263111168 | nthFibonacciNumberGen | +| 63 | Profit or Loss Percent | Loss percent when CP = 273 and SP = 196 is: | 28.205128205128204 | profitLossPercent | +| 64 | Binary to Hexidecimal | 11111101 | 0xfd | binaryToHex | +| 65 | Multiplication of 2 complex numbers | (4-18j) * (-7-7j) = | (-154+98j) | complexNumMultiply | +| 66 | Geometric Progression | For the given GP [5, 20, 80, 320, 1280, 5120] ,Find the value of a,common ratio,7th term value, sum upto 8th term | The value of a is 5, common ratio is 4 , 7th term is 20480 , sum upto 8th term is 109225.0 | geometricprogression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 73 and 84 = | (73*84)^(1/2) = 78.30708780180757 | geometricMean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 48 , 90 and 92 = | 3/((1/48) + (1/90) + (1/92)) = 70.07052186177715 | harmonicMean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[924.2913636750363, 20.503795974707305, 517.3232583455609, 108.40962248839648, 53.90127703299286, 439.08768846258494, 456.9202154814549, 994.1184872614399, 582.1310398602112, 900.2850171703179, 600.8210520400753, 976.4837679476245, 322.81868740893447, 200.87610464653193] is: | 2266.1247066414917 | eucldianNorm | +| 70 | Angle between 2 vectors | angle between the vectors [208.76603907240408, 856.3899288947613, 504.6705923607805, 59.53820731849413, 225.96877896886213, 106.59039269390458, 954.4412959874746, 833.8565561650387] and [137.70718881439137, 398.58328047203594, 697.7790424491039, 94.83157368402372, 84.50274981272999, 643.3388926841467, 27.78410024116851, 405.7876464522183] is: | NaN | angleBtwVectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -11 and 65 = | 76 | absoluteDifference | +| 72 | Dot Product of 2 Vectors | [-6, -17, -7] . [4, -14, -10] = | 284 | vectorDot | +| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | binary2sComplement | diff --git a/makeReadme.py b/makeReadme.py index 796dc00..d5dadc7 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -17,19 +17,16 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - print(prob) - prob = prob.replace("[[", "
") prob = prob.replace("[", "
") prob = prob.replace(", ", "") prob = prob.replace("]]\n", "
") prob = prob.replace("]\n", "
-50367-26-263
88-3760-1961-56
48-569-87-64-92
-84-50-79-1986-13
02812-1473-49
94-90226-3819
2-1179-7798-77
-877072-3264-99
and
3432-6-3246-2378-81-18
-172449-62-507738-98-64
-23-7843 5-83-5 4-92-16
46-47-9252-25-374451-7
2026703796-73498442
-72-15-80-2458-47-4145-69
|
-8245-1057-423-3535-5692034-63291219-5765
6619 5671073723914001-629110147-73876383
1472-16113318-5565-1257410381 638-236992621
159355983465789913170-6487-48572464210618
359230271220614732120-4126082-6354561
3748-1803-1146020725462-8183242311 947
2400 960229502483 952-19744625-55129372
1132-2067223921884-1227681961949-71485677
| matrixMultiplication | - [ 10584, 13902, 11916, -7446, 4430, 554] - [ -1800, 6587, 14343, 6224, 4525, 4853] - [-12452, -10675, -8693, 427, 2955, 17691]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 221 upto 2 decimal places is: | 6.05 | CubeRoot | -| 48 | Power Rule Integration | 4x^5 + 2x^5 + 9x^8 + 9x^5 | (4/5)x^6 + (2/5)x^6 + (9/8)x^9 + (9/5)x^6 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 27 , 155, 116 = | 62 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 53x^2+200x+78=0 | [-0.44, -3.33] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 4 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability | -| 53 | Exponentiation | 9^10 = | 3486784401 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [266, 201, 278, 209, 229, 275, 216, 234, 219, 276, 282, 281, 208, 247, 265, 273, 286, 202, 231, 207, 251, 203, 259, 288, 291, 260, 210, 263, 222] with 99% confidence is | (260.5668079141175, 231.29526105139982) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 15^(1/9) _ 55^(1/1) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeries | -| 57 | Trigonometric Values | What is tan(30)? | 1/√3 | basicTrigonometry | +| 0 | Addition | 23+50= | 73 | addition | +| 1 | Subtraction | 68-41= | 27 | subtraction | +| 2 | Multiplication | 51*1= | 51 | multiplication | +| 3 | Division | 37/44= | 0.8409090909090909 | division | +| 4 | Binary Complement 1s | 01= | 10 | binaryComplement1s | +| 5 | Modulo Division | 49%54= | 49 | moduloDivision | +| 6 | Square Root | sqrt(16)= | 4 | squareRoot | +| 7 | Power Rule Differentiation | 1x^6 + 8x^4 + 5x^5 | 6x^5 + 32x^3 + 25x^4 | powerRuleDifferentiation | +| 8 | Square | 2^2= | 4 | square | +| 9 | LCM (Least Common Multiple) | LCM of 13 and 1 = | 13 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 8 = | 2 | gcd | +| 11 | Basic Algebra | 1x + 6 = 8 | 2 | basicAlgebra | +| 12 | Logarithm | log2(256) | 8 | log | +| 13 | Easy Division | 96/4 = | 24 | intDivision | +| 14 | Decimal to Binary | Binary of 12= | 1100 | decimalToBinary | +| 15 | Binary to Decimal | 010010100 | 148 | binaryToDecimal | +| 16 | Fraction Division | (5/10)/(5/2) | 1/5 | fractionDivision | +| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[2, 6], [6, 6]] = | [[2,6],[6,6]] | intMatrix22Multiplication | +| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 20 = | 97.48846085563153 | areaOfTriangle | +| 19 | Triangle exists check | Does triangle with sides 30, 30 and 47 exist? | Yes | doesTriangleExist | +| 20 | Midpoint of the two point | (-8,11),(2,3)= | (-3.0,7.0) | midPointOfTwoPoint | +| 21 | Factoring Quadratic | x^2-3x-28 | (x+4)(x-7) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 59 and 50 = | 71 | thirdAngleOfTriangle | +| 23 | Solve a System of Equations in R^2 | 3x + 7y = -61, 6x + 7y = -52 | x = 3, y = -10 | systemOfEquations | +| 24 | Distance between 2 points | Find the distance between (-10, -6) and (-2, 14) | sqrt(464) | distance2Point | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 13 = | 21.40 | pythagoreanTheorem | +| 26 | Linear Equations | -2x + 9y = 16 +-15x + 3y = -267 | x = 19, y = 6 | linearEquations | +| 27 | Prime Factorisation | Find prime factors of 94 | [2, 47] | primeFactors | +| 28 | Fraction Multiplication | (8/10)*(10/7) | 8/7 | fractionMultiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 19 sides | 161.05 | angleRegularPolygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 8 at a time | 3003 | combinations | +| 31 | Factorial | 5! = | 120 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surfaceAreaCubeGen | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 9m, 16m, 12m is | 888 m^2 | surfaceAreaCuboidGen | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 41m and radius = 11m is | 3593 m^2 | surfaceAreaCylinderGen | +| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volumeCubeGen | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 2m, 8m, 14m is | 224 m^3 | volumeCuboidGen | +| 37 | Volume of cylinder | Volume of cylinder with height = 43m and radius = 15m is | 30394 m^3 | volumeCylinderGen | +| 38 | Surface Area of cone | Surface area of cone with height = 49m and radius = 2m is | 320 m^2 | surfaceAreaConeGen | +| 39 | Volume of cone | Volume of cone with height = 31m and radius = 17m is | 9381 m^3 | volumeConeGen | +| 40 | Common Factors | Common Factors of 55 and 82 = | [1] | commonFactors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 0/4x + 1 and y = 3/5x - 9 | (50/3, 1) | intersectionOfTwoLines | +| 42 | Permutations | Number of Permutations from 11 objects picked 0 at a time = | 1 | permutations | +| 43 | Cross Product of 2 Vectors | [16, -20, -19] X [-16, -13, -11] = | [-27, 480, -528] | vectorCross | +| 44 | Compare Fractions | Which symbol represents the comparison between 6/7 and 8/5? | < | compareFractions | +| 45 | Simple Interest | Simple interest for a principle amount of 7762 dollars, 2% rate of interest and for a time period of 2 years is = | 310.48 | simpleInterest | +| 46 | Multiplication of two matrices | Multiply
18-5697-66-2555-9986
2-4527-87-30-1593-62
83-2555-875-34-71-22
-7594-684-88-386098
20-4874-73-81-2560-93
-23-89-639036301819
-21158935-60-53-8522
-70-76-37-98-73778172
and
-1413
-7896
-1795
7269
6741
8549
-6438
36-44]] | [[ 10147, -6357] + [-14710, -3435] + [ 5164, 3031] + [ -9570, 5773] + [-17790, -529] + [ 19309, -5824] + [ -2162, 2782] + [ -457, -17793]] | matrixMultiplication | +| 47 | Cube Root | cuberoot of 402 upto 2 decimal places is: | 7.38 | CubeRoot | +| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | powerRuleIntegration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 171 , 62, 4 = | 123 | fourthAngleOfQuadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+159x+79=0 | [-0.89, -1.12] | quadraticEquationSolve | +| 51 | HCF (Highest Common Factor) | HCF of 18 and 16 = | 2 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 10 = | 27/216 | diceSumProbability | +| 53 | Exponentiation | 5^9 = | 1953125 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [259, 228, 251, 245, 222, 216, 209, 288, 229, 249, 278, 226, 256, 263, 248, 211, 210, 270, 260, 269] with 99% confidence is | (257.86513442744837, 230.83486557255162) | confidenceInterval | +| 55 | Comparing surds | Fill in the blanks 70^(1/7) _ 61^(1/6) | < | surdsComparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 16 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610] | fibonacciSeries | +| 57 | Trigonometric Values | What is sin(45)? | 1/√2 | basicTrigonometry | | 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[36, 13, 31, 23, 38, 34, 24, 20, 41, 14, 19, 31, 11, 49, 49] | The Mean is 28.866666666666667 , Standard Deviation is 143.5822222222222, Variance is 11.982579948501167 | dataSummary | -| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 11m is | 1520.5308443374597 m^2 | surfaceAreaSphereGen | -| 60 | Volume of Sphere | Volume of sphere with radius 73 m = | 1629510.5990953872 m^3 | volumeSphere | -| 61 | nth Fibonacci number | What is the 68th Fibonacci number? | 72723460248141 | nthFibonacciNumberGen | -| 62 | Profit or Loss Percent | Profit percent when CP = 825 and SP = 972 is: | 17.81818181818182 | profitLossPercent | -| 63 | Binary to Hexidecimal | 100000 | 0x20 | binaryToHex | -| 64 | Multiplication of 2 complex numbers | (3+14j) * (-3+16j) = | (-233+6j) | complexNumMultiply | -| 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | -| 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | -| 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[48, 46, 29, 28, 17, 48, 24, 23, 5, 9, 27, 33, 46, 7, 36] | The Mean is 28.4 , Standard Deviation is 201.97333333333336, Variance is 14.211732242528823 | dataSummary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 19m is | 4536.459791783661 m^2 | surfaceAreaSphereGen | +| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphere | +| 62 | nth Fibonacci number | What is the 85th Fibonacci number? | 259695496911123328 | nthFibonacciNumberGen | +| 63 | Profit or Loss Percent | Loss percent when CP = 937 and SP = 72 is: | 92.31590181430096 | profitLossPercent | +| 64 | Binary to Hexidecimal | 1001111 | 0x4f | binaryToHex | +| 65 | Multiplication of 2 complex numbers | (-3+2j) * (-6+7j) = | (4-33j) | complexNumMultiply | +| 66 | Geometric Progression | For the given GP [6, 24, 96, 384, 1536, 6144] ,Find the value of a,common ratio,9th term value, sum upto 9th term | The value of a is 6, common ratio is 4 , 9th term is 393216 , sum upto 9th term is 524286.0 | geometricprogression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 54 , 80 , 35 , 39 = | (54*80*35*39)^(1/4) = 49.27811645529654 | geometricMean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 2 , 84 , 93 , 16 = | 4/((1/2) + (1/84) + (1/93) + (1/16)) = 6.835767022149303 | harmonicMean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[784.3594765936149, 831.2509235672187, 16.078601582030892, 985.0579481288806, 734.7344412338676, 998.0941258783216, 354.94078353536895, 413.5643355103187, 581.4239813447576, 903.949312712381, 806.494025130463] is: | 2432.1700989717465 | eucldianNorm | +| 70 | Angle between 2 vectors | angle between the vectors [689.0197023764115, 694.8793500248185] and [927.4787145023294, 343.6872076155678] is: | NaN | angleBtwVectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -23 and 44 = | 67 | absoluteDifference | +| 72 | Dot Product of 2 Vectors | [17, 9, 8] . [18, 9, 4] = | 419 | vectorDot | +| 73 | Binary 2's Complement | 2's complement of 101 = | 11 | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[13, 88, 85], [65, 37, 52], [89, 45, 2]]) is: | Matrix([[-1133/167543, 3649/335086, 1431/335086], [2249/167543, -7539/335086, 4849/335086], [-184/167543, 7247/335086, -5239/335086]]) | invertmatrix | +| 75 | Area of a Sector | Given radius, 6 and angle, 328. Find the area of the sector. | Area of sector = 103.04424 | sectorArea | +| 76 | Mean and Median | Given the series of numbers [55, 61, 83, 85, 52, 78, 30, 58, 76, 37]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 61.5 and Arithmetic median of this series is 59.5 | meanMedian | diff --git a/makeReadme.py b/makeReadme.py index d5dadc7..7692e35 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -22,6 +22,8 @@ for item in wList: prob = prob.replace(", ", "") prob = prob.replace("]]\n", "
") prob = prob.replace("]\n", "