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/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 4e1ef42..495e3c3 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -1,5 +1,5 @@ # This workflows will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries +# For more information see https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries name: Upload Python Package diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cc6cf9d..d66144a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,15 +9,26 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - - name: Install dependencies + + - uses: actions/cache@v1 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/dev-requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + + - name: Install Dependencies + if: steps.cache.outputs.cache-hit != 'true' run: | - python -m pip install -U pip - python -m pip install -r dev-requirements.txt + pip install -r dev-requirements.txt + - name: Linter run: make lint + - name: Test run: make test 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..2bdc428 100644 --- a/README.md +++ b/README.md @@ -31,76 +31,93 @@ 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 | 29+29= | 58 | addition | +| 1 | Subtraction | 10-8= | 2 | subtraction | +| 2 | Multiplication | 96*0= | 0 | multiplication | +| 3 | Division | 25/95= | 0.2631578947368421 | division | +| 4 | Binary Complement 1s | 100101100= | 011010011 | binary_complement_1s | +| 5 | Modulo Division | 74%50= | 24 | modulo_division | +| 6 | Square Root | sqrt(49)= | 7 | square_root | +| 7 | Power Rule Differentiation | 10x^7 + 7x^5 + 5x^8 | 70x^6 + 35x^4 + 40x^7 | power_rule_differentiation | +| 8 | Square | 9^2= | 81 | square | +| 9 | LCM (Least Common Multiple) | LCM of 19 and 7 = | 133 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 7 = | 1 | gcd | +| 11 | Basic Algebra | 3x + 2 = 8 | 6 | basic_algebra | +| 12 | Logarithm | log2(128) | 7 | log | +| 13 | Easy Division | 228/12 = | 19 | int_division | +| 14 | Decimal to Binary | Binary of 37= | 100101 | decimal_to_binary | +| 15 | Binary to Decimal | 10100001 | 161 | binary_to_decimal | +| 16 | Fraction Division | (8/2)/(8/2) | 1 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 6 * [[3, 7], [10, 6]] = | [[18,42],[60,36]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 2 1 19 = | (5.449334243437888e-15+88.99438184514796j) | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 48, 16 and 30 exist? | No | valid_triangle | +| 20 | Midpoint of the two point | (2,-5),(12,-7)= | (7.0,-6.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-18x+81 | (x-9)(x-9) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 45 and 1 = | 134 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | -7x - 10y = -133, 7x - 2y = 49 | x = 9, y = 7 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (-10, 7) and (16, 6) | sqrt(677) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 8 = | 12.81 | pythagorean_theorem | +| 26 | Linear Equations | 18x + -2y = -174, -13x + 6y = 194 | x = -8, y = 15 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 16 | [2, 2, 2, 2] | prime_factors | +| 28 | Fraction Multiplication | (6/8)*(2/5) | 3/10 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 17 sides | 158.82 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 3 at a time | 680 | combinations | +| 31 | Factorial | 1! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 12m, 11m, 1m is | 310 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 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 = 17m, 19m, 8m is | 2584 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 35m and radius = 19m is | 39694 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 8m and radius = 19m is | 2364 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 43m and radius = 13m is | 7609 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 21 and 65 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 5/4x - 1 and y = 0/4x - 5 | (-16/5, -5) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 10 objects picked 5 at a time = | 30240 | permutation | +| 43 | Cross Product of 2 Vectors | [12, -16, 4] X [-14, 10, -9] = | [104, 52, -104] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 7/10 and 7/5? | < | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 6138 dollars, 9% rate of interest and for a time period of 8 years is = | 4419.36 | simple_interest | +| 46 | Multiplication of two matrices | Multiply
-8-8
-2-9
and
-10-8
9-9
|
8136
-6197
| matrix_multiplication | +| 47 | Cube Root | cuberoot of 633 upto 2 decimal places is: | 8.59 | cube_root | +| 48 | Power Rule Integration | 2x^5 + 3x^3 + 4x^7 + 9x^1 + 6x^9 | (2/5)x^6 + (3/3)x^4 + (4/7)x^8 + (9/1)x^2 + (6/9)x^10 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 79 , 44, 37 = | 200 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+182x+98=0 | [-0.86, -1.45] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 1 and 20 = | 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 2 = | 1/6 | dice_sum_probability | +| 53 | Exponentiation | 6^9 = | 10077696 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [260, 249, 281, 261, 236, 237, 275, 229, 256, 242, 277, 240, 278, 293, 271, 255, 216, 292, 200, 298, 282, 223] with 99% confidence is | (271.2437114485249, 242.48356127874783) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 71^(1/5) _ 31^(1/8) | > | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 19 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584] | fibonacci_series | +| 57 | Trigonometric Values | What is cos(45)? | 1/√2 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 10 sides = | 1440 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[13, 22, 36, 17, 9, 39, 50, 14, 32, 40, 37, 48, 47, 28, 47] | The Mean is 31.933333333333334 , Standard Deviation is 182.59555555555553, Variance is 13.51279229306643 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 18m is | 4071.5040790523717 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 85th Fibonacci number? | 259695496911123328 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 353 and SP = 752 is: | 113.03116147308782 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 111101011 | 0x1eb | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-19-9j) * (-17-2j) = | (305+191j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [7, 77, 847, 9317, 102487, 1127357] ,Find the value of a,common ratio,6th term value, sum upto 7th term | The value of a is 7, common ratio is 11 , 6th term is 1127357 , sum upto 7th term is 13641019.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 32 , 5 and 18 = | (32*5*18)^(1/3) = 14.227573217960249 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 48 , 85 and 79 = | 3/((1/48) + (1/85) + (1/79)) = 66.28916158223076 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[743.1109024649227, 951.2861991520674, 821.2679183199273, 831.5922742303677, 972.3005129207023, 775.1712986008336, 869.5254070360901, 34.05779748860371, 495.5299489221041, 516.2458991121815, 620.0871728488738, 12.438787805084894, 967.8138977993306, 627.6791615554401, 129.81896901435886, 566.4442009627315, 521.5300881726977, 741.5947979192599] is: | 2917.827115551868 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [341.1766244080324, 386.90517658729595, 306.3074773969527, 542.1138441520038, 149.80203485453225, 85.6719016065689, 875.0827941729921, 292.0422074695527, 312.8929536855103, 408.95388654647445, 119.81564007869672, 177.5529661884936, 360.30983184002406, 111.71502530193955, 29.528755078141455, 478.2846569662712, 855.8978282979257] and [230.45166329807688, 922.2895458023412, 219.89492715268733, 375.8793126730714, 731.2614314505195, 277.5554009411926, 329.1490487358273, 477.7600322879586, 168.93745868538923, 423.6897582803929, 724.5555882496458, 519.6421532094823, 158.0479000313908, 679.3674240323584, 496.6795371750926, 853.4421897526636, 715.2567898992207] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 53 and -70 = | 123 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [-8, -4, -10] . [-9, -6, -9] = | 186 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of = | | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[43, 95, 41], [46, 80, 67], [57, 75, 71]]) is: | Matrix([[131/7038, -367/3519, 617/7038], [553/35190, 358/17595, -199/7038], [-37/1173, 73/1173, -31/1173]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 40 and angle, 199. Find the area of the sector. | Area of sector = 2778.56417 | sector_area | +| 76 | Mean and Median | Given the series of numbers [44, 64, 22, 37, 63, 56, 27, 62, 98, 72]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 54.5 and Arithmetic median of this series is 59.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[73, 52], [55, 80]]) = | 2980 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 8506 dollars, 8% rate of interest and for a time period of 10 compounded monthly is = | 8506.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 293= | 0x125 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 57% of 4? | Required percentage = 2.28% | percentage | +| 81 | Celsius To Fahrenheit | Convert 57 degrees Celsius to degrees Fahrenheit = | 134.60000000000002 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 89 of the AP series: 20, 115, 210 ... | 8380 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 98 terms of the AP series: -58, -106, -154 ... | -233828.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 1716 in Octal is: | 0o3264 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 587 in Roman Numerals is: | DLXXXVII | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 245 in radians is = | 4.28 | degree_to_rad | +| 87 | Radians to Degrees | Angle 0 in degrees is = | 0.0 | radian_to_deg | +| 88 | Differentiation | differentiate w.r.t x : d(exp(x)+5*x^(-2))/dx | exp(x) - 10/x^3 | differentiation | +| 89 | Definite Integral of Quadratic Equation | The definite integral within limits 0 to 1 of the equation 39x^2 + 72x + 74 is = | 123.0 | definite_integral | diff --git a/dev-requirements.txt b/dev-requirements.txt index 7b33738..0226baf 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,6 @@ pytest hypothesis flake8 autopep8 -sympy \ No newline at end of file +sympy +numpy +scipy 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..090e18a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,3 +1,5 @@ +import sys +import traceback genList = [] @@ -8,16 +10,22 @@ 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( 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(): - return genList + correctedList = genList[-1:] + genList[:-1] + return correctedList diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 83702eb..56a2fd5 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,85 +2,96 @@ 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 .gcdFunc import * -from .lcmFunc 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 .volumeCube import * -from .surfaceAreaCuboid import * -from .volumeCuboid import * -from .surfaceAreaCylinder 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 .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 * +from .differentiation import * +from .definite_integral import * +from .is_prime import * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absolute_difference.py similarity index 64% rename from mathgenerator/funcs/absoluteDifferenceFunc.py rename to mathgenerator/funcs/absolute_difference.py index 138c8de..fae1fb0 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absolute_difference.py @@ -10,3 +10,9 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): str(a) + " and " + str(b) + " = " solution = absDiff return problem, solution + + +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/angleBtwVectorsFunc.py deleted file mode 100644 index bd2d0b5..0000000 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ /dev/null @@ -1,16 +0,0 @@ -from .euclidianNormFunc import euclidianNormFunc -import math -from .__init__ import * - - -def angleBtwVectorsFunc(v1: list, v2: list): - sum = 0 - for i in v1: - for j in v2: - sum += i * j - - mags = euclidianNormFunc(v1) * euclidianNormFunc(v2) - problem = f"angle between the vectors {v1} and {v2} is:" - solution = math.acos(sum / mags) - # would return the answer in radians - return problem, solution diff --git a/mathgenerator/funcs/angle_btw_vectors.py b/mathgenerator/funcs/angle_btw_vectors.py new file mode 100644 index 0000000..f3b8a65 --- /dev/null +++ b/mathgenerator/funcs/angle_btw_vectors.py @@ -0,0 +1,28 @@ +from .__init__ import * +import math + + +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: + s += i * j + + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) + problem = f"angle between the vectors {v1} and {v2} is:" + solution = '' + try: + solution = str(math.acos(s / mags)) + except ValueError: + print('angleBtwVectorsFunc has some issues with math module, line 16') + solution = 'NaN' + # would return the answer in radians + return problem, solution + + +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 64% rename from mathgenerator/funcs/regularPolygonAngleFunc.py rename to mathgenerator/funcs/angle_regular_polygon.py index 5275bef..90f2c71 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/angle_regular_polygon.py @@ -8,3 +8,9 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution + + +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 68% rename from mathgenerator/funcs/areaOfTriangleFunc.py rename to mathgenerator/funcs/area_of_triangle.py index a795a99..488a997 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/area_of_triangle.py @@ -13,3 +13,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): str(a) + " " + str(b) + " " + str(c) + " = " solution = area return problem, solution + + +area_of_triangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmetic_progression_sum.py b/mathgenerator/funcs/arithmetic_progression_sum.py new file mode 100644 index 0000000..e376c3f --- /dev/null +++ b/mathgenerator/funcs/arithmetic_progression_sum.py @@ -0,0 +1,18 @@ +from .__init__ import * + + +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 + + +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/arithmetic_progression_term.py b/mathgenerator/funcs/arithmetic_progression_term.py new file mode 100644 index 0000000..8468921 --- /dev/null +++ b/mathgenerator/funcs/arithmetic_progression_term.py @@ -0,0 +1,18 @@ +from .__init__ import * + + +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 + + +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 82% rename from mathgenerator/funcs/basicAlgebraFunc.py rename to mathgenerator/funcs/basic_algebra.py index d11000d..0626cf8 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basic_algebra.py @@ -23,3 +23,7 @@ def basicAlgebraFunc(maxVariable=10): problem = f"{a}x + {b} = {c}" solution = x return problem, solution + + +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 83% rename from mathgenerator/funcs/basicTrigonometryFunc.py rename to mathgenerator/funcs/basic_trigonometry.py index 520b8a3..2992034 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basic_trigonometry.py @@ -23,3 +23,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 + + +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 78% rename from mathgenerator/funcs/binary2sComplement.py rename to mathgenerator/funcs/binary_2s_complement.py index 01af731..f053020 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary_2s_complement.py @@ -26,3 +26,8 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') return problem, solution + + +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 71% rename from mathgenerator/funcs/binaryComplement1sFunc.py rename to mathgenerator/funcs/binary_complement_1s.py index 009feea..da6c481 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binary_complement_1s.py @@ -13,3 +13,7 @@ def binaryComplement1sFunc(maxDigits=10): problem = question + "=" solution = answer return problem, solution + + +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 56% rename from mathgenerator/funcs/BinaryToDecimalFunc.py rename to mathgenerator/funcs/binary_to_decimal.py index 9d2b25d..f7e0aa8 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/binary_to_decimal.py @@ -1,7 +1,7 @@ from .__init__ import * -def BinaryToDecimalFunc(max_dig=10): +def binaryToDecimalFunc(max_dig=10): problem = '' for i in range(random.randint(1, max_dig)): @@ -10,3 +10,7 @@ def BinaryToDecimalFunc(max_dig=10): solution = int(problem, 2) return problem, solution + + +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 66% rename from mathgenerator/funcs/binaryToHexFunc.py rename to mathgenerator/funcs/binary_to_hex.py index f06fcfc..77b03b1 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binary_to_hex.py @@ -9,3 +9,7 @@ def binaryToHexFunc(max_dig=10): solution = hex(int(problem, 2)) return problem, solution + + +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 71% rename from mathgenerator/funcs/combinationsFunc.py rename to mathgenerator/funcs/combinations.py index f213222..60c7b41 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinations.py @@ -17,3 +17,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/common_factors.py similarity index 73% rename from mathgenerator/funcs/commonFactorsFunc.py rename to mathgenerator/funcs/common_factors.py index 82a0e3b..a783909 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/common_factors.py @@ -22,3 +22,8 @@ def commonFactorsFunc(maxVal=100): problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution + + +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 78% rename from mathgenerator/funcs/compareFractionsFunc.py rename to mathgenerator/funcs/compare_fractions.py index 1c4072a..53fe7a0 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compare_fractions.py @@ -24,3 +24,9 @@ def compareFractionsFunc(maxVal=10): problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution + + +compare_fractions = 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 + + +decimal_to_roman_numerals = Generator("Converts decimal to Roman Numerals", + 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) diff --git a/mathgenerator/funcs/definite_integral.py b/mathgenerator/funcs/definite_integral.py new file mode 100644 index 0000000..6e8453f --- /dev/null +++ b/mathgenerator/funcs/definite_integral.py @@ -0,0 +1,27 @@ +from .__init__ import * +import scipy +from scipy.integrate import quad + + +def definiteIntegralFunc(max_coeff=100): + + def integrand(x, a, b, c): + return a * x ** 2 + b * x + c + + a = random.randint(0, max_coeff) + b = random.randint(0, max_coeff) + c = random.randint(0, max_coeff) + + result = quad(integrand, 0, 1, args=(a, b, c))[0] + S = round(result, 4) + + problem = "The definite integral within limits 0 to 1 of the equation " + \ + str(a) + "x^2 + " + str(b) + "x + " + str(c) + " is = " + + solution = str(S) + + return problem, solution + + +definite_integral = Generator("Definite Integral of Quadratic Equation", 89, + "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "S", definiteIntegralFunc) diff --git a/mathgenerator/funcs/degree_to_rad.py b/mathgenerator/funcs/degree_to_rad.py new file mode 100644 index 0000000..dc63f10 --- /dev/null +++ b/mathgenerator/funcs/degree_to_rad.py @@ -0,0 +1,17 @@ +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 + + +degree_to_rad = Generator("Degrees to Radians", 86, + "Angle a in radians is = ", "b", degreeToRadFunc) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/dice_sum_probability.py similarity index 79% rename from mathgenerator/funcs/DiceSumProbFunc.py rename to mathgenerator/funcs/dice_sum_probability.py index 8f05a4f..d5139e4 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/dice_sum_probability.py @@ -24,3 +24,9 @@ def DiceSumProbFunc(maxDice=3): a, b) solution = "{}/{}".format(count, 6**a) return problem, solution + + +dice_sum_probability = 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/differentiation.py b/mathgenerator/funcs/differentiation.py new file mode 100644 index 0000000..2b40dea --- /dev/null +++ b/mathgenerator/funcs/differentiation.py @@ -0,0 +1,53 @@ +from .__init__ import * + + +def genDifferentiationProblem(diff_lvl): + problem = '' + + types = { + 'Logrithmic': ['ln'], + 'Trigonometric': ['sin', 'cos', 'tan', 'cot', 'sec'], + 'Exponentional': ['exp'] + } + + if diff_lvl == 1: + coeff = random.randrange(2, 10) + power = random.randint(2, 4) + flag = random.random() + if flag > 0.5: + power *= -1 + problem += str(coeff) + '*x^' + '(' + str(power) + ')' + else: + problem += str(coeff) + '*x^' + str(power) + if diff_lvl == 2: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(x)' + '+' + genDifferentiationProblem(1) + if diff_lvl == 3: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(' + genDifferentiationProblem(1) + ')' + if diff_lvl == 4: + operator = random.choice(('/', '*')) + problem = '(' + genDifferentiationProblem(2) + ')' + \ + operator + '(' + genDifferentiationProblem(3) + ')' + + return problem + + +def differentiationFunc(diff_lvl=2): + if diff_lvl < 1 or diff_lvl > 4: + print("diff_lvl not supported") + return None + problem = genDifferentiationProblem(diff_lvl) + + x = sympy.symbols('x') + solution = str(sympy.diff(problem.replace('^', '**'), x)) + solution = solution.replace('**', '^') + problem = f"differentiate w.r.t x : d({problem})/dx" + + return problem, solution + + +differentiation = Generator( + "Differentiation", 88, "differentiate w.r.t x : d(f(x))/dx", "g(x)", differentiationFunc) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distance_two_points.py similarity index 69% rename from mathgenerator/funcs/distanceTwoPointsFunc.py rename to mathgenerator/funcs/distance_two_points.py index 9fa85c8..6dc6b7d 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distance_two_points.py @@ -12,3 +12,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 + + +distance_two_points = 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/divide_fractions.py similarity index 84% rename from mathgenerator/funcs/divideFractionsFunc.py rename to mathgenerator/funcs/divide_fractions.py index 970b28f..e9a9ec4 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divide_fractions.py @@ -30,3 +30,7 @@ def divideFractionsFunc(maxVal=10): problem = f"({a}/{b})/({c}/{d})" solution = x return problem, solution + + +divide_fractions = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", + divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/division.py similarity index 80% rename from mathgenerator/funcs/divisionFunc.py rename to mathgenerator/funcs/division.py index 930e34b..63e70cb 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/division.py @@ -9,3 +9,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/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py deleted file mode 100644 index f66329e..0000000 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ /dev/null @@ -1,7 +0,0 @@ -from .__init__ import * - - -def euclidianNormFunc(v1: list): - problem = f"Euclidian norm or L2 norm of the vector{v1} is:" - solution = sqrt(sum([i**2 for i in v1])) - return problem, solution diff --git a/mathgenerator/funcs/euclidian_norm.py b/mathgenerator/funcs/euclidian_norm.py new file mode 100644 index 0000000..cfd178c --- /dev/null +++ b/mathgenerator/funcs/euclidian_norm.py @@ -0,0 +1,13 @@ +from .__init__ import * + + +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 + + +eucldian_norm = 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/exponentiation.py similarity index 68% rename from mathgenerator/funcs/exponentiationFunc.py rename to mathgenerator/funcs/exponentiation.py index a74f378..dd764e4 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiation.py @@ -8,3 +8,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/factorial.py similarity index 78% rename from mathgenerator/funcs/factorialFunc.py rename to mathgenerator/funcs/factorial.py index 71dc3a2..15d1e9d 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorial.py @@ -13,3 +13,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/factoring.py similarity index 83% rename from mathgenerator/funcs/factoringFunc.py rename to mathgenerator/funcs/factoring.py index 1cb43c0..170a764 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoring.py @@ -27,3 +27,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/fibonacci_series.py similarity index 74% rename from mathgenerator/funcs/fibonacciSeriesFunc.py rename to mathgenerator/funcs/fibonacci_series.py index 60391cb..d81c782 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacci_series.py @@ -19,3 +19,8 @@ def fibonacciSeriesFunc(minNo=1): problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution + + +fibonacci_series = 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/fourth_angle_of_quadrilateral.py similarity index 69% rename from mathgenerator/funcs/fourthAngleOfQuadriFunc.py rename to mathgenerator/funcs/fourth_angle_of_quadrilateral.py index 59a05c4..1ecc9aa 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourth_angle_of_quadrilateral.py @@ -12,3 +12,9 @@ def fourthAngleOfQuadriFunc(maxAngle=180): problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution + + +fourth_angle_of_quadrilateral = Generator( + "Fourth Angle of Quadrilateral", 49, + "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", + fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/fraction_multiplication.py similarity index 78% rename from mathgenerator/funcs/multiplyFractionsFunc.py rename to mathgenerator/funcs/fraction_multiplication.py index 1ec38bb..5c11940 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/fraction_multiplication.py @@ -30,3 +30,8 @@ def multiplyFractionsFunc(maxVal=10): problem = f"({a}/{b})*({c}/{d})" solution = x return problem, solution + + +fraction_multiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcd.py similarity index 70% rename from mathgenerator/funcs/gcdFunc.py rename to mathgenerator/funcs/gcd.py index 505c7fb..ef1914b 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcd.py @@ -10,3 +10,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/geometricMeanFunc.py b/mathgenerator/funcs/geometric_mean.py similarity index 80% rename from mathgenerator/funcs/geometricMeanFunc.py rename to mathgenerator/funcs/geometric_mean.py index 0980979..034ddf2 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometric_mean.py @@ -25,3 +25,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 + + +geometric_mean = 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/geomProgrFunc.py b/mathgenerator/funcs/geometric_progression.py similarity index 84% rename from mathgenerator/funcs/geomProgrFunc.py rename to mathgenerator/funcs/geometric_progression.py index 7c80a7e..7c5c8f3 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geometric_progression.py @@ -21,3 +21,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 + + +geometric_progression = 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/harmonicMeanFunc.py b/mathgenerator/funcs/harmonic_mean.py similarity index 78% rename from mathgenerator/funcs/harmonicMeanFunc.py rename to mathgenerator/funcs/harmonic_mean.py index 8aefb41..179c061 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonic_mean.py @@ -26,3 +26,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 + + +harmonic_mean = 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/hcf.py similarity index 71% rename from mathgenerator/funcs/hcfFunc.py rename to mathgenerator/funcs/hcf.py index 047fb0c..f9a0366 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcf.py @@ -10,3 +10,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/divisionToIntFunc.py b/mathgenerator/funcs/int_division.py similarity index 78% rename from mathgenerator/funcs/divisionToIntFunc.py rename to mathgenerator/funcs/int_division.py index fcc62f5..65cfd08 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/int_division.py @@ -11,3 +11,6 @@ def divisionToIntFunc(maxA=25, maxB=25): problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution + + +int_division = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/int_matrix_22_determinant.py similarity index 63% rename from mathgenerator/funcs/determinantToMatrix22.py rename to mathgenerator/funcs/int_matrix_22_determinant.py index 33b4004..4e3d3ca 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/int_matrix_22_determinant.py @@ -11,3 +11,8 @@ def determinantToMatrix22(maxMatrixVal=100): problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution + + +int_matrix_22_determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersection_of_two_lines.py similarity index 90% rename from mathgenerator/funcs/intersectionOfTwoLinesFunc.py rename to mathgenerator/funcs/intersection_of_two_lines.py index eda508e..c53f6be 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersection_of_two_lines.py @@ -64,3 +64,9 @@ def intersectionOfTwoLinesFunc(minM=-10, solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" return problem, solution + + +intersection_of_two_lines = 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/matrixInversion.py b/mathgenerator/funcs/invert_matrix.py similarity index 95% rename from mathgenerator/funcs/matrixInversion.py rename to mathgenerator/funcs/invert_matrix.py index 72c01ca..7a196c5 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/invert_matrix.py @@ -76,3 +76,7 @@ def matrixInversion(SquareMatrixDimension=3, problem = 'Inverse of Matrix ' + str(Mat) + ' is:' solution = str(sympy.Matrix.inv(Mat)) return problem, solution + + +invert_matrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/is_prime.py b/mathgenerator/funcs/is_prime.py new file mode 100644 index 0000000..143f4d3 --- /dev/null +++ b/mathgenerator/funcs/is_prime.py @@ -0,0 +1,22 @@ +from .__init__ import * + + +def isprime(max_a=100): + a = random.randint(2, max_a) + problem = a + if a == 2: + solution = True + return (problem, solution) + if a % 2 == 0: + solution = False + return (problem, solution) + for i in range(3, a // 2 + 1, 2): + if a % i == 0: + solution = False + return (problem, solution) + solution = True + return (problem, solution) + + +is_prime = Generator('isprime', 90, 'a any positive integer', + 'True/False', isprime) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcm.py similarity index 73% rename from mathgenerator/funcs/lcmFunc.py rename to mathgenerator/funcs/lcm.py index 32e1868..c786b52 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcm.py @@ -15,3 +15,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/linear_equations.py similarity index 80% rename from mathgenerator/funcs/linearEquationsFunc.py rename to mathgenerator/funcs/linear_equations.py index e2eeb26..7fb71b6 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linear_equations.py @@ -25,5 +25,10 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): prob = " + ".join(prob) + " = " + str(res) problem.append(prob) - problem = "\n".join(problem) + # problem = "\n".join(problem) + problem = ", ".join(problem) return problem, solution + + +linear_equations = 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/log.py similarity index 80% rename from mathgenerator/funcs/logFunc.py rename to mathgenerator/funcs/log.py index 6fc651b..bc147f2 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/log.py @@ -10,3 +10,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/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrix_multiplication.py similarity index 76% rename from mathgenerator/funcs/matrixMultiplicationFunc.py rename to mathgenerator/funcs/matrix_multiplication.py index e2e382f..51c60f9 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrix_multiplication.py @@ -1,10 +1,10 @@ from .__init__ import * -def matrixMultiplicationFunc(maxVal=100): - m = random.randint(2, 10) - n = random.randint(2, 10) - k = random.randint(2, 10) +def matrixMultiplicationFunc(maxVal=100, max_dim=10): + m = random.randint(2, max_dim) + n = random.randint(2, max_dim) + k = random.randint(2, max_dim) # generate matrices a and b a = [] @@ -51,3 +51,8 @@ def matrixMultiplicationFuncHelper(inp): string += "]]" return string + + +matrix_multiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/mean_median.py similarity index 74% rename from mathgenerator/funcs/meanMedianFunc.py rename to mathgenerator/funcs/mean_median.py index 4b17846..91295c7 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/mean_median.py @@ -12,3 +12,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 + + +mean_median = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/midpoint_of_two_points.py similarity index 61% rename from mathgenerator/funcs/MidPointOfTwoPointFunc.py rename to mathgenerator/funcs/midpoint_of_two_points.py index f8cd8a1..2b021aa 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/midpoint_of_two_points.py @@ -10,3 +10,8 @@ def MidPointOfTwoPointFunc(maxValue=20): problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution + + +midPoint_of_two_points = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/modulo_division.py similarity index 78% rename from mathgenerator/funcs/moduloFunc.py rename to mathgenerator/funcs/modulo_division.py index 2a447c4..12f07a2 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/modulo_division.py @@ -9,3 +9,6 @@ def moduloFunc(maxRes=99, maxModulo=99): problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution + + +modulo_division = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplication.py b/mathgenerator/funcs/multiplication.py new file mode 100644 index 0000000..7e6e36e --- /dev/null +++ b/mathgenerator/funcs/multiplication.py @@ -0,0 +1,18 @@ +from .__init__ import * + + +def multiplicationFunc(maxRes=99, maxMulti=99): + a = random.randint(0, maxMulti) + 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/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py deleted file mode 100644 index 8ad25f6..0000000 --- a/mathgenerator/funcs/multiplicationFunc.py +++ /dev/null @@ -1,11 +0,0 @@ -from .__init__ import * - - -def multiplicationFunc(maxRes=99, maxMulti=99): - a = random.randint(0, maxMulti) - b = random.randint(0, min(int(maxMulti / a), maxRes)) - c = a * b - - problem = str(a) + "*" + str(b) + "=" - solution = str(c) - return problem, solution diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiply_complex_numbers.py similarity index 70% rename from mathgenerator/funcs/multiplyComplexNumbersFunc.py rename to mathgenerator/funcs/multiply_complex_numbers.py index f1842c2..03762e8 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiply_complex_numbers.py @@ -10,3 +10,8 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, problem = f"{num1} * {num2} = " solution = num1 * num2 return problem, solution + + +multiply_complex_numbers = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiply_int_to_22_matrix.py similarity index 63% rename from mathgenerator/funcs/multiplyIntToMatrix22.py rename to mathgenerator/funcs/multiply_int_to_22_matrix.py index 7808afe..3d79834 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiply_int_to_22_matrix.py @@ -11,3 +11,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 + + +multiply_int_to_22_matrix = 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/nth_fibonacci_number.py similarity index 63% rename from mathgenerator/funcs/nthFibonacciNumberFunc.py rename to mathgenerator/funcs/nth_fibonacci_number.py index b7475ee..cfb7e8a 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nth_fibonacci_number.py @@ -8,3 +8,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 + + +nth_fibonacci_number = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentage.py similarity index 73% rename from mathgenerator/funcs/percentageFunc.py rename to mathgenerator/funcs/percentage.py index f064f2a..e108a10 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentage.py @@ -9,3 +9,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/permutation.py similarity index 68% rename from mathgenerator/funcs/permutationFunc.py rename to mathgenerator/funcs/permutation.py index c62841f..63d78a8 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutation.py @@ -9,3 +9,9 @@ def permutationFunc(maxlength=20): problem = "Number of Permutations from {} objects picked {} at a time = ".format( a, b) return problem, solution + + +permutation = 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/power_rule_differentiation.py similarity index 72% rename from mathgenerator/funcs/powerRuleDifferentiationFunc.py rename to mathgenerator/funcs/power_rule_differentiation.py index a14bd90..cdc8c76 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/power_rule_differentiation.py @@ -16,3 +16,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 + + +power_rule_differentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/power_rule_integration.py similarity index 79% rename from mathgenerator/funcs/powerRuleIntegrationFunc.py rename to mathgenerator/funcs/power_rule_integration.py index fb1f62d..7356a68 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/power_rule_integration.py @@ -19,3 +19,7 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + c" return problem, solution + + +power_rule_integration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/prime_factors.py similarity index 74% rename from mathgenerator/funcs/primeFactorsFunc.py rename to mathgenerator/funcs/prime_factors.py index 852821c..575db01 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/prime_factors.py @@ -20,3 +20,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution + + +prime_factors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profit_loss_percent.py similarity index 71% rename from mathgenerator/funcs/profitLossPercentFunc.py rename to mathgenerator/funcs/profit_loss_percent.py index da99f94..c43351c 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profit_loss_percent.py @@ -14,3 +14,9 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): solution = percent return problem, solution + + +profit_loss_percent = 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/pythagorean_theorem.py similarity index 65% rename from mathgenerator/funcs/pythagoreanTheoremFunc.py rename to mathgenerator/funcs/pythagorean_theorem.py index 17bcd82..7387499 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagorean_theorem.py @@ -9,3 +9,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 + + +pythagorean_theorem = 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/quadratic_equation.py similarity index 74% rename from mathgenerator/funcs/quadraticEquation.py rename to mathgenerator/funcs/quadratic_equation.py index 7f784fc..5961852 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadratic_equation.py @@ -13,3 +13,9 @@ def quadraticEquation(maxVal=100): [round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)]) return problem, solution + + +quadratic_equation = 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/radian_to_deg.py b/mathgenerator/funcs/radian_to_deg.py new file mode 100644 index 0000000..e48acc0 --- /dev/null +++ b/mathgenerator/funcs/radian_to_deg.py @@ -0,0 +1,18 @@ +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 + + +radian_to_deg = Generator("Radians to Degrees", 87, + "Angle a in degrees is = ", "b", radianToDegFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sector_area.py similarity index 71% rename from mathgenerator/funcs/sectorAreaFunc.py rename to mathgenerator/funcs/sector_area.py index c2ab0bf..9a14728 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sector_area.py @@ -9,3 +9,8 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution + + +sector_area = 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/simple_interest.py similarity index 69% rename from mathgenerator/funcs/simpleInterestFunc.py rename to mathgenerator/funcs/simple_interest.py index 30ca938..00242b1 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simple_interest.py @@ -13,3 +13,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): c) + " years is = " solution = round(d, 2) return problem, solution + + +simple_interest = 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/square.py similarity index 77% rename from mathgenerator/funcs/squareFunc.py rename to mathgenerator/funcs/square.py index 1d159dc..28ed2c3 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/square.py @@ -8,3 +8,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/square_root.py similarity index 72% rename from mathgenerator/funcs/squareRootFunc.py rename to mathgenerator/funcs/square_root.py index e5d2418..fa09006 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/square_root.py @@ -8,3 +8,6 @@ def squareRootFunc(minNo=1, maxNo=12): problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution + + +square_root = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtraction.py similarity index 78% rename from mathgenerator/funcs/subtractionFunc.py rename to mathgenerator/funcs/subtraction.py index a50537e..47c7ef2 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtraction.py @@ -9,3 +9,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/sum_of_polygon_angles.py similarity index 53% rename from mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py rename to mathgenerator/funcs/sum_of_polygon_angles.py index 8338698..29519df 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sum_of_polygon_angles.py @@ -8,3 +8,8 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution + + +sum_of_polygon_angles = 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/surds_comparison.py similarity index 74% rename from mathgenerator/funcs/surdsComparisonFunc.py rename to mathgenerator/funcs/surds_comparison.py index e005d3f..7c2825c 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surds_comparison.py @@ -15,3 +15,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): elif first < second: solution = "<" return problem, solution + + +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 70% rename from mathgenerator/funcs/surfaceAreaCone.py rename to mathgenerator/funcs/surface_area_cone.py index 53799aa..2d86c5e 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surface_area_cone.py @@ -11,3 +11,9 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): solution = f"{ans} {unit}^2" return problem, solution + + +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 56% rename from mathgenerator/funcs/surfaceAreaCube.py rename to mathgenerator/funcs/surface_area_cube.py index 9f9d07f..f2f4a99 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surface_area_cube.py @@ -7,3 +7,8 @@ def surfaceAreaCube(maxSide=20, unit='m'): ans = 6 * a * a solution = f"{ans} {unit}^2" return problem, solution + + +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 67% rename from mathgenerator/funcs/surfaceAreaCuboid.py rename to mathgenerator/funcs/surface_area_cuboid.py index 95fee71..723217c 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surface_area_cuboid.py @@ -10,3 +10,9 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" return problem, solution + + +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 66% rename from mathgenerator/funcs/surfaceAreaCylinder.py rename to mathgenerator/funcs/surface_area_cylinder.py index eacc0be..bdbed93 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surface_area_cylinder.py @@ -9,3 +9,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 + + +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 62% rename from mathgenerator/funcs/surfaceAreaSphere.py rename to mathgenerator/funcs/surface_area_sphere.py index 6b9110d..bc5e91a 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surface_area_sphere.py @@ -8,3 +8,9 @@ def surfaceAreaSphere(maxSide=20, unit='m'): ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" return problem, solution + + +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 90% rename from mathgenerator/funcs/systemOfEquationsFunc.py rename to mathgenerator/funcs/system_of_equations.py index ef63c73..c35e549 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/system_of_equations.py @@ -45,3 +45,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 + + +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 60% rename from mathgenerator/funcs/thirdAngleOfTriangleFunc.py rename to mathgenerator/funcs/third_angle_of_triangle.py index 5268ceb..b41ff35 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/third_angle_of_triangle.py @@ -9,3 +9,8 @@ def thirdAngleOfTriangleFunc(maxAngle=89): problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution + + +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 76% rename from mathgenerator/funcs/isTriangleValidFunc.py rename to mathgenerator/funcs/valid_triangle.py index 13c7240..e8a5128 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/valid_triangle.py @@ -18,3 +18,8 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution solution = "No" return problem, solution + + +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 76% rename from mathgenerator/funcs/vectorCrossFunc.py rename to mathgenerator/funcs/vector_cross.py index 7506283..92b82a9 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vector_cross.py @@ -12,3 +12,7 @@ def vectorCrossFunc(minVal=-20, maxVal=20): problem = str(a) + " X " + str(b) + " = " solution = str(c) return problem, solution + + +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 74% rename from mathgenerator/funcs/vectorDotFunc.py rename to mathgenerator/funcs/vector_dot.py index 011beb3..608ce66 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vector_dot.py @@ -9,3 +9,7 @@ def vectorDotFunc(minVal=-20, maxVal=20): problem = str(a) + " . " + str(b) + " = " solution = str(c) return problem, solution + + +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 69% rename from mathgenerator/funcs/volumeCone.py rename to mathgenerator/funcs/volume_cone.py index c237bca..39a3a26 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volume_cone.py @@ -9,3 +9,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 + + +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 60% rename from mathgenerator/funcs/volumeCube.py rename to mathgenerator/funcs/volume_cube.py index 6a52da4..1de5984 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volume_cube.py @@ -8,3 +8,8 @@ def volumeCube(maxSide=20, unit='m'): ans = a * a * a solution = f"{ans} {unit}^3" return problem, solution + + +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 68% rename from mathgenerator/funcs/volumeCuboid.py rename to mathgenerator/funcs/volume_cuboid.py index b0a2490..a1eee6f 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volume_cuboid.py @@ -10,3 +10,9 @@ def volumeCuboid(maxSide=20, unit='m'): ans = a * b * c solution = f"{ans} {unit}^3" return problem, solution + + +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 67% rename from mathgenerator/funcs/volumeCylinder.py rename to mathgenerator/funcs/volume_cylinder.py index 38dfd64..28b89a1 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volume_cylinder.py @@ -9,3 +9,9 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" return problem, solution + + +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 58% rename from mathgenerator/funcs/volumeSphereFunc.py rename to mathgenerator/funcs/volume_sphere.py index 1f94c7f..b686bd4 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volume_sphere.py @@ -8,3 +8,8 @@ def volumeSphereFunc(maxRadius=100): ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution + + +volume_sphere = 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 3fb482c..2a969fa 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -1,274 +1,11 @@ -import random -import math -import fractions from .funcs import * 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, **kwargs): - return self.func(**kwargs) - # || Non-generator Functions def genById(id): generator = genList[id][2] 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) -celsiusToFahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) -quotientOfPowerSameBase = Generator("Quotient of Powers with Same Base", 82, - "6^4 / 6^2 = 6^(4-2) = 6^2", "36", quotientofpowersamebaseFunc) -quotientOfPowerSamePower = Generator("Quotient of Powers with Same Power", 83, - "6^4 / 3^4 = (6/3)^4 = 2^4", "16", quotientofpowersamepowerFunc) diff --git a/setup.py b/setup.py index 4bfbcd0..7b022b4 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,16 @@ from setuptools import setup, find_packages setup(name='mathgenerator', - version='1.1.3', + version='1.1.4', description='An open source solution for generating math problems', url='https://github.com/todarith/mathgenerator', author='Luke Weiler', author_email='lukew25073@gmail.com', license='MIT', packages=find_packages(), - install_requires=[], + install_requires=[ + 'sympy', + 'numpy', + 'scipy' + ], entry_points={}) diff --git a/test.py b/test.py index 1302ce5..2fa65b7 100644 --- a/test.py +++ b/test.py @@ -3,4 +3,11 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(79)) + +# prints each generator in genList +list = mathgen.getGenList() +for item in list: + print(item[2]) + +# print(mathgen.getGenList()) +print(mathgen.genById(85)) 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)