From 577edd967a156b6d3792d3222e6c9300719562bc Mon Sep 17 00:00:00 2001 From: Luke Weiler Date: Tue, 20 Oct 2020 10:01:53 -0400 Subject: [PATCH 1/8] Update new-generator-idea.md --- .github/ISSUE_TEMPLATE/new-generator-idea.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/new-generator-idea.md b/.github/ISSUE_TEMPLATE/new-generator-idea.md index b986c9f..1a08806 100644 --- a/.github/ISSUE_TEMPLATE/new-generator-idea.md +++ b/.github/ISSUE_TEMPLATE/new-generator-idea.md @@ -11,6 +11,6 @@ assignees: '' **Example Solution:** -**Further explanation:** +**Further explanation (optional):** **Would you like to be assigned to this:** From b4044facf6b9be38b83a05faa8d47b98797619b1 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 10:13:54 -0400 Subject: [PATCH 2/8] function name included in generator instance variables and genList[3] --- README.md | 172 +++++++++++---------- makeReadme.py | 19 ++- mathgenerator/__init__.py | 9 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 3 +- mathgenerator/funcs/multiplicationFunc.py | 5 +- mathgenerator/funcs/radianToDegFunc.py | 3 +- test.py | 7 +- 7 files changed, 121 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 042f337..ca34822 100644 --- a/README.md +++ b/README.md @@ -31,86 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 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) | +| 0 | Addition | 24+32= | 56 | addition | +| 1 | Subtraction | 14-4= | 10 | subtractionFunc | +| 2 | Multiplication | 28*3= | 84 | multiplicationFunc | +| 3 | Division | 55/39= | 1.4102564102564104 | divisionFunc | +| 4 | Binary Complement 1s | 1010000= | 0101111 | binaryComplement1sFunc | +| 5 | Modulo Division | 74%21= | 11 | moduloFunc | +| 6 | Square Root | sqrt(1)= | 1 | squareRootFunc | +| 7 | Power Rule Differentiation | 6x^5 + 10x^4 + 10x^9 | 30x^4 + 40x^3 + 90x^8 | powerRuleDifferentiationFunc | +| 8 | Square | 17^2= | 289 | squareFunc | +| 9 | LCM (Least Common Multiple) | LCM of 6 and 13 = | 78 | lcmFunc | +| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 3 = | 1 | gcdFunc | +| 11 | Basic Algebra | 3x + 9 = 9 | 0 | basicAlgebraFunc | +| 12 | Logarithm | log3(2187) | 7 | logFunc | +| 13 | Easy Division | 275/11 = | 25 | divisionToIntFunc | +| 14 | Decimal to Binary | Binary of 87= | 1010111 | DecimalToBinaryFunc | +| 15 | Binary to Decimal | 01111 | 15 | BinaryToDecimalFunc | +| 16 | Fraction Division | (1/8)/(8/1) | 1/64 | divideFractionsFunc | +| 17 | Integer Multiplication with 2x2 Matrix | 7 * [[7, 6], [1, 4]] = | [[49,42],[7,28]] | multiplyIntToMatrix22 | +| 18 | Area of Triangle | Area of triangle with side lengths: 8 5 18 = | (3.3825325984308986e-15+55.24094948496088j) | areaOfTriangleFunc | +| 19 | Triangle exists check | Does triangle with sides 22, 8 and 3 exist? | No | isTriangleValidFunc | +| 20 | Midpoint of the two point | (17,-8),(-14,-2)= | (1.5,-5.0) | MidPointOfTwoPointFunc | +| 21 | Factoring Quadratic | x^2+x-20 | (x+5)(x-4) | factoringFunc | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 36 and 55 = | 89 | thirdAngleOfTriangleFunc | +| 23 | Solve a System of Equations in R^2 | 2x - 7y = 56, -8x + 2y = 36 | x = -7, y = -10 | systemOfEquationsFunc | +| 24 | Distance between 2 points | Find the distance between (2, 19) and (3, 7) | sqrt(145) | distanceTwoPointsFunc | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 7 = | 17.46 | pythagoreanTheoremFunc | +| 26 | Linear Equations | -14x + -15y = 219 +8x = -48 | x = -6, y = -9 | linearEquationsFunc | +| 27 | Prime Factorisation | Find prime factors of 73 | [73] | primeFactorsFunc | +| 28 | Fraction Multiplication | (8/10)*(6/5) | 24/25 | multiplyFractionsFunc | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | regularPolygonAngleFunc | +| 30 | Combinations of Objects | Number of combinations from 15 objects picked 8 at a time | 6435 | combinationsFunc | +| 31 | Factorial | 4! = | 24 | factorialFunc | +| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surfaceAreaCube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 18m, 11m, 19m is | 1498 m^2 | surfaceAreaCuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 m^2 | surfaceAreaCylinder | +| 35 | Volum of Cube | Volume of cube with side = 5m is | 125 m^3 | volumeCube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 3m, 11m, 3m is | 99 m^3 | volumeCuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 20m and radius = 7m is | 3078 m^3 | volumeCylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 23m and radius = 2m is | 157 m^2 | surfaceAreaCone | +| 39 | Volume of cone | Volume of cone with height = 44m and radius = 5m is | 1151 m^3 | volumeCone | +| 40 | Common Factors | Common Factors of 99 and 93 = | [1, 3] | commonFactorsFunc | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10/3x - 8 and y = -10x + 4 | (9/10, -5) | intersectionOfTwoLinesFunc | +| 42 | Permutations | Number of Permutations from 19 objects picked 5 at a time = | 1395360 | permutationFunc | +| 43 | Cross Product of 2 Vectors | [0, 2, -6] X [4, 13, 15] = | [108, -24, -8] | vectorCrossFunc | +| 44 | Compare Fractions | Which symbol represents the comparison between 1/7 and 7/10? | < | compareFractionsFunc | +| 45 | Simple Interest | Simple interest for a principle amount of 9501 dollars, 10% rate of interest and for a time period of 10 years is = | 9501.0 | simpleInterestFunc | +| 46 | Multiplication of two matrices | Multiply
-106
2-4
1-8
-74
and
-5-2
-3-8
|
32-28
228
1962
23-18
| matrixMultiplicationFunc | +| 47 | Cube Root | cuberoot of 100 upto 2 decimal places is: | 4.64 | cubeRootFunc | +| 48 | Power Rule Integration | 9x^9 | (9/9)x^10 + c | powerRuleIntegrationFunc | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 84, 126 = | 121 | fourthAngleOfQuadriFunc | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 39x^2+176x+64=0 | [-0.4, -4.11] | quadraticEquation | +| 51 | HCF (Highest Common Factor) | HCF of 7 and 9 = | 1 | hcfFunc | +| 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 13 = | 21/216 | DiceSumProbFunc | +| 53 | Exponentiation | 6^4 = | 1296 | exponentiationFunc | +| 54 | Confidence interval For sample S | The confidence interval for sample [293, 222, 227, 237, 299, 265, 238, 273, 229, 236, 286, 243, 220, 233, 224, 226, 257, 285, 268, 271, 247, 262] with 90% confidence is | (260.4441418746136, 243.28313085265916) | confidenceIntervalFunc | +| 55 | Comparing surds | Fill in the blanks 66^(1/5) _ 74^(1/6) | > | surdsComparisonFunc | +| 56 | Fibonacci Series | The Fibonacci Series of the first 18 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597] | fibonacciSeriesFunc | +| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometryFunc | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 4 sides = | 360 | sumOfAnglesOfPolygonFunc | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 20, 40, 14, 41, 42, 12, 18, 26, 41, 16, 48, 37, 30, 18] | The Mean is 28.933333333333334 , Standard Deviation is 134.86222222222221, Variance is 11.61301951355556 | dataSummaryFunc | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 16m is | 3216.990877275948 m^2 | surfaceAreaSphere | +| 61 | Volume of Sphere | Volume of sphere with radius 10 m = | 4188.790204786391 m^3 | volumeSphereFunc | +| 62 | nth Fibonacci number | What is the 65th Fibonacci number? | 17167680177565 | nthFibonacciNumberFunc | +| 63 | Profit or Loss Percent | Loss percent when CP = 639 and SP = 20 is: | 96.87010954616588 | profitLossPercentFunc | +| 64 | Binary to Hexidecimal | 10000010 | 0x82 | binaryToHexFunc | +| 65 | Multiplication of 2 complex numbers | (-16-5j) * (13+4j) = | (-188-129j) | multiplyComplexNumbersFunc | +| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,7th term value, sum upto 11th term | The value of a is 5, common ratio is 6 , 7th term is 233280 , sum upto 11th term is 362797055.0 | geomProgrFunc | +| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 12 , 76 and 88 = | (12*76*88)^(1/3) = 43.134606135637426 | geometricMeanFunc | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 32 , 82 , 98 , 59 = | 4/((1/32) + (1/82) + (1/98) + (1/59)) = 56.658543052293126 | harmonicMeanFunc | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[30.49374303007102, 744.9799127067523, 232.71392717506222, 219.07162873155772, 268.6667105157799, 655.700721848602, 630.8781230231998, 525.0331442958861, 603.1960329056955] is: | 1482.467804008134 | euclidianNormFunc | +| 70 | Angle between 2 vectors | angle between the vectors [411.45287273810993, 475.5310005335923, 585.8235737751623, 654.4447552592987, 7.9372591993011055, 944.1669660662357, 82.85267978544842, 855.1153353684535, 401.897628624623, 208.74276524448533, 18.113378046332063, 329.92425644581766, 656.1658677733768] and [340.21944929120787, 595.8624349766976, 458.3226781953552, 460.8316651658132, 237.2935680919427, 562.2537489196774, 705.3352878976389, 21.91461098842251, 950.6814899692208, 879.1343421626799, 177.86771165838067, 867.0564995964864, 762.591298578088] is: | NaN | angleBtwVectorsFunc | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -22 and 85 = | 107 | absoluteDifferenceFunc | +| 72 | Dot Product of 2 Vectors | [-4, -15, -19] . [-12, -18, -13] = | 565 | vectorDotFunc | +| 73 | Binary 2's Complement | 2's complement of = | | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[23, 14, 90], [15, 42, 7], [37, 19, 79]]) is: | Matrix([[-3185/53919, -604/53919, 3682/53919], [926/53919, 1513/53919, -1189/53919], [47/1997, -3/1997, -28/1997]]) | matrixInversion | +| 75 | Area of a Sector | Given radius, 32 and angle, 182. Find the area of the sector. | Area of sector = 1626.36761 | sectorAreaFunc | +| 76 | Mean and Median | Given the series of numbers [83, 63, 31, 44, 12, 73, 42, 51, 93, 3]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.5 and Arithmetic median of this series is 47.5 | meanMedianFunc | +| 77 | Determinant to 2x2 Matrix | Det([[35, 67], [54, 48]]) = | -1938 | determinantToMatrix22 | +| 78 | Compound Interest | Compound Interest for a principle amount of 4487 dollars, 5% rate of interest and for a time period of 9 compounded monthly is = | 4487.0 | compoundInterestFunc | +| 79 | Decimal to Hexadecimal | Binary of 992= | 0x3e0 | deciToHexaFunc | +| 80 | Percentage of a number | What is 37% of 83? | Required percentage = 30.71% | percentageFunc | +| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | celsiustofahrenheit | +| 82 | AP Term Calculation | Find the term number 31 of the AP series: -53, -107, -161 ... | -1673 | arithmeticProgressionTermFunc | +| 83 | AP Sum Calculation | Find the sum of first 56 terms of the AP series: -14, -24, -34 ... | -16184.0 | arithmeticProgressionSumFunc | +| 84 | Converts decimal to octal | The decimal number 1430 in Octal is: | 0o2626 | decimalToOctalFunc | +| 85 | Converts decimal to Roman Numerals | The number 3537 in Roman Numerals is: | MMMDXXXVII | decimalToRomanNumeralsFunc | +| 86 | Degrees to Radians | Angle 87 in radians is = | 1.52 | degreeToRadFunc | +| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | diff --git a/makeReadme.py b/makeReadme.py index f3efc3f..fb2894c 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -2,6 +2,7 @@ # NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * + def array2markdown_table(string): string = string.replace("[[", "
") string = string.replace("[", "
") @@ -20,29 +21,31 @@ 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 + # print(item[3]) prob, solu = myGen() prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - prob, solu = myGen(10, 4) + prob, solu = myGen(maxVal=10, max_dim=4) prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") prob = array2markdown_table(prob) solu = array2markdown_table(solu) - instName = lines[line] + # instName = lines[line] # NOTE: renamed 'def_name' to 'func_name' because it suits it more - func_name = instName[:instName.find('=')].strip() + #func_name = instName[:instName.find('=')].strip() + func_name = item[3] row = [myGen.id, myGen.title, prob, solu, func_name] - print('added', item[1],'-', func_name, 'to the README.md') - line += 1 - if line > len(lines): - break + print('added', item[1], '-', func_name, 'to the README.md') + # line += 1 + # if line > len(lines): + # break allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 956697a..33669b5 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,3 +1,5 @@ +import sys +import traceback genList = [] @@ -8,7 +10,12 @@ class Generator: self.generalProb = generalProb self.generalSol = generalSol self.func = func - genList.append([id, title, self]) + + (filename, line_number, function_name, text) = traceback.extract_stack()[-2] + funcname = filename[filename.rfind('/'):].strip() + funcname = funcname[1:-3] + print(funcname) + genList.append([id, title, self, funcname]) def __str__(self): return str( diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index 65ec973..9d8d817 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,5 +1,6 @@ from .__init__ import * from ..__init__ import Generator +import math def angleBtwVectorsFunc(maxEltAmt=20): @@ -15,7 +16,7 @@ def angleBtwVectorsFunc(maxEltAmt=20): solution = '' try: solution = str(math.acos(s / mags)) - except MathDomainError: + except ValueError: print('angleBtwVectorsFunc has some issues with math module, line 16') solution = 'NaN' # would return the answer in radians diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 1d1d339..2994ad6 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -4,7 +4,10 @@ from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): a = random.randint(0, maxMulti) - b = random.randint(0, min(int(maxMulti / a), maxRes)) + if a == 0: + b = random.randint(0, maxRes) + else: + b = random.randint(0, min(int(maxMulti / a), maxRes)) c = a * b problem = str(a) + "*" + str(b) + "=" diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py index b9c7b56..5948eb7 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -2,7 +2,8 @@ from .__init__ import * from numpy import pi -def radianToDegFunc(max_rad=pi): +def radianToDegFunc(max_rad=3): + # max_rad is supposed to be pi but random can't handle non-integer a = random.randint(0, max_rad) b = (180 * a) / pi b = round(b, 2) diff --git a/test.py b/test.py index 88a2724..8cd6bd0 100644 --- a/test.py +++ b/test.py @@ -3,10 +3,13 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(79)) +print(mathgen.genById(70)) # prints each generator in genList - +""" list = mathgen.getGenList() for item in list: print(item[2]) + +print(mathgen.getGenList()) +""" From 507eb4ff7603b61478066eacf5404dd0c16b43aa Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 10:19:03 -0400 Subject: [PATCH 3/8] Removed excessive print statements --- README.md | 174 ++++++++++++------------- makeReadme.py | 10 -- mathgenerator/__init__.py | 2 +- mathgenerator/funcs/dataSummaryFunc.py | 9 +- 4 files changed, 91 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index ca34822..87ca9e6 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 24+32= | 56 | addition | -| 1 | Subtraction | 14-4= | 10 | subtractionFunc | -| 2 | Multiplication | 28*3= | 84 | multiplicationFunc | -| 3 | Division | 55/39= | 1.4102564102564104 | divisionFunc | -| 4 | Binary Complement 1s | 1010000= | 0101111 | binaryComplement1sFunc | -| 5 | Modulo Division | 74%21= | 11 | moduloFunc | -| 6 | Square Root | sqrt(1)= | 1 | squareRootFunc | -| 7 | Power Rule Differentiation | 6x^5 + 10x^4 + 10x^9 | 30x^4 + 40x^3 + 90x^8 | powerRuleDifferentiationFunc | -| 8 | Square | 17^2= | 289 | squareFunc | -| 9 | LCM (Least Common Multiple) | LCM of 6 and 13 = | 78 | lcmFunc | -| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 3 = | 1 | gcdFunc | -| 11 | Basic Algebra | 3x + 9 = 9 | 0 | basicAlgebraFunc | -| 12 | Logarithm | log3(2187) | 7 | logFunc | -| 13 | Easy Division | 275/11 = | 25 | divisionToIntFunc | -| 14 | Decimal to Binary | Binary of 87= | 1010111 | DecimalToBinaryFunc | -| 15 | Binary to Decimal | 01111 | 15 | BinaryToDecimalFunc | -| 16 | Fraction Division | (1/8)/(8/1) | 1/64 | divideFractionsFunc | -| 17 | Integer Multiplication with 2x2 Matrix | 7 * [[7, 6], [1, 4]] = | [[49,42],[7,28]] | multiplyIntToMatrix22 | -| 18 | Area of Triangle | Area of triangle with side lengths: 8 5 18 = | (3.3825325984308986e-15+55.24094948496088j) | areaOfTriangleFunc | -| 19 | Triangle exists check | Does triangle with sides 22, 8 and 3 exist? | No | isTriangleValidFunc | -| 20 | Midpoint of the two point | (17,-8),(-14,-2)= | (1.5,-5.0) | MidPointOfTwoPointFunc | -| 21 | Factoring Quadratic | x^2+x-20 | (x+5)(x-4) | factoringFunc | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 36 and 55 = | 89 | thirdAngleOfTriangleFunc | -| 23 | Solve a System of Equations in R^2 | 2x - 7y = 56, -8x + 2y = 36 | x = -7, y = -10 | systemOfEquationsFunc | -| 24 | Distance between 2 points | Find the distance between (2, 19) and (3, 7) | sqrt(145) | distanceTwoPointsFunc | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 7 = | 17.46 | pythagoreanTheoremFunc | -| 26 | Linear Equations | -14x + -15y = 219 -8x = -48 | x = -6, y = -9 | linearEquationsFunc | -| 27 | Prime Factorisation | Find prime factors of 73 | [73] | primeFactorsFunc | -| 28 | Fraction Multiplication | (8/10)*(6/5) | 24/25 | multiplyFractionsFunc | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | regularPolygonAngleFunc | -| 30 | Combinations of Objects | Number of combinations from 15 objects picked 8 at a time | 6435 | combinationsFunc | -| 31 | Factorial | 4! = | 24 | factorialFunc | -| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surfaceAreaCube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 18m, 11m, 19m is | 1498 m^2 | surfaceAreaCuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 m^2 | surfaceAreaCylinder | -| 35 | Volum of Cube | Volume of cube with side = 5m is | 125 m^3 | volumeCube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 3m, 11m, 3m is | 99 m^3 | volumeCuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 20m and radius = 7m is | 3078 m^3 | volumeCylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 23m and radius = 2m is | 157 m^2 | surfaceAreaCone | -| 39 | Volume of cone | Volume of cone with height = 44m and radius = 5m is | 1151 m^3 | volumeCone | -| 40 | Common Factors | Common Factors of 99 and 93 = | [1, 3] | commonFactorsFunc | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10/3x - 8 and y = -10x + 4 | (9/10, -5) | intersectionOfTwoLinesFunc | -| 42 | Permutations | Number of Permutations from 19 objects picked 5 at a time = | 1395360 | permutationFunc | -| 43 | Cross Product of 2 Vectors | [0, 2, -6] X [4, 13, 15] = | [108, -24, -8] | vectorCrossFunc | -| 44 | Compare Fractions | Which symbol represents the comparison between 1/7 and 7/10? | < | compareFractionsFunc | -| 45 | Simple Interest | Simple interest for a principle amount of 9501 dollars, 10% rate of interest and for a time period of 10 years is = | 9501.0 | simpleInterestFunc | -| 46 | Multiplication of two matrices | Multiply
-106
2-4
1-8
-74
and
-5-2
-3-8
|
32-28
228
1962
23-18
| matrixMultiplicationFunc | -| 47 | Cube Root | cuberoot of 100 upto 2 decimal places is: | 4.64 | cubeRootFunc | -| 48 | Power Rule Integration | 9x^9 | (9/9)x^10 + c | powerRuleIntegrationFunc | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 84, 126 = | 121 | fourthAngleOfQuadriFunc | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 39x^2+176x+64=0 | [-0.4, -4.11] | quadraticEquation | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 9 = | 1 | hcfFunc | +| 0 | Addition | 39+14= | 53 | addition | +| 1 | Subtraction | 28-20= | 8 | subtractionFunc | +| 2 | Multiplication | 23*2= | 46 | multiplicationFunc | +| 3 | Division | 34/27= | 1.2592592592592593 | divisionFunc | +| 4 | Binary Complement 1s | 01101= | 10010 | binaryComplement1sFunc | +| 5 | Modulo Division | 27%67= | 27 | moduloFunc | +| 6 | Square Root | sqrt(81)= | 9 | squareRootFunc | +| 7 | Power Rule Differentiation | 7x^2 + 1x^4 + 4x^8 + 5x^10 | 14x^1 + 4x^3 + 32x^7 + 50x^9 | powerRuleDifferentiationFunc | +| 8 | Square | 2^2= | 4 | squareFunc | +| 9 | LCM (Least Common Multiple) | LCM of 7 and 10 = | 70 | lcmFunc | +| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 3 = | 3 | gcdFunc | +| 11 | Basic Algebra | 9x + 8 = 9 | 1/9 | basicAlgebraFunc | +| 12 | Logarithm | log2(32) | 5 | logFunc | +| 13 | Easy Division | 176/11 = | 16 | divisionToIntFunc | +| 14 | Decimal to Binary | Binary of 49= | 110001 | DecimalToBinaryFunc | +| 15 | Binary to Decimal | 01100 | 12 | BinaryToDecimalFunc | +| 16 | Fraction Division | (9/5)/(10/2) | 9/25 | divideFractionsFunc | +| 17 | Integer Multiplication with 2x2 Matrix | 8 * [[8, 9], [0, 3]] = | [[64,72],[0,24]] | multiplyIntToMatrix22 | +| 18 | Area of Triangle | Area of triangle with side lengths: 19 2 15 = | (1.7998558638262156e-15+29.393876913398138j) | areaOfTriangleFunc | +| 19 | Triangle exists check | Does triangle with sides 9, 12 and 5 exist? | Yes | isTriangleValidFunc | +| 20 | Midpoint of the two point | (-3,-3),(-7,-4)= | (-5.0,-3.5) | MidPointOfTwoPointFunc | +| 21 | Factoring Quadratic | x^2+4x-12 | (x+6)(x-2) | factoringFunc | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 4 and 27 = | 149 | thirdAngleOfTriangleFunc | +| 23 | Solve a System of Equations in R^2 | -6x - 10y = 22, 4x - 3y = 53 | x = 8, y = -7 | systemOfEquationsFunc | +| 24 | Distance between 2 points | Find the distance between (6, 2) and (-2, -2) | sqrt(80) | distanceTwoPointsFunc | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 13 = | 16.40 | pythagoreanTheoremFunc | +| 26 | Linear Equations | 8x + -8y = -40 +20x + -16y = -108 | x = -7, y = -2 | linearEquationsFunc | +| 27 | Prime Factorisation | Find prime factors of 29 | [29] | primeFactorsFunc | +| 28 | Fraction Multiplication | (4/7)*(3/9) | 4/21 | multiplyFractionsFunc | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | regularPolygonAngleFunc | +| 30 | Combinations of Objects | Number of combinations from 20 objects picked 5 at a time | 15504 | combinationsFunc | +| 31 | Factorial | 3! = | 6 | factorialFunc | +| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surfaceAreaCube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 4m, 15m, 5m is | 310 m^2 | surfaceAreaCuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 14m and radius = 11m is | 1727 m^2 | surfaceAreaCylinder | +| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volumeCube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 9m, 6m, 15m is | 810 m^3 | volumeCuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 21m and radius = 4m is | 1055 m^3 | volumeCylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 7m and radius = 7m is | 371 m^2 | surfaceAreaCone | +| 39 | Volume of cone | Volume of cone with height = 46m and radius = 15m is | 10838 m^3 | volumeCone | +| 40 | Common Factors | Common Factors of 12 and 76 = | [1, 2, 4] | commonFactorsFunc | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6x + 8 and y = 3/2x + 4 | (-8/9, 8/3) | intersectionOfTwoLinesFunc | +| 42 | Permutations | Number of Permutations from 15 objects picked 5 at a time = | 360360 | permutationFunc | +| 43 | Cross Product of 2 Vectors | [-13, -2, 0] X [-4, 14, -4] = | [8, -52, -190] | vectorCrossFunc | +| 44 | Compare Fractions | Which symbol represents the comparison between 3/8 and 3/9? | > | compareFractionsFunc | +| 45 | Simple Interest | Simple interest for a principle amount of 6266 dollars, 8% rate of interest and for a time period of 3 years is = | 1503.84 | simpleInterestFunc | +| 46 | Multiplication of two matrices | Multiply
30
-1-6
and
4-75-9
08-10-2
|
12-2115-27
-4-415521
| matrixMultiplicationFunc | +| 47 | Cube Root | cuberoot of 362 upto 2 decimal places is: | 7.13 | cubeRootFunc | +| 48 | Power Rule Integration | 2x^6 + 1x^5 + 7x^9 + 1x^10 | (2/6)x^7 + (1/5)x^6 + (7/9)x^10 + (1/10)x^11 + c | powerRuleIntegrationFunc | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 60 , 18, 7 = | 275 | fourthAngleOfQuadriFunc | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 40x^2+121x+89=0 | [-1.26, -1.76] | quadraticEquation | +| 51 | HCF (Highest Common Factor) | HCF of 4 and 12 = | 4 | hcfFunc | | 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 13 = | 21/216 | DiceSumProbFunc | -| 53 | Exponentiation | 6^4 = | 1296 | exponentiationFunc | -| 54 | Confidence interval For sample S | The confidence interval for sample [293, 222, 227, 237, 299, 265, 238, 273, 229, 236, 286, 243, 220, 233, 224, 226, 257, 285, 268, 271, 247, 262] with 90% confidence is | (260.4441418746136, 243.28313085265916) | confidenceIntervalFunc | -| 55 | Comparing surds | Fill in the blanks 66^(1/5) _ 74^(1/6) | > | surdsComparisonFunc | -| 56 | Fibonacci Series | The Fibonacci Series of the first 18 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597] | fibonacciSeriesFunc | -| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometryFunc | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 4 sides = | 360 | sumOfAnglesOfPolygonFunc | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 20, 40, 14, 41, 42, 12, 18, 26, 41, 16, 48, 37, 30, 18] | The Mean is 28.933333333333334 , Standard Deviation is 134.86222222222221, Variance is 11.61301951355556 | dataSummaryFunc | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 16m is | 3216.990877275948 m^2 | surfaceAreaSphere | -| 61 | Volume of Sphere | Volume of sphere with radius 10 m = | 4188.790204786391 m^3 | volumeSphereFunc | -| 62 | nth Fibonacci number | What is the 65th Fibonacci number? | 17167680177565 | nthFibonacciNumberFunc | -| 63 | Profit or Loss Percent | Loss percent when CP = 639 and SP = 20 is: | 96.87010954616588 | profitLossPercentFunc | -| 64 | Binary to Hexidecimal | 10000010 | 0x82 | binaryToHexFunc | -| 65 | Multiplication of 2 complex numbers | (-16-5j) * (13+4j) = | (-188-129j) | multiplyComplexNumbersFunc | -| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,7th term value, sum upto 11th term | The value of a is 5, common ratio is 6 , 7th term is 233280 , sum upto 11th term is 362797055.0 | geomProgrFunc | -| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 12 , 76 and 88 = | (12*76*88)^(1/3) = 43.134606135637426 | geometricMeanFunc | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 32 , 82 , 98 , 59 = | 4/((1/32) + (1/82) + (1/98) + (1/59)) = 56.658543052293126 | harmonicMeanFunc | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[30.49374303007102, 744.9799127067523, 232.71392717506222, 219.07162873155772, 268.6667105157799, 655.700721848602, 630.8781230231998, 525.0331442958861, 603.1960329056955] is: | 1482.467804008134 | euclidianNormFunc | -| 70 | Angle between 2 vectors | angle between the vectors [411.45287273810993, 475.5310005335923, 585.8235737751623, 654.4447552592987, 7.9372591993011055, 944.1669660662357, 82.85267978544842, 855.1153353684535, 401.897628624623, 208.74276524448533, 18.113378046332063, 329.92425644581766, 656.1658677733768] and [340.21944929120787, 595.8624349766976, 458.3226781953552, 460.8316651658132, 237.2935680919427, 562.2537489196774, 705.3352878976389, 21.91461098842251, 950.6814899692208, 879.1343421626799, 177.86771165838067, 867.0564995964864, 762.591298578088] is: | NaN | angleBtwVectorsFunc | -| 71 | Absolute difference between two numbers | Absolute difference between numbers -22 and 85 = | 107 | absoluteDifferenceFunc | -| 72 | Dot Product of 2 Vectors | [-4, -15, -19] . [-12, -18, -13] = | 565 | vectorDotFunc | -| 73 | Binary 2's Complement | 2's complement of = | | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[23, 14, 90], [15, 42, 7], [37, 19, 79]]) is: | Matrix([[-3185/53919, -604/53919, 3682/53919], [926/53919, 1513/53919, -1189/53919], [47/1997, -3/1997, -28/1997]]) | matrixInversion | -| 75 | Area of a Sector | Given radius, 32 and angle, 182. Find the area of the sector. | Area of sector = 1626.36761 | sectorAreaFunc | -| 76 | Mean and Median | Given the series of numbers [83, 63, 31, 44, 12, 73, 42, 51, 93, 3]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.5 and Arithmetic median of this series is 47.5 | meanMedianFunc | -| 77 | Determinant to 2x2 Matrix | Det([[35, 67], [54, 48]]) = | -1938 | determinantToMatrix22 | -| 78 | Compound Interest | Compound Interest for a principle amount of 4487 dollars, 5% rate of interest and for a time period of 9 compounded monthly is = | 4487.0 | compoundInterestFunc | -| 79 | Decimal to Hexadecimal | Binary of 992= | 0x3e0 | deciToHexaFunc | -| 80 | Percentage of a number | What is 37% of 83? | Required percentage = 30.71% | percentageFunc | -| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | celsiustofahrenheit | -| 82 | AP Term Calculation | Find the term number 31 of the AP series: -53, -107, -161 ... | -1673 | arithmeticProgressionTermFunc | -| 83 | AP Sum Calculation | Find the sum of first 56 terms of the AP series: -14, -24, -34 ... | -16184.0 | arithmeticProgressionSumFunc | -| 84 | Converts decimal to octal | The decimal number 1430 in Octal is: | 0o2626 | decimalToOctalFunc | -| 85 | Converts decimal to Roman Numerals | The number 3537 in Roman Numerals is: | MMMDXXXVII | decimalToRomanNumeralsFunc | -| 86 | Degrees to Radians | Angle 87 in radians is = | 1.52 | degreeToRadFunc | +| 53 | Exponentiation | 11^8 = | 214358881 | exponentiationFunc | +| 54 | Confidence interval For sample S | The confidence interval for sample [239, 265, 215, 283, 231, 296, 270, 260, 289, 271, 245, 251, 206, 255, 257, 247, 292, 232, 276, 297, 263, 254, 279, 253, 211, 236, 274, 209, 275, 278, 212, 214, 226, 230, 256, 249, 293] with 95% confidence is | (262.3172302973649, 245.19628321614857) | confidenceIntervalFunc | +| 55 | Comparing surds | Fill in the blanks 86^(1/4) _ 39^(1/1) | < | surdsComparisonFunc | +| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeriesFunc | +| 57 | Trigonometric Values | What is sin(90)? | 1 | basicTrigonometryFunc | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sumOfAnglesOfPolygonFunc | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[19, 23, 36, 18, 44, 47, 18, 40, 27, 25, 14, 16, 6, 29, 50] | The Mean is 27.466666666666665 , Standard Deviation is 163.0488888888889, Variance is 12.769059827915637 | dataSummaryFunc | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 5m is | 314.1592653589793 m^2 | surfaceAreaSphere | +| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphereFunc | +| 62 | nth Fibonacci number | What is the 60th Fibonacci number? | 1548008755920 | nthFibonacciNumberFunc | +| 63 | Profit or Loss Percent | Profit percent when CP = 121 and SP = 615 is: | 408.26446280991735 | profitLossPercentFunc | +| 64 | Binary to Hexidecimal | 10110 | 0x16 | binaryToHexFunc | +| 65 | Multiplication of 2 complex numbers | (20-1j) * (-7+14j) = | (-126+287j) | multiplyComplexNumbersFunc | +| 66 | Geometric Progression | For the given GP [2, 24, 288, 3456, 41472, 497664] ,Find the value of a,common ratio,9th term value, sum upto 10th term | The value of a is 2, common ratio is 12 , 9th term is 859963392 , sum upto 10th term is 11257702586.0 | geomProgrFunc | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 18 , 24 , 99 , 12 = | (18*24*99*12)^(1/4) = 26.765480655440626 | geometricMeanFunc | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 41 and 82 = | 2/((1/41) + (1/82)) = 54.66666666666666 | harmonicMeanFunc | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[690.1926568125737, 148.904898302192, 222.19798825467595, 667.3276829127157, 366.9178192723557, 875.6869024243441, 336.14075266140685, 949.1256775112896, 626.0180041672427, 290.7427227038134, 207.55193301803965, 64.93900706542944, 736.3114771837603, 785.1756497858677] is: | 2142.639328828992 | euclidianNormFunc | +| 70 | Angle between 2 vectors | angle between the vectors [293.12905111302047, 909.0452944804068, 423.60965609823086, 870.8703924858319, 958.9076883380749, 837.4625321599826] and [938.5559146533071, 63.15299226225102, 418.14038421596024, 865.5267136591071, 513.9066820998474, 680.6577264839382] is: | NaN | angleBtwVectorsFunc | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 76 and -20 = | 96 | absoluteDifferenceFunc | +| 72 | Dot Product of 2 Vectors | [19, 10, -5] . [0, -18, 15] = | -255 | vectorDotFunc | +| 73 | Binary 2's Complement | 2's complement of 110 = | 10 | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[61, 68, 75], [31, 77, 66], [33, 59, 58]]) is: | Matrix([[11/141, 37/564, -33/188], [95/1833, 1063/7332, -567/2444], [-178/1833, -1355/7332, 863/2444]]) | matrixInversion | +| 75 | Area of a Sector | Given radius, 20 and angle, 235. Find the area of the sector. | Area of sector = 820.30475 | sectorAreaFunc | +| 76 | Mean and Median | Given the series of numbers [7, 89, 72, 14, 97, 48, 35, 12, 11, 27]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 41.2 and Arithmetic median of this series is 31.0 | meanMedianFunc | +| 77 | Determinant to 2x2 Matrix | Det([[26, 78], [39, 24]]) = | -2418 | determinantToMatrix22 | +| 78 | Compound Interest | Compound Interest for a principle amount of 6842 dollars, 8% rate of interest and for a time period of 5 compounded monthly is = | 6842.0 | compoundInterestFunc | +| 79 | Decimal to Hexadecimal | Binary of 860= | 0x35c | deciToHexaFunc | +| 80 | Percentage of a number | What is 75% of 28? | Required percentage = 21.00% | percentageFunc | +| 81 | Celsius To Fahrenheit | Convert 30 degrees Celsius to degrees Fahrenheit = | 86.0 | celsiustofahrenheit | +| 82 | AP Term Calculation | Find the term number 47 of the AP series: -56, 37, 130 ... | 4222 | arithmeticProgressionTermFunc | +| 83 | AP Sum Calculation | Find the sum of first 79 terms of the AP series: 34, 24, 14 ... | -28124.0 | arithmeticProgressionSumFunc | +| 84 | Converts decimal to octal | The decimal number 2245 in Octal is: | 0o4305 | decimalToOctalFunc | +| 85 | Converts decimal to Roman Numerals | The number 1658 in Roman Numerals is: | MDCLVIII | decimalToRomanNumeralsFunc | +| 86 | Degrees to Radians | Angle 12 in radians is = | 0.21 | degreeToRadFunc | | 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | diff --git a/makeReadme.py b/makeReadme.py index fb2894c..c17e15b 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -1,5 +1,3 @@ -# To use, paste at bottom of mathgen.py code, change line variable and remove all table rows in README.md except for the top 2 and run mathgen.py -# NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * @@ -20,12 +18,9 @@ with open('mathgenerator/mathgen.py', 'r') as f: lines = f.readlines() allRows = [] -# 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 - # print(item[3]) prob, solu = myGen() prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") @@ -37,15 +32,10 @@ for item in wList: prob = array2markdown_table(prob) solu = array2markdown_table(solu) - # instName = lines[line] # NOTE: renamed 'def_name' to 'func_name' because it suits it more - #func_name = instName[:instName.find('=')].strip() func_name = item[3] row = [myGen.id, myGen.title, prob, solu, func_name] print('added', item[1], '-', func_name, 'to the README.md') - # line += 1 - # if line > len(lines): - # break allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 33669b5..c4cea28 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -14,7 +14,7 @@ class Generator: (filename, line_number, function_name, text) = traceback.extract_stack()[-2] funcname = filename[filename.rfind('/'):].strip() funcname = funcname[1:-3] - print(funcname) + # print(funcname) genList.append([id, title, self, funcname]) def __str__(self): diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index cd5db00..9cd5a8f 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -16,16 +16,13 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): for i in range(number_values): 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) + standardDeviation = var / number_values + variance = (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, standardDeviation, variance) return problem, solution From cbede21ddf0811f3644d7fb507d794d83156f6f4 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 11:30:55 -0400 Subject: [PATCH 4/8] renamed modules and generators to fit pep8 --- mathgenerator/funcs/__init__.py | 176 +++++++++--------- ...fferenceFunc.py => absolute_difference.py} | 3 +- mathgenerator/funcs/addition.py | 1 - ...BtwVectorsFunc.py => angle_btw_vectors.py} | 3 +- ...nAngleFunc.py => angle_regular_polygon.py} | 3 +- ...aOfTriangleFunc.py => area_of_triangle.py} | 7 +- ...mFunc.py => arithmetic_progression_sum.py} | 7 +- ...Func.py => arithmetic_progression_term.py} | 7 +- .../{basicAlgebraFunc.py => basic_algebra.py} | 5 +- ...gonometryFunc.py => basic_trigonometry.py} | 5 +- ...sComplement.py => binary_2s_complement.py} | 7 +- ...ement1sFunc.py => binary_complement_1s.py} | 5 +- ...yToDecimalFunc.py => binary_to_decimal.py} | 7 +- .../{binaryToHexFunc.py => binary_to_hex.py} | 5 +- ...fahrenheit.py => celsius_to_fahrenheit.py} | 5 +- .../{combinationsFunc.py => combinations.py} | 1 - ...commonFactorsFunc.py => common_factors.py} | 7 +- ...eFractionsFunc.py => compare_fractions.py} | 3 +- ...ndInterestFunc.py => compound_interest.py} | 3 +- ...IntervalFunc.py => confidence_interval.py} | 7 +- .../funcs/{cubeRootFunc.py => cube_root.py} | 5 +- .../{dataSummaryFunc.py => data_summary.py} | 5 +- ...alToBinaryFunc.py => decimal_to_binary.py} | 5 +- ...ciToHexaFunc.py => decimal_to_hexadeci.py} | 5 +- ...imalToOctalFunc.py => decimal_to_octal.py} | 4 +- ...lsFunc.py => decimal_to_roman_numerals.py} | 4 +- .../{degreeToRadFunc.py => degree_to_rad.py} | 3 +- ...SumProbFunc.py => dice_sum_probability.py} | 3 +- ...woPointsFunc.py => distance_two_points.py} | 7 +- ...deFractionsFunc.py => divide_fractions.py} | 3 +- .../funcs/{divisionFunc.py => division.py} | 1 - ...euclidianNormFunc.py => euclidian_norm.py} | 7 +- ...xponentiationFunc.py => exponentiation.py} | 1 - .../funcs/{factorialFunc.py => factorial.py} | 1 - .../funcs/{factoringFunc.py => factoring.py} | 1 - ...nacciSeriesFunc.py => fibonacci_series.py} | 3 +- ...nc.py => fourth_angle_of_quadrilateral.py} | 3 +- ...ionsFunc.py => fraction_multiplication.py} | 7 +- mathgenerator/funcs/{gcdFunc.py => gcd.py} | 1 - ...geometricMeanFunc.py => geometric_mean.py} | 7 +- ...mProgrFunc.py => geometric_progression.py} | 3 +- .../{harmonicMeanFunc.py => harmonic_mean.py} | 9 +- mathgenerator/funcs/{hcfFunc.py => hcf.py} | 1 - .../{divisionToIntFunc.py => int_division.py} | 3 +- ...trix22.py => int_matrix_22_determinant.py} | 7 +- ...esFunc.py => intersection_of_two_lines.py} | 3 +- .../{matrixInversion.py => invert_matrix.py} | 5 +- mathgenerator/funcs/{lcmFunc.py => lcm.py} | 1 - ...arEquationsFunc.py => linear_equations.py} | 5 +- mathgenerator/funcs/{logFunc.py => log.py} | 1 - ...cationFunc.py => matrix_multiplication.py} | 7 +- .../{meanMedianFunc.py => mean_median.py} | 7 +- ...PointFunc.py => midpoint_of_two_points.py} | 7 +- .../{moduloFunc.py => modulo_division.py} | 3 +- ...ultiplicationFunc.py => multiplication.py} | 1 - ...ersFunc.py => multiply_complex_numbers.py} | 7 +- ...trix22.py => multiply_int_to_22_matrix.py} | 3 +- ...iNumberFunc.py => nth_fibonacci_number.py} | 7 +- .../{percentageFunc.py => percentage.py} | 1 - .../{permutationFunc.py => permutation.py} | 3 +- ...nFunc.py => power_rule_differentiation.py} | 7 +- ...ationFunc.py => power_rule_integration.py} | 5 +- .../{primeFactorsFunc.py => prime_factors.py} | 5 +- ...sPercentFunc.py => profit_loss_percent.py} | 3 +- ...nTheoremFunc.py => pythagorean_theorem.py} | 3 +- ...raticEquation.py => quadratic_equation.py} | 3 +- .../{radianToDegFunc.py => radian_to_deg.py} | 3 +- .../{sectorAreaFunc.py => sector_area.py} | 7 +- ...mpleInterestFunc.py => simple_interest.py} | 3 +- .../funcs/{squareFunc.py => square.py} | 1 - .../{squareRootFunc.py => square_root.py} | 3 +- .../{subtractionFunc.py => subtraction.py} | 1 - ...olygonFunc.py => sum_of_polygon_angles.py} | 7 +- ...sComparisonFunc.py => surds_comparison.py} | 7 +- ...urfaceAreaCone.py => surface_area_cone.py} | 3 +- ...urfaceAreaCube.py => surface_area_cube.py} | 7 +- ...ceAreaCuboid.py => surface_area_cuboid.py} | 3 +- ...eaCylinder.py => surface_area_cylinder.py} | 3 +- ...ceAreaSphere.py => surface_area_sphere.py} | 3 +- ...quationsFunc.py => system_of_equations.py} | 7 +- ...ngleFunc.py => third_angle_of_triangle.py} | 7 +- ...TriangleValidFunc.py => valid_triangle.py} | 7 +- .../{vectorCrossFunc.py => vector_cross.py} | 5 +- .../funcs/{vectorDotFunc.py => vector_dot.py} | 5 +- .../funcs/{volumeCone.py => volume_cone.py} | 3 +- .../funcs/{volumeCube.py => volume_cube.py} | 7 +- .../{volumeCuboid.py => volume_cuboid.py} | 3 +- .../{volumeCylinder.py => volume_cylinder.py} | 3 +- .../{volumeSphereFunc.py => volume_sphere.py} | 7 +- test.py | 4 +- 90 files changed, 241 insertions(+), 321 deletions(-) rename mathgenerator/funcs/{absoluteDifferenceFunc.py => absolute_difference.py} (88%) rename mathgenerator/funcs/{angleBtwVectorsFunc.py => angle_btw_vectors.py} (93%) rename mathgenerator/funcs/{regularPolygonAngleFunc.py => angle_regular_polygon.py} (86%) rename mathgenerator/funcs/{areaOfTriangleFunc.py => area_of_triangle.py} (65%) rename mathgenerator/funcs/{arithmeticProgressionSumFunc.py => arithmetic_progression_sum.py} (63%) rename mathgenerator/funcs/{arithmeticProgressionTermFunc.py => arithmetic_progression_term.py} (62%) rename mathgenerator/funcs/{basicAlgebraFunc.py => basic_algebra.py} (79%) rename mathgenerator/funcs/{basicTrigonometryFunc.py => basic_trigonometry.py} (81%) rename mathgenerator/funcs/{binary2sComplement.py => binary_2s_complement.py} (76%) rename mathgenerator/funcs/{binaryComplement1sFunc.py => binary_complement_1s.py} (68%) rename mathgenerator/funcs/{BinaryToDecimalFunc.py => binary_to_decimal.py} (53%) rename mathgenerator/funcs/{binaryToHexFunc.py => binary_to_hex.py} (62%) rename mathgenerator/funcs/{celsiustofahrenheit.py => celsius_to_fahrenheit.py} (63%) rename mathgenerator/funcs/{combinationsFunc.py => combinations.py} (95%) rename mathgenerator/funcs/{commonFactorsFunc.py => common_factors.py} (70%) rename mathgenerator/funcs/{compareFractionsFunc.py => compare_fractions.py} (92%) rename mathgenerator/funcs/{compoundInterestFunc.py => compound_interest.py} (93%) rename mathgenerator/funcs/{confidenceIntervalFunc.py => confidence_interval.py} (76%) rename mathgenerator/funcs/{cubeRootFunc.py => cube_root.py} (62%) rename mathgenerator/funcs/{dataSummaryFunc.py => data_summary.py} (80%) rename mathgenerator/funcs/{DecimalToBinaryFunc.py => decimal_to_binary.py} (59%) rename mathgenerator/funcs/{deciToHexaFunc.py => decimal_to_hexadeci.py} (56%) rename mathgenerator/funcs/{decimalToOctalFunc.py => decimal_to_octal.py} (57%) rename mathgenerator/funcs/{decimalToRomanNumeralsFunc.py => decimal_to_roman_numerals.py} (83%) rename mathgenerator/funcs/{degreeToRadFunc.py => degree_to_rad.py} (67%) rename mathgenerator/funcs/{DiceSumProbFunc.py => dice_sum_probability.py} (93%) rename mathgenerator/funcs/{distanceTwoPointsFunc.py => distance_two_points.py} (68%) rename mathgenerator/funcs/{divideFractionsFunc.py => divide_fractions.py} (88%) rename mathgenerator/funcs/{divisionFunc.py => division.py} (90%) rename mathgenerator/funcs/{euclidianNormFunc.py => euclidian_norm.py} (52%) rename mathgenerator/funcs/{exponentiationFunc.py => exponentiation.py} (91%) rename mathgenerator/funcs/{factorialFunc.py => factorial.py} (90%) rename mathgenerator/funcs/{factoringFunc.py => factoring.py} (95%) rename mathgenerator/funcs/{fibonacciSeriesFunc.py => fibonacci_series.py} (91%) rename mathgenerator/funcs/{fourthAngleOfQuadriFunc.py => fourth_angle_of_quadrilateral.py} (88%) rename mathgenerator/funcs/{multiplyFractionsFunc.py => fraction_multiplication.py} (75%) rename mathgenerator/funcs/{gcdFunc.py => gcd.py} (91%) rename mathgenerator/funcs/{geometricMeanFunc.py => geometric_mean.py} (78%) rename mathgenerator/funcs/{geomProgrFunc.py => geometric_progression.py} (94%) rename mathgenerator/funcs/{harmonicMeanFunc.py => harmonic_mean.py} (77%) rename mathgenerator/funcs/{hcfFunc.py => hcf.py} (91%) rename mathgenerator/funcs/{divisionToIntFunc.py => int_division.py} (73%) rename mathgenerator/funcs/{determinantToMatrix22.py => int_matrix_22_determinant.py} (61%) rename mathgenerator/funcs/{intersectionOfTwoLinesFunc.py => intersection_of_two_lines.py} (97%) rename mathgenerator/funcs/{matrixInversion.py => invert_matrix.py} (94%) rename mathgenerator/funcs/{lcmFunc.py => lcm.py} (92%) rename mathgenerator/funcs/{linearEquationsFunc.py => linear_equations.py} (83%) rename mathgenerator/funcs/{logFunc.py => log.py} (90%) rename mathgenerator/funcs/{matrixMultiplicationFunc.py => matrix_multiplication.py} (85%) rename mathgenerator/funcs/{meanMedianFunc.py => mean_median.py} (71%) rename mathgenerator/funcs/{MidPointOfTwoPointFunc.py => midpoint_of_two_points.py} (59%) rename mathgenerator/funcs/{moduloFunc.py => modulo_division.py} (72%) rename mathgenerator/funcs/{multiplicationFunc.py => multiplication.py} (93%) rename mathgenerator/funcs/{multiplyComplexNumbersFunc.py => multiply_complex_numbers.py} (69%) rename mathgenerator/funcs/{multiplyIntToMatrix22.py => multiply_int_to_22_matrix.py} (87%) rename mathgenerator/funcs/{nthFibonacciNumberFunc.py => nth_fibonacci_number.py} (59%) rename mathgenerator/funcs/{percentageFunc.py => percentage.py} (93%) rename mathgenerator/funcs/{permutationFunc.py => permutation.py} (88%) rename mathgenerator/funcs/{powerRuleDifferentiationFunc.py => power_rule_differentiation.py} (69%) rename mathgenerator/funcs/{powerRuleIntegrationFunc.py => power_rule_integration.py} (76%) rename mathgenerator/funcs/{primeFactorsFunc.py => prime_factors.py} (70%) rename mathgenerator/funcs/{profitLossPercentFunc.py => profit_loss_percent.py} (89%) rename mathgenerator/funcs/{pythagoreanTheoremFunc.py => pythagorean_theorem.py} (88%) rename mathgenerator/funcs/{quadraticEquation.py => quadratic_equation.py} (89%) rename mathgenerator/funcs/{radianToDegFunc.py => radian_to_deg.py} (72%) rename mathgenerator/funcs/{sectorAreaFunc.py => sector_area.py} (68%) rename mathgenerator/funcs/{simpleInterestFunc.py => simple_interest.py} (91%) rename mathgenerator/funcs/{squareFunc.py => square.py} (88%) rename mathgenerator/funcs/{squareRootFunc.py => square_root.py} (66%) rename mathgenerator/funcs/{subtractionFunc.py => subtraction.py} (91%) rename mathgenerator/funcs/{sumOfAnglesOfPolygonFunc.py => sum_of_polygon_angles.py} (50%) rename mathgenerator/funcs/{surdsComparisonFunc.py => surds_comparison.py} (72%) rename mathgenerator/funcs/{surfaceAreaCone.py => surface_area_cone.py} (89%) rename mathgenerator/funcs/{surfaceAreaCube.py => surface_area_cube.py} (52%) rename mathgenerator/funcs/{surfaceAreaCuboid.py => surface_area_cuboid.py} (88%) rename mathgenerator/funcs/{surfaceAreaCylinder.py => surface_area_cylinder.py} (88%) rename mathgenerator/funcs/{surfaceAreaSphere.py => surface_area_sphere.py} (85%) rename mathgenerator/funcs/{systemOfEquationsFunc.py => system_of_equations.py} (89%) rename mathgenerator/funcs/{thirdAngleOfTriangleFunc.py => third_angle_of_triangle.py} (57%) rename mathgenerator/funcs/{isTriangleValidFunc.py => valid_triangle.py} (72%) rename mathgenerator/funcs/{vectorCrossFunc.py => vector_cross.py} (72%) rename mathgenerator/funcs/{vectorDotFunc.py => vector_dot.py} (70%) rename mathgenerator/funcs/{volumeCone.py => volume_cone.py} (88%) rename mathgenerator/funcs/{volumeCube.py => volume_cube.py} (55%) rename mathgenerator/funcs/{volumeCuboid.py => volume_cuboid.py} (88%) rename mathgenerator/funcs/{volumeCylinder.py => volume_cylinder.py} (88%) rename mathgenerator/funcs/{volumeSphereFunc.py => volume_sphere.py} (55%) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 12bf15e..9f82f30 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,91 +2,93 @@ import random import math import fractions +from ..__init__ import * + from .addition import * -from .subtractionFunc import * -from .multiplicationFunc import * -from .divisionFunc import * -from .binaryComplement1sFunc import * -from .moduloFunc import * -from .squareRootFunc import * -from .powerRuleDifferentiationFunc import * -from .squareFunc import * -from .lcmFunc import * -from .gcdFunc import * -from .basicAlgebraFunc import * -from .logFunc import * -from .divisionToIntFunc import * -from .DecimalToBinaryFunc import * -from .BinaryToDecimalFunc import * -from .divideFractionsFunc import * -from .multiplyIntToMatrix22 import * -from .areaOfTriangleFunc import * -from .isTriangleValidFunc import * -from .MidPointOfTwoPointFunc import * -from .factoringFunc import * -from .thirdAngleOfTriangleFunc import * -from .systemOfEquationsFunc import * -from .distanceTwoPointsFunc import * -from .pythagoreanTheoremFunc import * -from .linearEquationsFunc import * -from .primeFactorsFunc import * -from .multiplyFractionsFunc import * -from .regularPolygonAngleFunc import * -from .combinationsFunc import * -from .factorialFunc import * -from .surfaceAreaCube import * -from .surfaceAreaCuboid import * -from .surfaceAreaCylinder import * -from .volumeCube import * -from .volumeCuboid import * -from .volumeCylinder import * -from .surfaceAreaCone import * -from .volumeCone import * -from .commonFactorsFunc import * -from .intersectionOfTwoLinesFunc import * -from .permutationFunc import * -from .vectorCrossFunc import * -from .compareFractionsFunc import * -from .simpleInterestFunc import * -from .matrixMultiplicationFunc import * -from .cubeRootFunc import * -from .powerRuleIntegrationFunc import * -from .fourthAngleOfQuadriFunc import * -from .quadraticEquation import * -from .hcfFunc import * -from .DiceSumProbFunc import * -from .exponentiationFunc import * -from .confidenceIntervalFunc import * -from .surdsComparisonFunc import * -from .fibonacciSeriesFunc import * -from .basicTrigonometryFunc import * -from .sumOfAnglesOfPolygonFunc import * -from .dataSummaryFunc import * -from .surfaceAreaSphere import * -from .volumeSphereFunc import * -from .nthFibonacciNumberFunc import * -from .profitLossPercentFunc import * -from .binaryToHexFunc import * -from .multiplyComplexNumbersFunc import * -from .geomProgrFunc import * -from .geometricMeanFunc import * -from .harmonicMeanFunc import * -from .euclidianNormFunc import * -from .angleBtwVectorsFunc import * -from .absoluteDifferenceFunc import * -from .vectorDotFunc import * -from .binary2sComplement import * -from .matrixInversion import * -from .sectorAreaFunc import * -from .meanMedianFunc import * -from .determinantToMatrix22 import * -from .compoundInterestFunc import * -from .deciToHexaFunc import * -from .percentageFunc import * -from .celsiustofahrenheit import * -from .arithmeticProgressionTermFunc import * -from .arithmeticProgressionSumFunc import * -from .decimalToOctalFunc import * -from .decimalToRomanNumeralsFunc import * -from .degreeToRadFunc import * -from .radianToDegFunc import * +from .subtraction import * +from .multiplication import * +from .division import * +from .binary_complement_1s import * +from .modulo_division import * +from .square_root import * +from .power_rule_differentiation import * +from .square import * +from .lcm import * +from .gcd import * +from .basic_algebra import * +from .log import * +from .int_division import * +from .decimal_to_binary import * +from .binary_to_decimal import * +from .divide_fractions import * +from .multiply_int_to_22_matrix import * +from .area_of_triangle import * +from .valid_triangle import * +from .midpoint_of_two_points import * +from .factoring import * +from .third_angle_of_triangle import * +from .system_of_equations import * +from .distance_two_points import * +from .pythagorean_theorem import * +from .linear_equations import * +from .prime_factors import * +from .fraction_multiplication import * +from .angle_regular_polygon import * +from .combinations import * +from .factorial import * +from .surface_area_cube import * +from .surface_area_cuboid import * +from .surface_area_cylinder import * +from .volume_cube import * +from .volume_cuboid import * +from .volume_cylinder import * +from .surface_area_cone import * +from .volume_cone import * +from .common_factors import * +from .intersection_of_two_lines import * +from .permutation import * +from .vector_cross import * +from .compare_fractions import * +from .simple_interest import * +from .matrix_multiplication import * +from .cube_root import * +from .power_rule_integration import * +from .fourth_angle_of_quadrilateral import * +from .quadratic_equation import * +from .hcf import * +from .dice_sum_probability import * +from .exponentiation import * +from .confidence_interval import * +from .surds_comparison import * +from .fibonacci_series import * +from .basic_trigonometry import * +from .sum_of_polygon_angles import * +from .data_summary import * +from .surface_area_sphere import * +from .volume_sphere import * +from .nth_fibonacci_number import * +from .profit_loss_percent import * +from .binary_to_hex import * +from .multiply_complex_numbers import * +from .geometric_progression import * +from .geometric_mean import * +from .harmonic_mean import * +from .euclidian_norm import * +from .angle_btw_vectors import * +from .absolute_difference import * +from .vector_dot import * +from .binary_2s_complement import * +from .invert_matrix import * +from .sector_area import * +from .mean_median import * +from .int_matrix_22_determinant import * +from .compound_interest import * +from .decimal_to_hexadeci import * +from .percentage import * +from .celsius_to_fahrenheit import * +from .arithmetic_progression_term import * +from .arithmetic_progression_sum import * +from .decimal_to_octal import * +from .decimal_to_roman_numerals import * +from .degree_to_rad import * +from .radian_to_deg import * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absolute_difference.py similarity index 88% rename from mathgenerator/funcs/absoluteDifferenceFunc.py rename to mathgenerator/funcs/absolute_difference.py index 755e049..fae1fb0 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absolute_difference.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): @@ -13,7 +12,7 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): return problem, solution -absoluteDifference = Generator( +absolute_difference = Generator( "Absolute difference between two numbers", 71, "Absolute difference betweeen two numbers a and b =", "|a-b|", absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/addition.py index df74496..cab6dac 100644 --- a/mathgenerator/funcs/addition.py +++ b/mathgenerator/funcs/addition.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def additionFunc(maxSum=99, maxAddend=50): diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angle_btw_vectors.py similarity index 93% rename from mathgenerator/funcs/angleBtwVectorsFunc.py rename to mathgenerator/funcs/angle_btw_vectors.py index 9d8d817..f3b8a65 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angle_btw_vectors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator import math @@ -23,7 +22,7 @@ def angleBtwVectorsFunc(maxEltAmt=20): return problem, solution -angleBtwVectors = Generator( +angle_btw_vectors = Generator( "Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/angle_regular_polygon.py similarity index 86% rename from mathgenerator/funcs/regularPolygonAngleFunc.py rename to mathgenerator/funcs/angle_regular_polygon.py index a264c5a..90f2c71 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/angle_regular_polygon.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): @@ -11,7 +10,7 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): return problem, solution -angleRegularPolygon = Generator( +angle_regular_polygon = Generator( "Angle of a Regular Polygon", 29, "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/area_of_triangle.py similarity index 65% rename from mathgenerator/funcs/areaOfTriangleFunc.py rename to mathgenerator/funcs/area_of_triangle.py index c49167c..488a997 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/area_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -16,6 +15,6 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): return problem, solution -areaOfTriangle = Generator("Area of Triangle", 18, - "Area of Triangle with side lengths a, b, c = ", - "area", areaOfTriangleFunc) +area_of_triangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmetic_progression_sum.py similarity index 63% rename from mathgenerator/funcs/arithmeticProgressionSumFunc.py rename to mathgenerator/funcs/arithmetic_progression_sum.py index 294cb7f..e376c3f 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_sum.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionSum = Generator("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) +arithmetic_progression_sum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmetic_progression_term.py similarity index 62% rename from mathgenerator/funcs/arithmeticProgressionTermFunc.py rename to mathgenerator/funcs/arithmetic_progression_term.py index e549c18..8468921 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_term.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionTerm = Generator("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ...", - "a-n", arithmeticProgressionTermFunc) +arithmetic_progression_term = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basic_algebra.py similarity index 79% rename from mathgenerator/funcs/basicAlgebraFunc.py rename to mathgenerator/funcs/basic_algebra.py index 504ac41..0626cf8 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basic_algebra.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): @@ -26,5 +25,5 @@ def basicAlgebraFunc(maxVariable=10): return problem, solution -basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", - basicAlgebraFunc) +basic_algebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basic_trigonometry.py similarity index 81% rename from mathgenerator/funcs/basicTrigonometryFunc.py rename to mathgenerator/funcs/basic_trigonometry.py index da6d97c..2992034 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basic_trigonometry.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator # Handles degrees in quadrant one @@ -26,5 +25,5 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], return problem, solution -basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", - "ans", basicTrigonometryFunc) +basic_trigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary_2s_complement.py similarity index 76% rename from mathgenerator/funcs/binary2sComplement.py rename to mathgenerator/funcs/binary_2s_complement.py index 891990d..f053020 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary_2s_complement.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): @@ -29,6 +28,6 @@ def binary2sComplementFunc(maxDigits=10): return problem, solution -binary2sComplement = Generator("Binary 2's Complement", 73, - "2's complement of 11010110 =", "101010", - binary2sComplementFunc) +binary_2s_complement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binary_complement_1s.py similarity index 68% rename from mathgenerator/funcs/binaryComplement1sFunc.py rename to mathgenerator/funcs/binary_complement_1s.py index f748af5..da6c481 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binary_complement_1s.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): @@ -16,5 +15,5 @@ def binaryComplement1sFunc(maxDigits=10): return problem, solution -binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", - binaryComplement1sFunc) +binary_complement_1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/binary_to_decimal.py similarity index 53% rename from mathgenerator/funcs/BinaryToDecimalFunc.py rename to mathgenerator/funcs/binary_to_decimal.py index 01fb780..f7e0aa8 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/binary_to_decimal.py @@ -1,8 +1,7 @@ from .__init__ import * -from ..__init__ import Generator -def BinaryToDecimalFunc(max_dig=10): +def binaryToDecimalFunc(max_dig=10): problem = '' for i in range(random.randint(1, max_dig)): @@ -13,5 +12,5 @@ def BinaryToDecimalFunc(max_dig=10): return problem, solution -binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", - BinaryToDecimalFunc) +binary_to_decimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + binaryToDecimalFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binary_to_hex.py similarity index 62% rename from mathgenerator/funcs/binaryToHexFunc.py rename to mathgenerator/funcs/binary_to_hex.py index 12dbe7f..77b03b1 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binary_to_hex.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryToHexFunc(max_dig=10): @@ -12,5 +11,5 @@ def binaryToHexFunc(max_dig=10): return problem, solution -binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", - binaryToHexFunc) +binary_to_hex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsius_to_fahrenheit.py similarity index 63% rename from mathgenerator/funcs/celsiustofahrenheit.py rename to mathgenerator/funcs/celsius_to_fahrenheit.py index 0e66be8..45122d0 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsius_to_fahrenheit.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def celsiustofahrenheitFunc(maxTemp=100): @@ -10,5 +9,5 @@ def celsiustofahrenheitFunc(maxTemp=100): return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, - "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) +celsius_to_fahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinations.py similarity index 95% rename from mathgenerator/funcs/combinationsFunc.py rename to mathgenerator/funcs/combinations.py index ca42532..60c7b41 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def combinationsFunc(maxlength=20): diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/common_factors.py similarity index 70% rename from mathgenerator/funcs/commonFactorsFunc.py rename to mathgenerator/funcs/common_factors.py index 929c48e..a783909 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/common_factors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def commonFactorsFunc(maxVal=100): @@ -25,6 +24,6 @@ def commonFactorsFunc(maxVal=100): return problem, solution -commonFactors = Generator("Common Factors", 40, - "Common Factors of {a} and {b} = ", "[c, d, ...]", - commonFactorsFunc) +common_factors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compare_fractions.py similarity index 92% rename from mathgenerator/funcs/compareFractionsFunc.py rename to mathgenerator/funcs/compare_fractions.py index 19ba5c9..53fe7a0 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compare_fractions.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def compareFractionsFunc(maxVal=10): @@ -27,7 +26,7 @@ def compareFractionsFunc(maxVal=10): return problem, solution -compareFractions = Generator( +compare_fractions = Generator( "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">//=", - surdsComparisonFunc) +surds_comparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", "/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surface_area_cone.py similarity index 89% rename from mathgenerator/funcs/surfaceAreaCone.py rename to mathgenerator/funcs/surface_area_cone.py index 8497460..2d86c5e 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surface_area_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): @@ -14,7 +13,7 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaConeGen = Generator( +surface_area_cone = Generator( "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surface_area_cube.py similarity index 52% rename from mathgenerator/funcs/surfaceAreaCube.py rename to mathgenerator/funcs/surface_area_cube.py index 42b07f4..f2f4a99 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surface_area_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): @@ -10,6 +9,6 @@ def surfaceAreaCube(maxSide=20, unit='m'): return problem, solution -surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, - "Surface area of cube with side a units is", - "b units^2", surfaceAreaCube) +surface_area_cube = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surface_area_cuboid.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCuboid.py rename to mathgenerator/funcs/surface_area_cuboid.py index 0889441..723217c 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surface_area_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): return problem, solution -surfaceAreaCuboidGen = Generator( +surface_area_cuboid = Generator( "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surface_area_cylinder.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCylinder.py rename to mathgenerator/funcs/surface_area_cylinder.py index 3a7a1e8..bdbed93 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surface_area_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaCylinderGen = Generator( +surface_area_cylinder = Generator( "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surface_area_sphere.py similarity index 85% rename from mathgenerator/funcs/surfaceAreaSphere.py rename to mathgenerator/funcs/surface_area_sphere.py index 86a9456..bc5e91a 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surface_area_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): @@ -11,7 +10,7 @@ def surfaceAreaSphere(maxSide=20, unit='m'): return problem, solution -surfaceAreaSphereGen = Generator( +surface_area_sphere = Generator( "Surface Area of Sphere", 60, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/system_of_equations.py similarity index 89% rename from mathgenerator/funcs/systemOfEquationsFunc.py rename to mathgenerator/funcs/system_of_equations.py index ef00b0e..c35e549 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/system_of_equations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): @@ -48,6 +47,6 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): # Add random (non-zero) multiple of equations to each other -systemOfEquations = Generator("Solve a System of Equations in R^2", 23, - "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", - systemOfEquationsFunc) +system_of_equations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/third_angle_of_triangle.py similarity index 57% rename from mathgenerator/funcs/thirdAngleOfTriangleFunc.py rename to mathgenerator/funcs/third_angle_of_triangle.py index f5f7afb..b41ff35 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/third_angle_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): @@ -12,6 +11,6 @@ def thirdAngleOfTriangleFunc(maxAngle=89): return problem, solution -thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, - "Third Angle of the triangle = ", "angle3", - thirdAngleOfTriangleFunc) +third_angle_of_triangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/valid_triangle.py similarity index 72% rename from mathgenerator/funcs/isTriangleValidFunc.py rename to mathgenerator/funcs/valid_triangle.py index 19a4240..e8a5128 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/valid_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): @@ -21,6 +20,6 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution -doesTriangleExist = Generator("Triangle exists check", 19, - "Does triangle with sides a, b and c exist?", - "Yes/No", isTriangleValidFunc) +valid_triangle = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vector_cross.py similarity index 72% rename from mathgenerator/funcs/vectorCrossFunc.py rename to mathgenerator/funcs/vector_cross.py index 318beec..92b82a9 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vector_cross.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): @@ -15,5 +14,5 @@ def vectorCrossFunc(minVal=-20, maxVal=20): return problem, solution -vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", - vectorCrossFunc) +vector_cross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vector_dot.py similarity index 70% rename from mathgenerator/funcs/vectorDotFunc.py rename to mathgenerator/funcs/vector_dot.py index 0ca2609..608ce66 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vector_dot.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): @@ -12,5 +11,5 @@ def vectorDotFunc(minVal=-20, maxVal=20): return problem, solution -vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", - vectorDotFunc) +vector_dot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volume_cone.py similarity index 88% rename from mathgenerator/funcs/volumeCone.py rename to mathgenerator/funcs/volume_cone.py index 85dbd55..39a3a26 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volume_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeConeGen = Generator( +volume_cone = Generator( "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volume_cube.py similarity index 55% rename from mathgenerator/funcs/volumeCube.py rename to mathgenerator/funcs/volume_cube.py index ff1ac76..1de5984 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volume_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): @@ -11,6 +10,6 @@ def volumeCube(maxSide=20, unit='m'): return problem, solution -volumeCubeGen = Generator("Volum of Cube", 35, - "Volume of cube with side a units is", "b units^3", - volumeCube) +volume_cube = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volume_cuboid.py similarity index 88% rename from mathgenerator/funcs/volumeCuboid.py rename to mathgenerator/funcs/volume_cuboid.py index d25d753..a1eee6f 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volume_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def volumeCuboid(maxSide=20, unit='m'): return problem, solution -volumeCuboidGen = Generator( +volume_cuboid = Generator( "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volume_cylinder.py similarity index 88% rename from mathgenerator/funcs/volumeCylinder.py rename to mathgenerator/funcs/volume_cylinder.py index e021aab..28b89a1 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volume_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeCylinderGen = Generator( +volume_cylinder = Generator( "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volume_sphere.py similarity index 55% rename from mathgenerator/funcs/volumeSphereFunc.py rename to mathgenerator/funcs/volume_sphere.py index 038607e..b686bd4 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volume_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): @@ -11,6 +10,6 @@ def volumeSphereFunc(maxRadius=100): return problem, solution -volumeSphere = Generator("Volume of Sphere", 61, - "Volume of sphere with radius r m = ", - "(4*pi/3)*r*r*r", volumeSphereFunc) +volume_sphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/test.py b/test.py index 8cd6bd0..9625e78 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,7 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(70)) +print(mathgen.genById(40)) # prints each generator in genList """ @@ -11,5 +11,5 @@ list = mathgen.getGenList() for item in list: print(item[2]) -print(mathgen.getGenList()) +# print(mathgen.getGenList()) """ From 1f708af50f7374289f69e0c0b8671f5ae40f873e Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 11:37:59 -0400 Subject: [PATCH 5/8] fixed tests --- tests/test_mathgen.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_mathgen.py b/tests/test_mathgen.py index ed9066b..745b9dc 100644 --- a/tests/test_mathgen.py +++ b/tests/test_mathgen.py @@ -33,15 +33,15 @@ def test_division(maxRes, maxDivid): @given(maxRes=st.integers(min_value=1), maxModulo=st.integers(min_value=1)) -def test_moduloDivision(maxRes, maxModulo): +def test_modulo_division(maxRes, maxModulo): assume(maxRes > maxModulo) - problem, solution = moduloDivision.func(maxRes, maxModulo) + problem, solution = modulo_division.func(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)) -def test_squareRoot(minNo, maxNo): +def test_square_root(minNo, maxNo): assume(maxNo > minNo) - problem, solution = squareRoot.func(minNo, maxNo) + problem, solution = square_root.func(minNo, maxNo) assert eval(problem[:-1]) == float(solution) From 80278e44a94e29f6deebc2ff1865287730dd4f3a Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 11:43:54 -0400 Subject: [PATCH 6/8] update readme --- README.md | 178 +++++++++++++++++++++++++++--------------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 87ca9e6..8bec872 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 39+14= | 53 | addition | -| 1 | Subtraction | 28-20= | 8 | subtractionFunc | -| 2 | Multiplication | 23*2= | 46 | multiplicationFunc | -| 3 | Division | 34/27= | 1.2592592592592593 | divisionFunc | -| 4 | Binary Complement 1s | 01101= | 10010 | binaryComplement1sFunc | -| 5 | Modulo Division | 27%67= | 27 | moduloFunc | -| 6 | Square Root | sqrt(81)= | 9 | squareRootFunc | -| 7 | Power Rule Differentiation | 7x^2 + 1x^4 + 4x^8 + 5x^10 | 14x^1 + 4x^3 + 32x^7 + 50x^9 | powerRuleDifferentiationFunc | -| 8 | Square | 2^2= | 4 | squareFunc | -| 9 | LCM (Least Common Multiple) | LCM of 7 and 10 = | 70 | lcmFunc | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 3 = | 3 | gcdFunc | -| 11 | Basic Algebra | 9x + 8 = 9 | 1/9 | basicAlgebraFunc | -| 12 | Logarithm | log2(32) | 5 | logFunc | -| 13 | Easy Division | 176/11 = | 16 | divisionToIntFunc | -| 14 | Decimal to Binary | Binary of 49= | 110001 | DecimalToBinaryFunc | -| 15 | Binary to Decimal | 01100 | 12 | BinaryToDecimalFunc | -| 16 | Fraction Division | (9/5)/(10/2) | 9/25 | divideFractionsFunc | -| 17 | Integer Multiplication with 2x2 Matrix | 8 * [[8, 9], [0, 3]] = | [[64,72],[0,24]] | multiplyIntToMatrix22 | -| 18 | Area of Triangle | Area of triangle with side lengths: 19 2 15 = | (1.7998558638262156e-15+29.393876913398138j) | areaOfTriangleFunc | -| 19 | Triangle exists check | Does triangle with sides 9, 12 and 5 exist? | Yes | isTriangleValidFunc | -| 20 | Midpoint of the two point | (-3,-3),(-7,-4)= | (-5.0,-3.5) | MidPointOfTwoPointFunc | -| 21 | Factoring Quadratic | x^2+4x-12 | (x+6)(x-2) | factoringFunc | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 4 and 27 = | 149 | thirdAngleOfTriangleFunc | -| 23 | Solve a System of Equations in R^2 | -6x - 10y = 22, 4x - 3y = 53 | x = 8, y = -7 | systemOfEquationsFunc | -| 24 | Distance between 2 points | Find the distance between (6, 2) and (-2, -2) | sqrt(80) | distanceTwoPointsFunc | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 13 = | 16.40 | pythagoreanTheoremFunc | -| 26 | Linear Equations | 8x + -8y = -40 -20x + -16y = -108 | x = -7, y = -2 | linearEquationsFunc | -| 27 | Prime Factorisation | Find prime factors of 29 | [29] | primeFactorsFunc | -| 28 | Fraction Multiplication | (4/7)*(3/9) | 4/21 | multiplyFractionsFunc | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | regularPolygonAngleFunc | -| 30 | Combinations of Objects | Number of combinations from 20 objects picked 5 at a time | 15504 | combinationsFunc | -| 31 | Factorial | 3! = | 6 | factorialFunc | -| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surfaceAreaCube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 4m, 15m, 5m is | 310 m^2 | surfaceAreaCuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 14m and radius = 11m is | 1727 m^2 | surfaceAreaCylinder | -| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volumeCube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 9m, 6m, 15m is | 810 m^3 | volumeCuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 21m and radius = 4m is | 1055 m^3 | volumeCylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 7m and radius = 7m is | 371 m^2 | surfaceAreaCone | -| 39 | Volume of cone | Volume of cone with height = 46m and radius = 15m is | 10838 m^3 | volumeCone | -| 40 | Common Factors | Common Factors of 12 and 76 = | [1, 2, 4] | commonFactorsFunc | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6x + 8 and y = 3/2x + 4 | (-8/9, 8/3) | intersectionOfTwoLinesFunc | -| 42 | Permutations | Number of Permutations from 15 objects picked 5 at a time = | 360360 | permutationFunc | -| 43 | Cross Product of 2 Vectors | [-13, -2, 0] X [-4, 14, -4] = | [8, -52, -190] | vectorCrossFunc | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/8 and 3/9? | > | compareFractionsFunc | -| 45 | Simple Interest | Simple interest for a principle amount of 6266 dollars, 8% rate of interest and for a time period of 3 years is = | 1503.84 | simpleInterestFunc | -| 46 | Multiplication of two matrices | Multiply
30
-1-6
and
4-75-9
08-10-2
|
12-2115-27
-4-415521
| matrixMultiplicationFunc | -| 47 | Cube Root | cuberoot of 362 upto 2 decimal places is: | 7.13 | cubeRootFunc | -| 48 | Power Rule Integration | 2x^6 + 1x^5 + 7x^9 + 1x^10 | (2/6)x^7 + (1/5)x^6 + (7/9)x^10 + (1/10)x^11 + c | powerRuleIntegrationFunc | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 60 , 18, 7 = | 275 | fourthAngleOfQuadriFunc | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 40x^2+121x+89=0 | [-1.26, -1.76] | quadraticEquation | -| 51 | HCF (Highest Common Factor) | HCF of 4 and 12 = | 4 | hcfFunc | -| 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 13 = | 21/216 | DiceSumProbFunc | -| 53 | Exponentiation | 11^8 = | 214358881 | exponentiationFunc | -| 54 | Confidence interval For sample S | The confidence interval for sample [239, 265, 215, 283, 231, 296, 270, 260, 289, 271, 245, 251, 206, 255, 257, 247, 292, 232, 276, 297, 263, 254, 279, 253, 211, 236, 274, 209, 275, 278, 212, 214, 226, 230, 256, 249, 293] with 95% confidence is | (262.3172302973649, 245.19628321614857) | confidenceIntervalFunc | -| 55 | Comparing surds | Fill in the blanks 86^(1/4) _ 39^(1/1) | < | surdsComparisonFunc | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeriesFunc | -| 57 | Trigonometric Values | What is sin(90)? | 1 | basicTrigonometryFunc | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sumOfAnglesOfPolygonFunc | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[19, 23, 36, 18, 44, 47, 18, 40, 27, 25, 14, 16, 6, 29, 50] | The Mean is 27.466666666666665 , Standard Deviation is 163.0488888888889, Variance is 12.769059827915637 | dataSummaryFunc | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 5m is | 314.1592653589793 m^2 | surfaceAreaSphere | -| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphereFunc | -| 62 | nth Fibonacci number | What is the 60th Fibonacci number? | 1548008755920 | nthFibonacciNumberFunc | -| 63 | Profit or Loss Percent | Profit percent when CP = 121 and SP = 615 is: | 408.26446280991735 | profitLossPercentFunc | -| 64 | Binary to Hexidecimal | 10110 | 0x16 | binaryToHexFunc | -| 65 | Multiplication of 2 complex numbers | (20-1j) * (-7+14j) = | (-126+287j) | multiplyComplexNumbersFunc | -| 66 | Geometric Progression | For the given GP [2, 24, 288, 3456, 41472, 497664] ,Find the value of a,common ratio,9th term value, sum upto 10th term | The value of a is 2, common ratio is 12 , 9th term is 859963392 , sum upto 10th term is 11257702586.0 | geomProgrFunc | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 18 , 24 , 99 , 12 = | (18*24*99*12)^(1/4) = 26.765480655440626 | geometricMeanFunc | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 41 and 82 = | 2/((1/41) + (1/82)) = 54.66666666666666 | harmonicMeanFunc | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[690.1926568125737, 148.904898302192, 222.19798825467595, 667.3276829127157, 366.9178192723557, 875.6869024243441, 336.14075266140685, 949.1256775112896, 626.0180041672427, 290.7427227038134, 207.55193301803965, 64.93900706542944, 736.3114771837603, 785.1756497858677] is: | 2142.639328828992 | euclidianNormFunc | -| 70 | Angle between 2 vectors | angle between the vectors [293.12905111302047, 909.0452944804068, 423.60965609823086, 870.8703924858319, 958.9076883380749, 837.4625321599826] and [938.5559146533071, 63.15299226225102, 418.14038421596024, 865.5267136591071, 513.9066820998474, 680.6577264839382] is: | NaN | angleBtwVectorsFunc | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 76 and -20 = | 96 | absoluteDifferenceFunc | -| 72 | Dot Product of 2 Vectors | [19, 10, -5] . [0, -18, 15] = | -255 | vectorDotFunc | -| 73 | Binary 2's Complement | 2's complement of 110 = | 10 | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[61, 68, 75], [31, 77, 66], [33, 59, 58]]) is: | Matrix([[11/141, 37/564, -33/188], [95/1833, 1063/7332, -567/2444], [-178/1833, -1355/7332, 863/2444]]) | matrixInversion | -| 75 | Area of a Sector | Given radius, 20 and angle, 235. Find the area of the sector. | Area of sector = 820.30475 | sectorAreaFunc | -| 76 | Mean and Median | Given the series of numbers [7, 89, 72, 14, 97, 48, 35, 12, 11, 27]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 41.2 and Arithmetic median of this series is 31.0 | meanMedianFunc | -| 77 | Determinant to 2x2 Matrix | Det([[26, 78], [39, 24]]) = | -2418 | determinantToMatrix22 | -| 78 | Compound Interest | Compound Interest for a principle amount of 6842 dollars, 8% rate of interest and for a time period of 5 compounded monthly is = | 6842.0 | compoundInterestFunc | -| 79 | Decimal to Hexadecimal | Binary of 860= | 0x35c | deciToHexaFunc | -| 80 | Percentage of a number | What is 75% of 28? | Required percentage = 21.00% | percentageFunc | -| 81 | Celsius To Fahrenheit | Convert 30 degrees Celsius to degrees Fahrenheit = | 86.0 | celsiustofahrenheit | -| 82 | AP Term Calculation | Find the term number 47 of the AP series: -56, 37, 130 ... | 4222 | arithmeticProgressionTermFunc | -| 83 | AP Sum Calculation | Find the sum of first 79 terms of the AP series: 34, 24, 14 ... | -28124.0 | arithmeticProgressionSumFunc | -| 84 | Converts decimal to octal | The decimal number 2245 in Octal is: | 0o4305 | decimalToOctalFunc | -| 85 | Converts decimal to Roman Numerals | The number 1658 in Roman Numerals is: | MDCLVIII | decimalToRomanNumeralsFunc | -| 86 | Degrees to Radians | Angle 12 in radians is = | 0.21 | degreeToRadFunc | -| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | +| 0 | Addition | 6+12= | 18 | addition | +| 1 | Subtraction | 17-11= | 6 | subtraction | +| 2 | Multiplication | 99*1= | 99 | multiplication | +| 3 | Division | 23/29= | 0.7931034482758621 | division | +| 4 | Binary Complement 1s | 1000= | 0111 | binary_complement_1s | +| 5 | Modulo Division | 80%49= | 31 | modulo_division | +| 6 | Square Root | sqrt(49)= | 7 | square_root | +| 7 | Power Rule Differentiation | 10x^9 | 90x^8 | power_rule_differentiation | +| 8 | Square | 13^2= | 169 | square | +| 9 | LCM (Least Common Multiple) | LCM of 14 and 12 = | 84 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 5 and 19 = | 1 | gcd | +| 11 | Basic Algebra | 4x + 1 = 2 | 1/4 | basic_algebra | +| 12 | Logarithm | log2(128) | 7 | log | +| 13 | Easy Division | 264/11 = | 24 | int_division | +| 14 | Decimal to Binary | Binary of 96= | 1100000 | decimal_to_binary | +| 15 | Binary to Decimal | 1011 | 11 | binary_to_decimal | +| 16 | Fraction Division | (8/6)/(8/1) | 1/6 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[9, 9], [6, 5]] = | [[18,18],[12,10]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 16 9 3 = | (2.402930536500827e-15+39.242833740697165j) | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 37, 37 and 44 exist? | Yes | valid_triangle | +| 20 | Midpoint of the two point | (-16,19),(-4,10)= | (-10.0,14.5) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2+x-42 | (x+7)(x-6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 8 and 77 = | 95 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | -3x - 2y = 23, 7x + 8y = -87 | x = -1, y = -10 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (17, 10) and (15, 9) | sqrt(5) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 7 and 13 = | 14.76 | pythagorean_theorem | +| 26 | Linear Equations | -10x + -17y = 373 +17x + -17y = 238 | x = -5, y = -19 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 76 | [2, 2, 19] | prime_factors | +| 28 | Fraction Multiplication | (8/3)*(10/1) | 80/3 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 2 at a time | 136 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 20m, 13m, 15m is | 1510 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 18m and radius = 12m is | 2261 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 8m, 8m is | 896 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 33m and radius = 9m is | 8397 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 3m and radius = 9m is | 522 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 31m and radius = 1m is | 32 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 5 and 90 = | [1, 5] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 9/6x - 4 and y = -8/6x + 1 | (30/17, -23/17) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 19 objects picked 1 at a time = | 19 | permutation | +| 43 | Cross Product of 2 Vectors | [-3, -11, -6] X [2, 18, 11] = | [-13, 21, -32] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 10/4 and 6/9? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 9924 dollars, 2% rate of interest and for a time period of 2 years is = | 396.96 | simple_interest | +| 46 | Multiplication of two matrices | Multiply
83-7
-33-10
-944
and
88-3
941
-2-7-7
|
10512528
235882
-44-843
| matrix_multiplication | +| 47 | Cube Root | cuberoot of 194 upto 2 decimal places is: | 5.79 | cube_root | +| 48 | Power Rule Integration | 8x^1 + 2x^1 + 8x^8 + 3x^3 | (8/1)x^2 + (2/1)x^2 + (8/8)x^9 + (3/3)x^4 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 179 , 29, 29 = | 123 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 77x^2+91x+14=0 | [-0.18, -1.0] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 11 and 1 = | 1 | 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 13 = | 21/216 | dice_sum_probability | +| 53 | Exponentiation | 16^8 = | 4294967296 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [208, 221, 294, 275, 252, 253, 236, 216, 290, 296, 227, 251, 266, 277, 263, 268, 260, 248, 214, 298, 284, 293, 213, 264, 206, 238, 211, 203, 276, 279, 285, 220, 222, 299] with 90% confidence is | (261.88480835505726, 244.3504857625898) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 68^(1/3) _ 84^(1/8) | > | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | +| 57 | Trigonometric Values | What is sin(90)? | 1 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 8 sides = | 1080 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[35, 18, 28, 21, 50, 17, 30, 33, 14, 41, 35, 31, 7, 28, 8] | The Mean is 26.4 , Standard Deviation is 137.17333333333335, Variance is 11.7121020031988 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 12m is | 1809.5573684677208 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 61 m = | 950775.7894726198 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 98th Fibonacci number? | 135301852344707186688 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Loss percent when CP = 948 and SP = 729 is: | 23.10126582278481 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 10101010 | 0xaa | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-16+11j) * (7+19j) = | (-321-227j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,9th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 9th term is 46118408 , sum upto 8th term is 7686400.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 24 , 6 , 17 , 34 = | (24*6*17*34)^(1/4) = 16.985274997011718 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 72 , 17 and 14 = | 3/((1/72) + (1/17) + (1/14)) = 20.812955465587045 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[959.2746467619136, 621.8392214146113, 922.8483095629905, 386.90198896263786, 998.2816134301269, 924.4767901166847, 526.4451342917619, 540.6365528762716, 921.5612942821017, 507.86794502436186] is: | 2415.8011015687784 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [828.7073706479772, 912.8938227679938, 154.5891010528101, 789.3839240933659, 470.5951408141951, 365.0311186930294, 492.5244778860853, 433.2880676781922, 498.50124161369234] and [209.0406231603238, 64.7709335985529, 413.202808762719, 1.9226444773620122, 215.67348315298196, 668.6663275149825, 99.38710508880888, 74.18515931735026, 384.83132929263707] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 18 and 88 = | 70 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [5, 9, -5] . [11, 19, -16] = | 306 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[37, 41, 67], [47, 57, 55], [73, 23, 22]]) is: | Matrix([[1/7686, -71/9394, 782/42273], [-271/7686, 453/9394, -557/42273], [20/549, -17/671, -13/6039]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 39 and angle, 299. Find the area of the sector. | Area of sector = 3968.69546 | sector_area | +| 76 | Mean and Median | Given the series of numbers [2, 78, 43, 59, 84, 10, 17, 62, 44, 94]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.3 and Arithmetic median of this series is 51.5 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[74, 66], [92, 76]]) = | -448 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 8675 dollars, 10% rate of interest and for a time period of 3 compounded monthly is = | 8675.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 533= | 0x215 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 46% of 69? | Required percentage = 31.74% | percentage | +| 81 | Celsius To Fahrenheit | Convert -43 degrees Celsius to degrees Fahrenheit = | -45.400000000000006 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 67 of the AP series: 3, 99, 195 ... | 6339 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 16 terms of the AP series: 60, -36, -132 ... | -10560.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 3881 in Octal is: | 0o7451 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 2606 in Roman Numerals is: | MMDCVI | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 55 in radians is = | 0.96 | degree_to_rad | +| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | From 16a45b082b885f1abee29386d60efa0b48ab8780 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 11:50:08 -0400 Subject: [PATCH 7/8] Added args to Generator __call__ --- mathgenerator/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index c4cea28..090e18a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -22,8 +22,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) def getGenList(): From 94b20746428e20c7f1a40e887b86216627864fb4 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Tue, 20 Oct 2020 11:52:48 -0400 Subject: [PATCH 8/8] cleaned up mathgen.py --- README.md | 176 +++++++++++++++++++-------------------- mathgenerator/mathgen.py | 24 ------ 2 files changed, 88 insertions(+), 112 deletions(-) diff --git a/README.md b/README.md index 8bec872..50de608 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 6+12= | 18 | addition | -| 1 | Subtraction | 17-11= | 6 | subtraction | -| 2 | Multiplication | 99*1= | 99 | multiplication | -| 3 | Division | 23/29= | 0.7931034482758621 | division | -| 4 | Binary Complement 1s | 1000= | 0111 | binary_complement_1s | -| 5 | Modulo Division | 80%49= | 31 | modulo_division | -| 6 | Square Root | sqrt(49)= | 7 | square_root | -| 7 | Power Rule Differentiation | 10x^9 | 90x^8 | power_rule_differentiation | -| 8 | Square | 13^2= | 169 | square | -| 9 | LCM (Least Common Multiple) | LCM of 14 and 12 = | 84 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 5 and 19 = | 1 | gcd | -| 11 | Basic Algebra | 4x + 1 = 2 | 1/4 | basic_algebra | -| 12 | Logarithm | log2(128) | 7 | log | -| 13 | Easy Division | 264/11 = | 24 | int_division | -| 14 | Decimal to Binary | Binary of 96= | 1100000 | decimal_to_binary | -| 15 | Binary to Decimal | 1011 | 11 | binary_to_decimal | -| 16 | Fraction Division | (8/6)/(8/1) | 1/6 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[9, 9], [6, 5]] = | [[18,18],[12,10]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 16 9 3 = | (2.402930536500827e-15+39.242833740697165j) | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 37, 37 and 44 exist? | Yes | valid_triangle | -| 20 | Midpoint of the two point | (-16,19),(-4,10)= | (-10.0,14.5) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2+x-42 | (x+7)(x-6) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 8 and 77 = | 95 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | -3x - 2y = 23, 7x + 8y = -87 | x = -1, y = -10 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (17, 10) and (15, 9) | sqrt(5) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 7 and 13 = | 14.76 | pythagorean_theorem | -| 26 | Linear Equations | -10x + -17y = 373 -17x + -17y = 238 | x = -5, y = -19 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 76 | [2, 2, 19] | prime_factors | -| 28 | Fraction Multiplication | (8/3)*(10/1) | 80/3 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 17 objects picked 2 at a time | 136 | combinations | -| 31 | Factorial | 0! = | 1 | factorial | +| 0 | Addition | 42+42= | 84 | addition | +| 1 | Subtraction | 6-3= | 3 | subtraction | +| 2 | Multiplication | 5*10= | 50 | multiplication | +| 3 | Division | 48/95= | 0.5052631578947369 | division | +| 4 | Binary Complement 1s | 0110000= | 1001111 | binary_complement_1s | +| 5 | Modulo Division | 92%7= | 1 | modulo_division | +| 6 | Square Root | sqrt(1)= | 1 | square_root | +| 7 | Power Rule Differentiation | 3x^8 + 7x^6 + 3x^7 + 1x^3 | 24x^7 + 42x^5 + 21x^6 + 3x^2 | power_rule_differentiation | +| 8 | Square | 19^2= | 361 | square | +| 9 | LCM (Least Common Multiple) | LCM of 14 and 16 = | 112 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 7 and 18 = | 1 | gcd | +| 11 | Basic Algebra | 10x + 1 = 2 | 1/10 | basic_algebra | +| 12 | Logarithm | log3(6561) | 8 | log | +| 13 | Easy Division | 198/18 = | 11 | int_division | +| 14 | Decimal to Binary | Binary of 17= | 10001 | decimal_to_binary | +| 15 | Binary to Decimal | 100111010 | 314 | binary_to_decimal | +| 16 | Fraction Division | (9/7)/(4/9) | 81/28 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 15 * [[6, 6], [1, 1]] = | [[90,90],[15,15]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 18 17 13 = | 105.29957264870546 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 12, 33 and 30 exist? | Yes | valid_triangle | +| 20 | Midpoint of the two point | (-7,-12),(-1,6)= | (-4.0,-3.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-9x+8 | (x-8)(x-1) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 55 and 17 = | 108 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | 10x - 6y = 46, 9x + 5y = -21 | x = 1, y = -6 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (14, 8) and (1, -11) | sqrt(530) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 20 and 14 = | 24.41 | pythagorean_theorem | +| 26 | Linear Equations | -2x + 14y = 154 +-10x + -8y = -166 | x = 7, y = 12 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 189 | [3, 3, 3, 7] | prime_factors | +| 28 | Fraction Multiplication | (9/4)*(5/9) | 5/4 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 14 sides | 154.29 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 9 at a time | 24310 | combinations | +| 31 | Factorial | 2! = | 2 | factorial | | 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 20m, 13m, 15m is | 1510 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 18m and radius = 12m is | 2261 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 8m, 8m is | 896 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 33m and radius = 9m is | 8397 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 3m and radius = 9m is | 522 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 31m and radius = 1m is | 32 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 5 and 90 = | [1, 5] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 9/6x - 4 and y = -8/6x + 1 | (30/17, -23/17) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 19 objects picked 1 at a time = | 19 | permutation | -| 43 | Cross Product of 2 Vectors | [-3, -11, -6] X [2, 18, 11] = | [-13, 21, -32] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 10/4 and 6/9? | > | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 9924 dollars, 2% rate of interest and for a time period of 2 years is = | 396.96 | simple_interest | -| 46 | Multiplication of two matrices | Multiply
83-7
-33-10
-944
and
88-3
941
-2-7-7
|
10512528
235882
-44-843
| matrix_multiplication | -| 47 | Cube Root | cuberoot of 194 upto 2 decimal places is: | 5.79 | cube_root | -| 48 | Power Rule Integration | 8x^1 + 2x^1 + 8x^8 + 3x^3 | (8/1)x^2 + (2/1)x^2 + (8/8)x^9 + (3/3)x^4 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 179 , 29, 29 = | 123 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 77x^2+91x+14=0 | [-0.18, -1.0] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 11 and 1 = | 1 | 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 13 = | 21/216 | dice_sum_probability | -| 53 | Exponentiation | 16^8 = | 4294967296 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [208, 221, 294, 275, 252, 253, 236, 216, 290, 296, 227, 251, 266, 277, 263, 268, 260, 248, 214, 298, 284, 293, 213, 264, 206, 238, 211, 203, 276, 279, 285, 220, 222, 299] with 90% confidence is | (261.88480835505726, 244.3504857625898) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 68^(1/3) _ 84^(1/8) | > | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | -| 57 | Trigonometric Values | What is sin(90)? | 1 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 8 sides = | 1080 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[35, 18, 28, 21, 50, 17, 30, 33, 14, 41, 35, 31, 7, 28, 8] | The Mean is 26.4 , Standard Deviation is 137.17333333333335, Variance is 11.7121020031988 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 12m is | 1809.5573684677208 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 61 m = | 950775.7894726198 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 98th Fibonacci number? | 135301852344707186688 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Loss percent when CP = 948 and SP = 729 is: | 23.10126582278481 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 10101010 | 0xaa | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (-16+11j) * (7+19j) = | (-321-227j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,9th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 9th term is 46118408 , sum upto 8th term is 7686400.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 24 , 6 , 17 , 34 = | (24*6*17*34)^(1/4) = 16.985274997011718 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 72 , 17 and 14 = | 3/((1/72) + (1/17) + (1/14)) = 20.812955465587045 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[959.2746467619136, 621.8392214146113, 922.8483095629905, 386.90198896263786, 998.2816134301269, 924.4767901166847, 526.4451342917619, 540.6365528762716, 921.5612942821017, 507.86794502436186] is: | 2415.8011015687784 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [828.7073706479772, 912.8938227679938, 154.5891010528101, 789.3839240933659, 470.5951408141951, 365.0311186930294, 492.5244778860853, 433.2880676781922, 498.50124161369234] and [209.0406231603238, 64.7709335985529, 413.202808762719, 1.9226444773620122, 215.67348315298196, 668.6663275149825, 99.38710508880888, 74.18515931735026, 384.83132929263707] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 18 and 88 = | 70 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [5, 9, -5] . [11, 19, -16] = | 306 | vector_dot | -| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[37, 41, 67], [47, 57, 55], [73, 23, 22]]) is: | Matrix([[1/7686, -71/9394, 782/42273], [-271/7686, 453/9394, -557/42273], [20/549, -17/671, -13/6039]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 39 and angle, 299. Find the area of the sector. | Area of sector = 3968.69546 | sector_area | -| 76 | Mean and Median | Given the series of numbers [2, 78, 43, 59, 84, 10, 17, 62, 44, 94]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.3 and Arithmetic median of this series is 51.5 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[74, 66], [92, 76]]) = | -448 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 8675 dollars, 10% rate of interest and for a time period of 3 compounded monthly is = | 8675.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 533= | 0x215 | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 46% of 69? | Required percentage = 31.74% | percentage | -| 81 | Celsius To Fahrenheit | Convert -43 degrees Celsius to degrees Fahrenheit = | -45.400000000000006 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 67 of the AP series: 3, 99, 195 ... | 6339 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 16 terms of the AP series: 60, -36, -132 ... | -10560.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 3881 in Octal is: | 0o7451 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 2606 in Roman Numerals is: | MMDCVI | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 55 in radians is = | 0.96 | degree_to_rad | -| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 6m, 3m, 9m is | 198 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 25m and radius = 17m is | 4486 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 12m, 8m, 20m is | 1920 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 35m and radius = 13m is | 18582 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 45m and radius = 1m is | 144 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 25m and radius = 16m is | 6702 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 52 and 89 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -3/5x + 10 and y = -3/4x - 5 | (-100, 70) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 14 objects picked 8 at a time = | 121080960 | permutation | +| 43 | Cross Product of 2 Vectors | [-16, -2, -1] X [-16, -7, 19] = | [-45, 320, 80] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 9/2 and 9/10? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 4736 dollars, 1% rate of interest and for a time period of 7 years is = | 331.52 | simple_interest | +| 46 | Multiplication of two matrices | Multiply
4-2-2
46-4
-11-5
-1083
and
639-4
-4-6-30
-10-3-7-7
|
523056-2
40-124612
4062339
-122-87-13519
| matrix_multiplication | +| 47 | Cube Root | cuberoot of 744 upto 2 decimal places is: | 9.06 | cube_root | +| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 96 , 118, 81 = | 65 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 88x^2+193x+32=0 | [-0.18, -2.01] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 16 and 3 = | 1 | hcf | +| 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 5 = | 1/6 | dice_sum_probability | +| 53 | Exponentiation | 6^5 = | 7776 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [202, 227, 233, 291, 294, 242, 247, 283, 251, 228, 216, 240, 289, 243, 282, 238, 257, 255, 203, 276, 293, 214, 207, 210, 265, 212, 236, 297, 256, 280, 288] with 99% confidence is | (264.1616033070315, 236.1609773381298) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 27^(1/4) _ 87^(1/1) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 5 numbers is ? | [0, 1, 1, 2, 3] | fibonacci_series | +| 57 | Trigonometric Values | What is tan(45)? | 1 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 22, 9, 8, 12, 36, 39, 19, 12, 11, 49, 27, 22, 27, 26] | The Mean is 22.0 , Standard Deviation is 139.73333333333332, Variance is 11.820885471627467 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 20m is | 5026.548245743669 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 69 m = | 1376055.2813841724 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 33th Fibonacci number? | 3524578 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Loss percent when CP = 883 and SP = 393 is: | 55.492638731596834 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 00010100 | 0x14 | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-3+0j) * 16j = | (-0-48j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [4, 20, 100, 500, 2500, 12500] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 4, common ratio is 5 , 6th term is 12500 , sum upto 8th term is 390624.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 41 and 54 = | (41*54)^(1/2) = 47.05316142407437 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 8 , 71 and 68 = | 3/((1/8) + (1/71) + (1/68)) = 19.507070707070707 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[865.7151963569839, 226.4057036465874, 14.824800248170567, 706.1262882326861, 865.8569268338141, 559.1781356802616, 756.7052133079868, 164.9216239520549, 609.9900978280176, 697.4174107118105, 486.57415492429044, 993.1670184061886, 640.1534234049134, 368.9654609248786] is: | 2364.168521129801 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [275.27222370228554, 360.4704403955723, 828.9475033885524, 339.2072270059939, 233.95550521713915, 887.4530688219838, 390.16238631557763, 351.47764321737054, 103.32257528086953, 867.8009318330934, 525.3164032492849] and [886.3103662444178, 562.6461993125878, 190.16362305272116, 909.6771690252709, 555.7134133875247, 553.903105904929, 828.5687817542065, 208.31947038854025, 388.8973006974784, 424.9452146134446, 460.00088587027324] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 25 and -64 = | 89 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [-20, -4, 9] . [4, -19, -3] = | -31 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 110000 = | 10000 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[43, 31, 88], [96, 41, 11], [68, 89, 13]]) is: | Matrix([[-223/235925, 7429/471850, -3267/471850], [-10/9437, -217/18874, 319/18874], [2878/235925, -1719/471850, -1213/471850]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 45 and angle, 191. Find the area of the sector. | Area of sector = 3375.24861 | sector_area | +| 76 | Mean and Median | Given the series of numbers [44, 90, 6, 3, 25, 67, 76, 86, 51, 69]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 51.7 and Arithmetic median of this series is 59.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[51, 51], [15, 83]]) = | 3468 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 2506 dollars, 5% rate of interest and for a time period of 10 compounded monthly is = | 2506.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 588= | 0x24c | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 21% of 84? | Required percentage = 17.64% | percentage | +| 81 | Celsius To Fahrenheit | Convert 62 degrees Celsius to degrees Fahrenheit = | 143.60000000000002 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 76 of the AP series: 94, 46, -2 ... | -3506 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 20 terms of the AP series: -69, -146, -223 ... | -16010.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 1829 in Octal is: | 0o3445 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 1938 in Roman Numerals is: | MCMXXXVIII | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 197 in radians is = | 3.44 | degree_to_rad | +| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radian_to_deg | diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 959093b..5b0ab6b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -6,32 +6,8 @@ from .__init__ import getGenList genList = getGenList() -# || Generator class - - -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, *args, **kwargs): - return self.func(*args, **kwargs) - # || Non-generator Functions def genById(id): generator = genList[id][2] return (generator()) - - -# Format is: -# = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>)