From 53071a276d70e2c2a14184066f78646598cea426 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 18:08:20 +0400 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=A7=20fixed=20some=20stuff=20with?= =?UTF-8?q?=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 339e279d0a929925d9ddef5283bd852cc6deab2e Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 23:02:18 +0400 Subject: [PATCH 3/5] =?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("[[", "
-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 2/5] =?UTF-8?q?=F0=9F=94=A7=20fixed=20matrixMultiplication?= =?UTF-8?q?=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", "
") + string = string.replace("[", "
") + string = string.replace(", ", "") + string = string.replace("]]", "
") + string = string.replace("]", "") + 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("[[", "
") - prob = prob.replace("[", "
") - prob = prob.replace(", ", "") - prob = prob.replace("]]\n", "
") - prob = prob.replace("]\n", "") - 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 Date: Mon, 19 Oct 2020 23:06:34 +0400 Subject: [PATCH 4/5] =?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
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[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
28-45
6-5-64
and
-51-32
585-5
-6-8-6-7
-1-53-7
|
497373-43
-23-6551
| 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 a9c4249273eb72122add03fc04a7aff47366e1d0 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 23:19:11 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=E2=AC=9C=E2=AC=9C=20whitespace=20=E2=AC=9C?= =?UTF-8?q?=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