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:** diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7cf0eb..016ce41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,6 +35,7 @@ We currently just underwent a large reconstruction of the repository. Here is ho * Place `.__init__ import *` at the top of your file and then write your function in the lines beneath it * Add `from . import *` at the bottom of the `__init__.py` file inside the funcs directory +If you have issues with checks you can try using yapf to fix linter errors or just go through them line by line. ### Provide Ideas If you have an idea for a generator but don't have the time or know-how to create it, you can add it as an issue. If you have a lot of ideas, I would suggest adding them to the table in README.md so that they are easier for our team to manage. diff --git a/Makefile b/Makefile index 9414a0b..e5dca74 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IGNORE_ERRORS = E501,F401,F403,F405 PKG = mathgenerator format: - python -m autopep8 --ignore=$(IGNORE_ERRORS) -i $(PKG)/* + python -m autopep8 --ignore=$(IGNORE_ERRORS) -ir $(PKG)/* lint: python -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG) diff --git a/README.md b/README.md index f2d81dc..87ca9e6 100644 --- a/README.md +++ b/README.md @@ -31,76 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 33+23= | 56 | addition | -| 1 | Subtraction | 14-1= | 13 | subtraction | -| 2 | Multiplication | 52*1= | 52 | multiplication | -| 3 | Division | 14/26= | 0.5384615384615384 | division | -| 4 | Binary Complement 1s | 0110111= | 1001000 | binaryComplement1s | -| 5 | Modulo Division | 23%70= | 23 | moduloDivision | -| 6 | Square Root | sqrt(121)= | 11 | squareRoot | -| 7 | Power Rule Differentiation | 3x^2 + 3x^5 + 1x^2 + 6x^4 + 6x^3 | 6x^1 + 15x^4 + 2x^1 + 24x^3 + 18x^2 | powerRuleDifferentiation | -| 8 | Square | 18^2= | 324 | square | -| 9 | LCM (Least Common Multiple) | LCM of 17 and 11 = | 187 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 12 = | 3 | gcd | -| 11 | Basic Algebra | 2x + 3 = 10 | 7/2 | basicAlgebra | -| 12 | Logarithm | log2(32) | 5 | log | -| 13 | Easy Division | 196/14 = | 14 | intDivision | -| 14 | Decimal to Binary | Binary of 61= | 111101 | decimalToBinary | -| 15 | Binary to Decimal | 1 | 1 | binaryToDecimal | -| 16 | Fraction Division | (2/1)/(10/5) | 1 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 16 * [[4, 1], [1, 2]] = | [[64,16],[16,32]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 11 = | 69.62892717829278 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 35, 14 and 37 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (15,5),(9,10)= | (12.0,7.5) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 37 and 54 = | 89 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | -4x - 8y = 60, -9x + 10y = 51 | x = -9, y = -3 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (16, 7) and (19, 14) | sqrt(58) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 8 = | 19.70 | pythagoreanTheorem | -| 26 | Linear Equations | -8x + 15y = -109 -6x + -14y = 90 | x = 8, y = -3 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 130 | [2, 5, 13] | primeFactors | -| 28 | Fraction Multiplication | (8/9)*(3/2) | 4/3 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 8 sides | 135.0 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 11 objects picked 9 at a time | 55 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 8m, 4m, 17m is | 472 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 32m and radius = 18m is | 5654 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 19m, 1m is | 266 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 16m and radius = 18m is | 16286 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 48m and radius = 20m is | 4523 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 29m and radius = 6m is | 1093 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 59 and 57 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -1/4x - 2 and y = 4/5x + 3 | (-100/21, -17/21) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 13 objects picked 8 at a time = | 51891840 | permutations | -| 43 | Cross Product of 2 Vectors | [4, -11, 9] X [-8, -19, -5] = | [226, -52, -164] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/7 and 2/4? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2398 dollars, 9% rate of interest and for a time period of 5 years is = | 1079.1 | simpleInterest | -| 46 | Multiplication of two matrices | Multiply
-50367-26-263
88-3760-1961-56
48-569-87-64-92
-84-50-79-1986-13
02812-1473-49
94-90226-3819
2-1179-7798-77
-877072-3264-99
and
3432-6-3246-2378-81-18
-172449-62-507738-98-64
-23-7843 5-83-5 4-92-16
46-47-9252-25-374451-7
2026703796-73498442
-72-15-80-2458-47-4145-69
|
-8245-1057-423-3535-5692034-63291219-5765
6619 5671073723914001-629110147-73876383
1472-16113318-5565-1257410381 638-236992621
159355983465789913170-6487-48572464210618
359230271220614732120-4126082-6354561
3748-1803-1146020725462-8183242311 947
2400 960229502483 952-19744625-55129372
1132-2067223921884-1227681961949-71485677
| matrixMultiplication | - [ 10584, 13902, 11916, -7446, 4430, 554] - [ -1800, 6587, 14343, 6224, 4525, 4853] - [-12452, -10675, -8693, 427, 2955, 17691]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 221 upto 2 decimal places is: | 6.05 | CubeRoot | -| 48 | Power Rule Integration | 4x^5 + 2x^5 + 9x^8 + 9x^5 | (4/5)x^6 + (2/5)x^6 + (9/8)x^9 + (9/5)x^6 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 27 , 155, 116 = | 62 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 53x^2+200x+78=0 | [-0.44, -3.33] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 4 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability | -| 53 | Exponentiation | 9^10 = | 3486784401 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [266, 201, 278, 209, 229, 275, 216, 234, 219, 276, 282, 281, 208, 247, 265, 273, 286, 202, 231, 207, 251, 203, 259, 288, 291, 260, 210, 263, 222] with 99% confidence is | (260.5668079141175, 231.29526105139982) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 15^(1/9) _ 55^(1/1) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeries | -| 57 | Trigonometric Values | What is tan(30)? | 1/√3 | basicTrigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[36, 13, 31, 23, 38, 34, 24, 20, 41, 14, 19, 31, 11, 49, 49] | The Mean is 28.866666666666667 , Standard Deviation is 143.5822222222222, Variance is 11.982579948501167 | dataSummary | -| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 11m is | 1520.5308443374597 m^2 | surfaceAreaSphereGen | -| 60 | Volume of Sphere | Volume of sphere with radius 73 m = | 1629510.5990953872 m^3 | volumeSphere | -| 61 | nth Fibonacci number | What is the 68th Fibonacci number? | 72723460248141 | nthFibonacciNumberGen | -| 62 | Profit or Loss Percent | Profit percent when CP = 825 and SP = 972 is: | 17.81818181818182 | profitLossPercent | -| 63 | Binary to Hexidecimal | 100000 | 0x20 | binaryToHex | -| 64 | Multiplication of 2 complex numbers | (3+14j) * (-3+16j) = | (-233+6j) | complexNumMultiply | -| 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | -| 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | -| 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +| 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 | diff --git a/dev-requirements.txt b/dev-requirements.txt index 7b33738..259022d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,5 @@ pytest hypothesis flake8 autopep8 -sympy \ No newline at end of file +sympy +numpy diff --git a/makeReadme.py b/makeReadme.py index 7a7a66d..c17e15b 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -1,15 +1,23 @@ -# 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 * + +def array2markdown_table(string): + string = string.replace("[[", "
") + string = string.replace("[", "
") + string = string.replace(", ", "") + string = string.replace("]]", "
") + string = string.replace("]", "") + string = string.replace(" ", "") + string = string.replace("\n", "") + return string + + wList = getGenList() lines = [] with open('mathgenerator/mathgen.py', 'r') as f: 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 @@ -18,23 +26,16 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - print(prob) + 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) - prob = prob.replace("[[", "
") - prob = prob.replace("[", "
") - prob = prob.replace(", ", "") - prob = prob.replace("]]\n", "
") - prob = prob.replace("]\n", "") - print(prob) - - 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(item[1], func_name) - line += 1 - if line > len(lines): - break + print('added', item[1], '-', func_name, 'to the README.md') allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 0a261d0..c4cea28 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( @@ -20,4 +27,5 @@ class Generator: def getGenList(): - return genList + correctedList = genList[-1:] + genList[:-1] + return correctedList diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index 9d2b25d..01fb780 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def BinaryToDecimalFunc(max_dig=10): @@ -10,3 +11,7 @@ def BinaryToDecimalFunc(max_dig=10): solution = int(problem, 2) return problem, solution + + +binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + BinaryToDecimalFunc) diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 872e105..a2aa043 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DecimalToBinaryFunc(max_dec=99): @@ -9,3 +10,7 @@ def DecimalToBinaryFunc(max_dec=99): solution = str(b) return problem, solution + + +decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", + DecimalToBinaryFunc) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 8f05a4f..720490e 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DiceSumProbFunc(maxDice=3): @@ -24,3 +25,9 @@ def DiceSumProbFunc(maxDice=3): a, b) solution = "{}/{}".format(count, 6**a) return problem, solution + + +diceSumProbability = Generator( + "Probability of a certain sum appearing on faces of dice", 52, + "If n dices are rolled then probabilty of getting sum of x is =", "z", + DiceSumProbFunc) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index f8cd8a1..1a126b2 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def MidPointOfTwoPointFunc(maxValue=20): @@ -10,3 +11,8 @@ def MidPointOfTwoPointFunc(maxValue=20): problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution + + +midPointOfTwoPoint = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 7ef9c50..12bf15e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -11,8 +11,8 @@ from .moduloFunc import * from .squareRootFunc import * from .powerRuleDifferentiationFunc import * from .squareFunc import * -from .gcdFunc import * from .lcmFunc import * +from .gcdFunc import * from .basicAlgebraFunc import * from .logFunc import * from .divisionToIntFunc import * @@ -35,10 +35,10 @@ from .regularPolygonAngleFunc import * from .combinationsFunc import * from .factorialFunc import * from .surfaceAreaCube import * -from .volumeCube import * from .surfaceAreaCuboid import * -from .volumeCuboid import * from .surfaceAreaCylinder import * +from .volumeCube import * +from .volumeCuboid import * from .volumeCylinder import * from .surfaceAreaCone import * from .volumeCone import * @@ -83,3 +83,10 @@ 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 * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 138c8de..755e049 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): @@ -10,3 +11,9 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): str(a) + " and " + str(b) + " = " solution = absDiff return problem, solution + + +absoluteDifference = Generator( + "Absolute difference between two numbers", 71, + "Absolute difference betweeen two numbers a and b =", "|a-b|", + absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index bd2d0b5..9d8d817 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,16 +1,29 @@ -from .euclidianNormFunc import euclidianNormFunc -import math from .__init__ import * +from ..__init__ import Generator +import math -def angleBtwVectorsFunc(v1: list, v2: list): - sum = 0 +def angleBtwVectorsFunc(maxEltAmt=20): + s = 0 + v1 = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] + v2 = [random.uniform(0, 1000) for i in v1] for i in v1: for j in v2: - sum += i * j + s += i * j - mags = euclidianNormFunc(v1) * euclidianNormFunc(v2) + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) problem = f"angle between the vectors {v1} and {v2} is:" - solution = math.acos(sum / mags) + solution = '' + try: + solution = str(math.acos(s / mags)) + except ValueError: + print('angleBtwVectorsFunc has some issues with math module, line 16') + solution = 'NaN' # would return the answer in radians return problem, solution + + +angleBtwVectors = Generator( + "Angle between 2 vectors", 70, + "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", + "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index a795a99..c49167c 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -13,3 +14,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): str(a) + " " + str(b) + " " + str(c) + " = " solution = area return problem, solution + + +areaOfTriangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py new file mode 100644 index 0000000..294cb7f --- /dev/null +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -0,0 +1,19 @@ +from .__init__ import * +from ..__init__ import Generator + + +def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) + a2 = a1 + d + a3 = a2 + d + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' + problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString + solution = n * ((2 * a1) + ((n - 1) * d)) / 2 + return problem, solution + + +arithmeticProgressionSum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py new file mode 100644 index 0000000..e549c18 --- /dev/null +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -0,0 +1,19 @@ +from .__init__ import * +from ..__init__ import Generator + + +def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) + a2 = a1 + d + a3 = a2 + d + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' + problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString + solution = a1 + ((n - 1) * d) + return problem, solution + + +arithmeticProgressionTerm = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index d11000d..504ac41 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): @@ -23,3 +24,7 @@ def basicAlgebraFunc(maxVariable=10): problem = f"{a}x + {b} = {c}" solution = x return problem, solution + + +basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 520b8a3..da6d97c 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator # Handles degrees in quadrant one @@ -23,3 +24,7 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], solution = result_fraction_map[round(eval(expression), 2)] if round( eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition return problem, solution + + +basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 01af731..891990d 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): @@ -26,3 +27,8 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') return problem, solution + + +binary2sComplement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 009feea..f748af5 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): @@ -13,3 +14,7 @@ def binaryComplement1sFunc(maxDigits=10): problem = question + "=" solution = answer return problem, solution + + +binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index f06fcfc..12dbe7f 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryToHexFunc(max_dig=10): @@ -9,3 +10,7 @@ def binaryToHexFunc(max_dig=10): solution = hex(int(problem, 2)) return problem, solution + + +binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py new file mode 100644 index 0000000..0e66be8 --- /dev/null +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -0,0 +1,14 @@ +from .__init__ import * +from ..__init__ import Generator + + +def celsiustofahrenheitFunc(maxTemp=100): + celsius = random.randint(-50, maxTemp) + fahrenheit = (celsius * (9 / 5)) + 32 + problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit =" + solution = str(fahrenheit) + return problem, solution + + +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index f213222..ca42532 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def combinationsFunc(maxlength=20): @@ -17,3 +18,9 @@ def combinationsFunc(maxlength=20): a, b) return problem, solution + + +combinations = Generator( + "Combinations of Objects", 30, + "Combinations available for picking 4 objects at a time from 6 distinct objects =", + " 15", combinationsFunc) diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index 82a0e3b..929c48e 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def commonFactorsFunc(maxVal=100): @@ -22,3 +23,8 @@ def commonFactorsFunc(maxVal=100): problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution + + +commonFactors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index 1c4072a..19ba5c9 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def compareFractionsFunc(maxVal=10): @@ -24,3 +25,9 @@ def compareFractionsFunc(maxVal=10): problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution + + +compareFractions = Generator( + "Compare Fractions", 44, + "Which symbol represents the comparison between a/b and c/d?", ">/= divisor: + divisor *= 10 + divisor /= 10 + solution = "" + while x: + last_value = int(x / divisor) + if last_value <= 3: + solution += (roman_dict[divisor] * last_value) + elif last_value == 4: + solution += (roman_dict[divisor] * roman_dict[divisor * 5]) + elif 5 <= last_value <= 8: + solution += (roman_dict[divisor * 5] + (roman_dict[divisor] * (last_value - 5))) + elif last_value == 9: + solution += (roman_dict[divisor] + roman_dict[divisor * 10]) + x = math.floor(x % divisor) + divisor /= 10 + return problem, solution + + +decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", + 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py new file mode 100644 index 0000000..7ca4080 --- /dev/null +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -0,0 +1,16 @@ +from .__init__ import * +from numpy import pi + + +def degreeToRadFunc(max_deg=360): + a = random.randint(0, max_deg) + b = (pi * a) / 180 + b = round(b, 2) + + problem = "Angle " + str(a) + " in radians is = " + solution = str(b) + + return problem, solution + + +degreeToRad = Generator("Degrees to Radians", 86, "Angle a in radians is = ", "b", degreeToRadFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index 33b4004..0117389 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def determinantToMatrix22(maxMatrixVal=100): @@ -11,3 +12,8 @@ def determinantToMatrix22(maxMatrixVal=100): problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution + + +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 9fa85c8..e5de6ae 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): @@ -12,3 +13,8 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" return problem, solution + + +distance2Point = Generator("Distance between 2 points", 24, + "Find the distance between (x1,y1) and (x2,y2)", + "sqrt(distanceSquared)", distanceTwoPointsFunc) diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 970b28f..6d90b77 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divideFractionsFunc(maxVal=10): @@ -30,3 +31,7 @@ def divideFractionsFunc(maxVal=10): problem = f"({a}/{b})/({c}/{d})" solution = x return problem, solution + + +fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", + divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index 930e34b..a99d9f7 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionFunc(maxRes=99, maxDivid=99): @@ -9,3 +10,6 @@ def divisionFunc(maxRes=99, maxDivid=99): problem = str(a) + "/" + str(b) + "=" solution = str(c) return problem, solution + + +division = Generator("Division", 3, "a/b=", "c", divisionFunc) diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index fcc62f5..fa0514b 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionToIntFunc(maxA=25, maxB=25): @@ -11,3 +12,6 @@ def divisionToIntFunc(maxA=25, maxB=25): problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution + + +intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index f66329e..9b66167 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -1,7 +1,14 @@ from .__init__ import * +from ..__init__ import Generator -def euclidianNormFunc(v1: list): - problem = f"Euclidian norm or L2 norm of the vector{v1} is:" - solution = sqrt(sum([i**2 for i in v1])) +def euclidianNormFunc(maxEltAmt=20): + vec = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] + problem = f"Euclidian norm or L2 norm of the vector{vec} is:" + solution = math.sqrt(sum([i**2 for i in vec])) return problem, solution + + +eucldianNorm = Generator("Euclidian norm or L2 norm of a vector", 69, + "Euclidian Norm of a vector V:[v1, v2, ......., vn]", + "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc) diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index a74f378..1b4cc0c 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def exponentiationFunc(maxBase=20, maxExpo=10): @@ -8,3 +9,7 @@ def exponentiationFunc(maxBase=20, maxExpo=10): problem = f"{base}^{expo} =" solution = str(base**expo) return problem, solution + + +exponentiation = Generator("Exponentiation", 53, "a^b = ", "c", + exponentiationFunc) diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index 71dc3a2..463d936 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factorialFunc(maxInput=6): @@ -13,3 +14,6 @@ def factorialFunc(maxInput=6): n -= 1 solution = str(b) return problem, solution + + +factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc) diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index 1cb43c0..a0ef82e 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factoringFunc(range_x1=10, range_x2=10): @@ -27,3 +28,7 @@ def factoringFunc(range_x1=10, range_x2=10): x2 = intParser(x2) solution = f"(x{x1})(x{x2})" return problem, solution + + +factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", + "(x-x1)(x-x2)", factoringFunc) diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index 60391cb..117befd 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fibonacciSeriesFunc(minNo=1): @@ -19,3 +20,8 @@ def fibonacciSeriesFunc(minNo=1): problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution + + +fibonacciSeries = Generator( + "Fibonacci Series", 56, "fibonacci series of first a numbers", + "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index 59a05c4..871b725 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fourthAngleOfQuadriFunc(maxAngle=180): @@ -12,3 +13,9 @@ def fourthAngleOfQuadriFunc(maxAngle=180): problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution + + +fourthAngleOfQuadrilateral = Generator( + "Fourth Angle of Quadrilateral", 49, + "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", + fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcdFunc.py index 505c7fb..4f271d1 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcdFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def gcdFunc(maxVal=20): @@ -10,3 +11,7 @@ def gcdFunc(maxVal=20): problem = f"GCD of {a} and {b} = " solution = str(x) return problem, solution + + +gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", + "c", gcdFunc) diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 7c80a7e..0683c3c 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geomProgrFunc(number_values=6, @@ -21,3 +22,9 @@ def geomProgrFunc(number_values=6, solution = "The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format( a, r, n_term, value_nth_term, sum_term, sum_till_nth_term) return problem, solution + + +geometricprogression = Generator( + "Geometric Progression", 66, + "Initial value,Common Ratio,nth Term,Sum till nth term =", + "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc) diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 0980979..ad80594 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geometricMeanFunc(maxValue=100, maxNum=4): @@ -25,3 +26,8 @@ def geometricMeanFunc(maxValue=100, maxNum=4): problem = f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" return problem, solution + + +geometricMean = Generator("Geometric Mean of N Numbers", 67, + "Geometric mean of n numbers A1 , A2 , ... , An = ", + "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 8aefb41..5febc7e 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def harmonicMeanFunc(maxValue=100, maxNum=4): @@ -26,3 +27,9 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): problem = f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}" return problem, solution + + +harmonicMean = Generator("Harmonic Mean of N Numbers", 68, + "Harmonic mean of n numbers A1 , A2 , ... , An = ", + " n/((1/A1) + (1/A2) + ... + (1/An)) = ans", + harmonicMeanFunc) diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 047fb0c..aaab950 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def hcfFunc(maxVal=20): @@ -10,3 +11,7 @@ def hcfFunc(maxVal=20): problem = f"HCF of {a} and {b} = " solution = str(x) return problem, solution + + +hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", + hcfFunc) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index eda508e..4697201 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def intersectionOfTwoLinesFunc(minM=-10, @@ -64,3 +65,9 @@ def intersectionOfTwoLinesFunc(minM=-10, solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" return problem, solution + + +intersectionOfTwoLines = Generator( + "Intersection of Two Lines", 41, + "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", + "(x, y)", intersectionOfTwoLinesFunc) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index 13c7240..19a4240 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): @@ -18,3 +19,8 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution solution = "No" return problem, solution + + +doesTriangleExist = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index 32e1868..ef57c2c 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def lcmFunc(maxVal=20): @@ -15,3 +16,7 @@ def lcmFunc(maxVal=20): solution = str(d) return problem, solution + + +lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", + lcmFunc) diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index e2eeb26..62dc081 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def linearEquationsFunc(n=2, varRange=20, coeffRange=20): @@ -27,3 +28,7 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): problem = "\n".join(problem) return problem, solution + + +linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", + "x=-20 & y=12", linearEquationsFunc) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 6fc651b..dcc7c05 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def logFunc(maxBase=3, maxVal=8): @@ -10,3 +11,6 @@ def logFunc(maxBase=3, maxVal=8): solution = str(a) return problem, solution + + +log = Generator("Logarithm", 12, "log2(8)", "3", logFunc) diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 72c01ca..4eb2787 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator import sympy @@ -76,3 +77,7 @@ def matrixInversion(SquareMatrixDimension=3, problem = 'Inverse of Matrix ' + str(Mat) + ' is:' solution = str(sympy.Matrix.inv(Mat)) return problem, solution + + +invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index e2e382f..9706782 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -1,10 +1,11 @@ from .__init__ import * +from ..__init__ import Generator -def matrixMultiplicationFunc(maxVal=100): - m = random.randint(2, 10) - n = random.randint(2, 10) - k = random.randint(2, 10) +def matrixMultiplicationFunc(maxVal=100, max_dim=10): + m = random.randint(2, max_dim) + n = random.randint(2, max_dim) + k = random.randint(2, max_dim) # generate matrices a and b a = [] @@ -51,3 +52,8 @@ def matrixMultiplicationFuncHelper(inp): string += "]]" return string + + +matrixMultiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 4b17846..cd20310 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def meanMedianFunc(maxlen=10): @@ -12,3 +13,8 @@ def meanMedianFunc(maxlen=10): median = (randomlist[4] + randomlist[5]) / 2 solution = f"Arithmetic mean of the series is {mean} and Arithmetic median of this series is {median}" return problem, solution + + +meanMedian = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 2a447c4..3d97d52 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def moduloFunc(maxRes=99, maxModulo=99): @@ -9,3 +10,6 @@ def moduloFunc(maxRes=99, maxModulo=99): problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution + + +moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 8ad25f6..2994ad6 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -1,11 +1,19 @@ from .__init__ import * +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) + "=" solution = str(c) return problem, solution + + +multiplication = Generator("Multiplication", 2, "a*b=", "c", + multiplicationFunc) diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index f1842c2..8f825d0 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, @@ -10,3 +11,8 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, problem = f"{num1} * {num2} = " solution = num1 * num2 return problem, solution + + +complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 1ec38bb..39857c4 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyFractionsFunc(maxVal=10): @@ -30,3 +31,8 @@ def multiplyFractionsFunc(maxVal=10): problem = f"({a}/{b})*({c}/{d})" solution = x return problem, solution + + +fractionMultiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index 7808afe..1409a5b 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): @@ -11,3 +12,9 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = " solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]" return problem, solution + + +intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", + 17, "k * [[a,b],[c,d]]=", + "[[k*a,k*b],[k*c,k*d]]", + multiplyIntToMatrix22) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index b7475ee..1983a0d 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def nthFibonacciNumberFunc(maxN=100): @@ -8,3 +9,8 @@ def nthFibonacciNumberFunc(maxN=100): ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / (math.sqrt(5))) solution = f"{ans}" return problem, solution + + +nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index f064f2a..36d72be 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def percentageFunc(maxValue=99, maxpercentage=99): @@ -9,3 +10,7 @@ def percentageFunc(maxValue=99, maxpercentage=99): formatted_float = "{:.2f}".format(percentage) solution = f"Required percentage = {formatted_float}%" return problem, solution + + +percentage = Generator("Percentage of a number", 80, "What is a% of b?", + "percentage", percentageFunc) diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index c62841f..f4764c0 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def permutationFunc(maxlength=20): @@ -9,3 +10,9 @@ def permutationFunc(maxlength=20): problem = "Number of Permutations from {} objects picked {} at a time = ".format( a, b) return problem, solution + + +permutations = Generator( + "Permutations", 42, + "Total permutations of 4 objects at a time from 10 objects is", "5040", + permutationFunc) diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index a14bd90..6e41170 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -16,3 +17,8 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): problem += str(coefficient) + "x^" + str(exponent) solution += str(coefficient * exponent) + "x^" + str(exponent - 1) return problem, solution + + +powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index fb1f62d..4b5684b 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -19,3 +20,7 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + c" return problem, solution + + +powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 852821c..6eed7a9 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def primeFactorsFunc(minVal=1, maxVal=200): @@ -20,3 +21,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution + + +primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index da99f94..c9d1d4d 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def profitLossPercentFunc(maxCP=1000, maxSP=1000): @@ -14,3 +15,9 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): solution = percent return problem, solution + + +profitLossPercent = Generator( + "Profit or Loss Percent", 63, + "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", + profitLossPercentFunc) diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 17bcd82..26dc744 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def pythagoreanTheoremFunc(maxLength=20): @@ -9,3 +10,9 @@ def pythagoreanTheoremFunc(maxLength=20): problem = f"The hypotenuse of a right triangle given the other two lengths {a} and {b} = " solution = f"{c:.0f}" if c.is_integer() else f"{c:.2f}" return problem, solution + + +pythagoreanTheorem = Generator( + "Pythagorean Theorem", 25, + "The hypotenuse of a right triangle given the other two lengths a and b = ", + "hypotenuse", pythagoreanTheoremFunc) diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 7f784fc..021faff 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def quadraticEquation(maxVal=100): @@ -13,3 +14,9 @@ def quadraticEquation(maxVal=100): [round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)]) return problem, solution + + +quadraticEquationSolve = Generator( + "Quadratic Equation", 50, + "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", + quadraticEquation) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py new file mode 100644 index 0000000..5948eb7 --- /dev/null +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -0,0 +1,17 @@ +from .__init__ import * +from numpy import 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) + + problem = "Angle " + str(a) + " in degrees is = " + solution = str(b) + + return problem, solution + + +radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index 5275bef..a264c5a 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): @@ -8,3 +9,9 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution + + +angleRegularPolygon = Generator( + "Angle of a Regular Polygon", 29, + "Find the angle of a regular polygon with 6 sides", "120", + regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index c2ab0bf..db9dc7e 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sectorAreaFunc(maxRadius=49, maxAngle=359): @@ -9,3 +10,8 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution + + +sectorArea = Generator("Area of a Sector", 75, + "Area of a sector with radius, r and angle, a ", "Area", + sectorAreaFunc) diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index 30ca938..23f1afc 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): @@ -13,3 +14,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): c) + " years is = " solution = round(d, 2) return problem, solution + + +simpleInterest = Generator( + "Simple Interest", 45, + "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", + "d dollars", simpleInterestFunc) diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 1d159dc..dbe284c 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareFunc(maxSquareNum=20): @@ -8,3 +9,6 @@ def squareFunc(maxSquareNum=20): problem = str(a) + "^2" + "=" solution = str(b) return problem, solution + + +square = Generator("Square", 8, "a^2", "b", squareFunc) diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index e5d2418..6cc410a 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareRootFunc(minNo=1, maxNo=12): @@ -8,3 +9,6 @@ def squareRootFunc(minNo=1, maxNo=12): problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution + + +squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index a50537e..9298037 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def subtractionFunc(maxMinuend=99, maxDiff=99): @@ -9,3 +10,6 @@ def subtractionFunc(maxMinuend=99, maxDiff=99): problem = str(a) + "-" + str(b) + "=" solution = str(c) return problem, solution + + +subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 8338698..c0a9d7b 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sumOfAnglesOfPolygonFunc(maxSides=12): @@ -8,3 +9,8 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution + + +sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, + "Sum of angles of polygon with n sides = ", + "sum", sumOfAnglesOfPolygonFunc) diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index e005d3f..278c3c4 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surdsComparisonFunc(maxValue=100, maxRoot=10): @@ -15,3 +16,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): elif first < second: solution = "<" return problem, solution + + +surdsComparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", "/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index 53799aa..8497460 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): @@ -11,3 +12,9 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaConeGen = Generator( + "Surface Area of cone", 38, + "Surface area of cone with height = a units and radius = b units is", + "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surfaceAreaCube.py index 9f9d07f..42b07f4 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surfaceAreaCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): @@ -7,3 +8,8 @@ def surfaceAreaCube(maxSide=20, unit='m'): ans = 6 * a * a solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index 95fee71..0889441 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): @@ -10,3 +11,9 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCuboidGen = Generator( + "Surface Area of Cuboid", 33, + "Surface area of cuboid with sides = a units, b units, c units is", + "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index eacc0be..3a7a1e8 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(2 * math.pi * a * b + 2 * math.pi * b * b) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCylinderGen = Generator( + "Surface Area of Cylinder", 34, + "Surface area of cylinder with height = a units and radius = b units is", + "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 6b9110d..86a9456 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): @@ -8,3 +9,9 @@ def surfaceAreaSphere(maxSide=20, unit='m'): ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaSphereGen = Generator( + "Surface Area of Sphere", 60, + "Surface area of sphere with radius = a units is", "d units^2", + surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index ef63c73..ef00b0e 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): @@ -45,3 +46,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): solution = f"x = {x}, y = {y}" return problem, solution # Add random (non-zero) multiple of equations to each other + + +systemOfEquations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 5268ceb..f5f7afb 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): @@ -9,3 +10,8 @@ def thirdAngleOfTriangleFunc(maxAngle=89): problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution + + +thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 7506283..318beec 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): @@ -12,3 +13,7 @@ def vectorCrossFunc(minVal=-20, maxVal=20): problem = str(a) + " X " + str(b) + " = " solution = str(c) return problem, solution + + +vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 011beb3..0ca2609 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): @@ -9,3 +10,7 @@ def vectorDotFunc(minVal=-20, maxVal=20): problem = str(a) + " . " + str(b) + " = " solution = str(c) return problem, solution + + +vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index c237bca..85dbd55 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a * (1 / 3)) solution = f"{ans} {unit}^3" return problem, solution + + +volumeConeGen = Generator( + "Volume of cone", 39, + "Volume of cone with height = a units and radius = b units is", + "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index 6a52da4..ff1ac76 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): @@ -8,3 +9,8 @@ def volumeCube(maxSide=20, unit='m'): ans = a * a * a solution = f"{ans} {unit}^3" return problem, solution + + +volumeCubeGen = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index b0a2490..d25d753 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): @@ -10,3 +11,9 @@ def volumeCuboid(maxSide=20, unit='m'): ans = a * b * c solution = f"{ans} {unit}^3" return problem, solution + + +volumeCuboidGen = Generator( + "Volume of Cuboid", 36, + "Volume of cuboid with sides = a units, b units, c units is", "d units^3", + volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index 38dfd64..e021aab 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -9,3 +10,9 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" return problem, solution + + +volumeCylinderGen = Generator( + "Volume of cylinder", 37, + "Volume of cylinder with height = a units and radius = b units is", + "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 1f94c7f..038607e 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): @@ -8,3 +9,8 @@ def volumeSphereFunc(maxRadius=100): ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution + + +volumeSphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index faa6cac..959093b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -23,8 +23,8 @@ class Generator: self.id ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) # || Non-generator Functions @@ -33,237 +33,5 @@ def genById(id): return (generator()) -# -# def getGenList(): -# return(genList) - # Format is: # = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) -# Funcs_start - DO NOT REMOVE! -# addition = Generator("Addition", 0, "a+b=", "c", additionFunc) -subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) -multiplication = Generator("Multiplication", 2, "a*b=", "c", - multiplicationFunc) -division = Generator("Division", 3, "a/b=", "c", divisionFunc) -binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", - binaryComplement1sFunc) -moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) -squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) -powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", - "(n*m)x^(m-1)", - powerRuleDifferentiationFunc) -square = Generator("Square", 8, "a^2", "b", squareFunc) -lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", - lcmFunc) -gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", - "c", gcdFunc) -basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", - basicAlgebraFunc) -log = Generator("Logarithm", 12, "log2(8)", "3", logFunc) -intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) -decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", - DecimalToBinaryFunc) -binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", - BinaryToDecimalFunc) -fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", - divideFractionsFunc) -intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", - 17, "k * [[a,b],[c,d]]=", - "[[k*a,k*b],[k*c,k*d]]", - multiplyIntToMatrix22) -areaOfTriangle = Generator("Area of Triangle", 18, - "Area of Triangle with side lengths a, b, c = ", - "area", areaOfTriangleFunc) -doesTriangleExist = Generator("Triangle exists check", 19, - "Does triangle with sides a, b and c exist?", - "Yes/No", isTriangleValidFunc) -midPointOfTwoPoint = Generator("Midpoint of the two point", 20, - "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", - MidPointOfTwoPointFunc) -factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", - "(x-x1)(x-x2)", factoringFunc) -thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, - "Third Angle of the triangle = ", "angle3", - thirdAngleOfTriangleFunc) -systemOfEquations = Generator("Solve a System of Equations in R^2", 23, - "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", - systemOfEquationsFunc) -distance2Point = Generator("Distance between 2 points", 24, - "Find the distance between (x1,y1) and (x2,y2)", - "sqrt(distanceSquared)", distanceTwoPointsFunc) -pythagoreanTheorem = Generator( - "Pythagorean Theorem", 25, - "The hypotenuse of a right triangle given the other two lengths a and b = ", - "hypotenuse", pythagoreanTheoremFunc) -# This has multiple variables whereas #23 has only x and y -linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", - "x=-20 & y=12", linearEquationsFunc) -primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", - "[b, c, d, ...]", primeFactorsFunc) -fractionMultiplication = Generator("Fraction Multiplication", 28, - "(a/b)*(c/d)=", "x/y", - multiplyFractionsFunc) -angleRegularPolygon = Generator( - "Angle of a Regular Polygon", 29, - "Find the angle of a regular polygon with 6 sides", "120", - regularPolygonAngleFunc) -combinations = Generator( - "Combinations of Objects", 30, - "Combinations available for picking 4 objects at a time from 6 distinct objects =", - " 15", combinationsFunc) -factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc) -surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, - "Surface area of cube with side a units is", - "b units^2", surfaceAreaCube) -surfaceAreaCuboidGen = Generator( - "Surface Area of Cuboid", 33, - "Surface area of cuboid with sides = a units, b units, c units is", - "d units^2", surfaceAreaCuboid) -surfaceAreaCylinderGen = Generator( - "Surface Area of Cylinder", 34, - "Surface area of cylinder with height = a units and radius = b units is", - "c units^2", surfaceAreaCylinder) -volumeCubeGen = Generator("Volum of Cube", 35, - "Volume of cube with side a units is", "b units^3", - volumeCube) -volumeCuboidGen = Generator( - "Volume of Cuboid", 36, - "Volume of cuboid with sides = a units, b units, c units is", "d units^3", - volumeCuboid) -volumeCylinderGen = Generator( - "Volume of cylinder", 37, - "Volume of cylinder with height = a units and radius = b units is", - "c units^3", volumeCylinder) -surfaceAreaConeGen = Generator( - "Surface Area of cone", 38, - "Surface area of cone with height = a units and radius = b units is", - "c units^2", surfaceAreaCone) -volumeConeGen = Generator( - "Volume of cone", 39, - "Volume of cone with height = a units and radius = b units is", - "c units^3", volumeCone) -commonFactors = Generator("Common Factors", 40, - "Common Factors of {a} and {b} = ", "[c, d, ...]", - commonFactorsFunc) -intersectionOfTwoLines = Generator( - "Intersection of Two Lines", 41, - "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", - "(x, y)", intersectionOfTwoLinesFunc) -permutations = Generator( - "Permutations", 42, - "Total permutations of 4 objects at a time from 10 objects is", "5040", - permutationFunc) -vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", - vectorCrossFunc) -compareFractions = Generator( - "Compare Fractions", 44, - "Which symbol represents the comparison between a/b and c/d?", ">/</=", - compareFractionsFunc) -simpleInterest = Generator( - "Simple Interest", 45, - "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", - "d dollars", simpleInterestFunc) -matrixMultiplication = Generator("Multiplication of two matrices", 46, - "Multiply two matrices A and B", "C", - matrixMultiplicationFunc) -CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", - "b", cubeRootFunc) -powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", - "(n/m)x^(m+1)", powerRuleIntegrationFunc) -fourthAngleOfQuadrilateral = Generator( - "Fourth Angle of Quadrilateral", 49, - "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", - fourthAngleOfQuadriFunc) -quadraticEquationSolve = Generator( - "Quadratic Equation", 50, - "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", - quadraticEquation) -hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", - hcfFunc) -diceSumProbability = Generator( - "Probability of a certain sum appearing on faces of dice", 52, - "If n dices are rolled then probabilty of getting sum of x is =", "z", - DiceSumProbFunc) -exponentiation = Generator("Exponentiation", 53, "a^b = ", "c", - exponentiationFunc) -confidenceInterval = Generator("Confidence interval For sample S", 54, - "With X% confidence", "is (A,B)", - confidenceIntervalFunc) -surdsComparison = Generator("Comparing surds", 55, - "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", - surdsComparisonFunc) -fibonacciSeries = Generator( - "Fibonacci Series", 56, "fibonacci series of first a numbers", - "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) -basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", - "ans", basicTrigonometryFunc) -sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, - "Sum of angles of polygon with n sides = ", - "sum", sumOfAnglesOfPolygonFunc) -dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", - "Mean:a+b+c/3,Std,Var", dataSummaryFunc) -surfaceAreaSphereGen = Generator( - "Surface Area of Sphere", 60, - "Surface area of sphere with radius = a units is", "d units^2", - surfaceAreaSphere) -volumeSphere = Generator("Volume of Sphere", 61, - "Volume of sphere with radius r m = ", - "(4*pi/3)*r*r*r", volumeSphereFunc) -nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, - "What is the nth Fibonacci number", "Fn", - nthFibonacciNumberFunc) -profitLossPercent = Generator( - "Profit or Loss Percent", 63, - "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", - profitLossPercentFunc) -binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", - binaryToHexFunc) -complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, - "(x + j) (y + j) = ", "xy + xj + yj -1", - multiplyComplexNumbersFunc) -geometricprogression = Generator( - "Geometric Progression", 66, - "Initial value,Common Ratio,nth Term,Sum till nth term =", - "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc) -geometricMean = Generator("Geometric Mean of N Numbers", 67, - "Geometric mean of n numbers A1 , A2 , ... , An = ", - "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) -harmonicMean = Generator("Harmonic Mean of N Numbers", 68, - "Harmonic mean of n numbers A1 , A2 , ... , An = ", - " n/((1/A1) + (1/A2) + ... + (1/An)) = ans", - harmonicMeanFunc) -eucldianNorm = Generator("Euclidian norm or L2 norm of a vector", 69, - "Euclidian Norm of a vector V:[v1, v2, ......., vn]", - "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc) -angleBtwVectors = Generator( - "Angle between 2 vectors", 70, - "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", - "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc) -absoluteDifference = Generator( - "Absolute difference between two numbers", 71, - "Absolute difference betweeen two numbers a and b =", "|a-b|", - absoluteDifferenceFunc) -vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", - vectorDotFunc) -binary2sComplement = Generator("Binary 2's Complement", 73, - "2's complement of 11010110 =", "101010", - binary2sComplementFunc) -invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", - "A^(-1)", matrixInversion) -sectorArea = Generator("Area of a Sector", 75, - "Area of a sector with radius, r and angle, a ", "Area", - sectorAreaFunc) -meanMedian = Generator("Mean and Median", 76, - "Mean and median of given set of numbers", - "Mean, Median", meanMedianFunc) -intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, - "Det([[a,b],[c,d]]) =", " a * d - b * c", - determinantToMatrix22) -compoundInterest = Generator( - "Compound Interest", 78, - "Compound interest for a principle amount of p dollars, r% rate of interest and for a time period of t years with n times compounded annually is = ", - "A dollars", compoundInterestFunc) -decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", - "b", deciToHexaFunc) -percentage = Generator("Percentage of a number", 80, "What is a% of b?", - "percentage", percentageFunc) diff --git a/test.py b/test.py index 1302ce5..8cd6bd0 100644 --- a/test.py +++ b/test.py @@ -3,4 +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()) +"""