Merge pull request #1 from Todarith/master

fork update

.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:**

.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
 

.github/workflows/tests.yaml

@@ -4,20 +4,29 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install -U pip
-        python -m pip install -r dev-requirements.txt
+          python-version: "3.x"
+
+      - 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: make deps
+
       - name: Linter
         run: make lint
+
       - name: Test
         run: make test

Makefile

@@ -1,11 +1,15 @@
 IGNORE_ERRORS = E501,F401,F403,F405
 PKG = mathgenerator
+PYTHON ?= python3
+
+deps:
+	$(PYTHON) -m pip install --user -r dev-requirements.txt
 
 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)
+	$(PYTHON) -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG)
 
 test:
-	python -m pytest --verbose -s tests
+	$(PYTHON) -m pytest --verbose -s tests

README.md

@@ -31,76 +31,104 @@ 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 |
+| 0 | Addition | 20+38= | 58 | addition |
+| 1 | Subtraction | 2-0= | 2 | subtraction |
+| 2 | Multiplication | 31*1= | 31 | multiplication |
+| 3 | Division | 53/7= | 7.571428571428571 | division |
+| 4 | Binary Complement 1s | 111= | 000 | binary_complement_1s |
+| 5 | Modulo Division | 90%6= | 0 | modulo_division |
+| 6 | Square Root | sqrt(16)= | 4 | square_root |
+| 7 | Power Rule Differentiation | 7x^5 + 8x^10 + 4x^1 + 4x^5 + 7x^3 | 35x^4 + 80x^9 + 4x^0 + 20x^4 + 21x^2 | power_rule_differentiation |
+| 8 | Square | 9^2= | 81 | square |
+| 9 | LCM (Least Common Multiple) | LCM of 20 and 5 = | 20 | lcm |
+| 10 | GCD (Greatest Common Denominator) | GCD of 11 and 2 =  | 1 | gcd |
+| 11 | Basic Algebra | 10x + 4 = 8 | 2/5 | basic_algebra |
+| 12 | Logarithm | log3(2187) | 7 | log |
+| 13 | Easy Division | 247/19 =  | 13 | int_division |
+| 14 | Decimal to Binary | Binary of 13= | 1101 | decimal_to_binary |
+| 15 | Binary to Decimal | 001 | 1 | binary_to_decimal |
+| 16 | Fraction Division | (6/9)/(4/2) | 1/3 | divide_fractions |
+| 17 | Integer Multiplication with 2x2 Matrix | 11 * [[5, 2], [0, 8]] =  | [[55,22],[0,88]] | multiply_int_to_22_matrix |
+| 18 | Area of Triangle | Area of triangle with side lengths: 10 2 11 =  | 9.051933495115836 | area_of_triangle |
+| 19 | Triangle exists check | Does triangle with sides 35, 7 and 11 exist? | No | valid_triangle |
+| 20 | Midpoint of the two point | (12,-4),(-4,9)= | (4.0,2.5) | midpoint_of_two_points |
+| 21 | Factoring Quadratic | x^2-3x-28 | (x-7)(x+4) | factoring |
+| 22 | Third Angle of Triangle | Third angle of triangle with angles 50 and 19 =  | 111 | third_angle_of_triangle |
+| 23 | Solve a System of Equations in R^2 | -6x - 4y = -2, x + 10y = 47 | x = -3, y = 5 | system_of_equations |
+| 24 | Distance between 2 points | Find the distance between (16, 20) and (-9, 14) | sqrt(661) | distance_two_points |
+| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 7 and 3 =  | 7.62 | pythagorean_theorem |
+| 26 | Linear Equations | 14x + -10y = -26, 15x + -11y = -29 | x = 1, y = 4 | linear_equations |
+| 27 | Prime Factorisation | Find prime factors of 29 | [29] | prime_factors |
+| 28 | Fraction Multiplication | (3/7)*(10/3) | 10/7 | fraction_multiplication |
+| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 18 sides | 160.0 | angle_regular_polygon |
+| 30 | Combinations of Objects | Number of combinations from 12 objects picked 5 at a time  | 792 | 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 <table><tr><td>-50</td><td>36</td><td>7</td><td>-26</td><td>-2</td><td>63</td></tr><tr><td>88</td><td>-37</td><td>60</td><td>-19</td><td>61</td><td>-56</td></tr><tr><td>48</td><td>-5</td><td>69</td><td>-87</td><td>-64</td><td>-92</td></tr><tr><td>-84</td><td>-50</td><td>-79</td><td>-19</td><td>86</td><td>-13</td></tr><tr><td>0</td><td>28</td><td>12</td><td>-14</td><td>73</td><td>-49</td></tr><tr><td>94</td><td>-90</td><td>2</td><td>26</td><td>-38</td><td>19</td></tr><tr><td>2</td><td>-11</td><td>79</td><td>-77</td><td>98</td><td>-77</td></tr><tr><td>-87</td><td>70</td><td>72</td><td>-32</td><td>64</td><td>-99</td></tr></table> and <table><tr><td>34</td><td>32</td><td>-6</td><td>-32</td><td>46</td><td>-23</td><td>78</td><td>-81</td><td>-18</td></tr><tr><td>-17</td><td>24</td><td>49</td><td>-62</td><td>-50</td><td>77</td><td>38</td><td>-98</td><td>-64</td></tr><tr><td>-23</td><td>-78</td><td>43</td><td> 5</td><td>-83</td><td>-5</td><td> 4</td><td>-92</td><td>-16</td></tr><tr><td> 46</td><td>-47</td><td>-92</td><td>52</td><td>-25</td><td>-37</td><td>44</td><td>51</td><td>-7</td></tr><tr><td> 20</td><td>26</td><td>70</td><td>37</td><td>96</td><td>-73</td><td>49</td><td>84</td><td>42</td></tr><tr><td>-72</td><td>-15</td><td>-80</td><td>-24</td><td>58</td><td>-47</td><td>-41</td><td>45</td><td>-69</td></tr></table>|  <table><tr><td>-8245</td><td>-1057</td><td>-423</td><td>-3535</td><td>-569</td><td>2034</td><td>-6329</td><td>1219</td><td>-5765</td></tr><tr><td>6619</td><td> 567</td><td>10737</td><td>2391</td><td>4001</td><td>-6291</td><td>10147</td><td>-7387</td><td>6383</td></tr><tr><td>1472</td><td>-161</td><td>13318</td><td>-5565<td>-12574</td><td>10381</td><td> 638<td>-23699</td><td>2621</td></tr><tr><td>1593</td><td>5598</td><td>3465</td><td>7899</td><td>13170</td><td>-6487</td><td>-4857</td><td>24642</td><td>10618</td></tr><tr><td>3592</td><td>3027</td><td>12206</td><td>1473</td><td>2120</td><td>-412</td><td>6082</td><td>-635</td><td>4561</td></tr><tr><td>3748</td><td>-1803<td>-11460</td><td>2072</td><td>5462</td><td>-8183</td><td>2423</td><td>11</td><td> 947</td></tr><tr><td>2400</td><td> 960</td><td>22950</td><td>2483</td><td> 952</td><td>-1974</td><td>4625</td><td>-5512</td><td>9372</td></tr><tr><td>1132</td><td>-2067</td><td>22392</td><td>1884<td>-12276</td><td>8196</td><td>1949</td><td>-7148</td><td>5677</td></tr></table>   | 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 |
+| 32 | Surface Area of Cube | Surface area of cube with side = 9m is | 486 m^2 | surface_area_cube |
+| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 19m, 9m, 6m is | 678 m^2 | surface_area_cuboid |
+| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 39m and radius = 6m is | 1696 m^2 | surface_area_cylinder |
+| 35 | Volum of Cube | Volume of cube with side = 14m is | 2744 m^3 | volume_cube |
+| 36 | Volume of Cuboid | Volume of cuboid with sides = 4m, 19m, 20m is | 1520 m^3 | volume_cuboid |
+| 37 | Volume of cylinder | Volume of cylinder with height = 27m and radius = 4m is | 1357 m^3 | volume_cylinder |
+| 38 | Surface Area of cone | Surface area of cone with height = 47m and radius = 15m is | 3031 m^2 | surface_area_cone |
+| 39 | Volume of cone | Volume of cone with height = 46m and radius = 1m is | 48 m^3 | volume_cone |
+| 40 | Common Factors | Common Factors of 5 and 89 =  | [1] | common_factors |
+| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -10x - 3 and y = -10/5x - 4 | (1/8, -17/4) | intersection_of_two_lines |
+| 42 | Permutations | Number of Permutations from 17 objects picked 6 at a time =   | 8910720 | permutation |
+| 43 | Cross Product of 2 Vectors | [14, -7, -18] X [3, -16, 12] =  | [-372, -222, -203] | vector_cross |
+| 44 | Compare Fractions | Which symbol represents the comparison between 6/7 and 2/1? | < | compare_fractions |
+| 45 | Simple Interest | Simple interest for a principle amount of 1752 dollars, 10% rate of interest and for a time period of 5 years is =  | 876.0 | simple_interest |
+| 46 | Multiplication of two matrices | Multiply<table><tr><td>-2</td><td>7</td><td>-10</td></tr><tr><td>0</td><td>-4</td><td>-9</td></tr><tr><td>2</td><td>10</td><td>10</td></tr></table>and<table><tr><td>6</td><td>-6</td></tr><tr><td>-5</td><td>3</td></tr><tr><td>6</td><td>10</td></tr></table> | <table><tr><td>-107</td><td>-67</td></tr><tr><td>-34</td><td>-102</td></tr><tr><td>22</td><td>118</td></tr></table> | matrix_multiplication |
+| 47 | Cube Root | cuberoot of 212 upto 2 decimal places is: | 5.96 | cube_root |
+| 48 | Power Rule Integration | 4x^4 | (4/4)x^5 + c | power_rule_integration |
+| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 81 , 131, 8 = | 140 | fourth_angle_of_quadrilateral |
+| 50 | Quadratic Equation | Zeros of the Quadratic Equation 66x^2+177x+45=0 | [-0.28, -2.4] | quadratic_equation |
+| 51 | HCF (Highest Common Factor) | HCF of 8 and 10 =  | 2 | 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 7 = | 6/36 | dice_sum_probability |
+| 53 | Exponentiation | 16^3 = | 4096 | exponentiation |
+| 54 | Confidence interval For sample S | The confidence interval for sample [240, 211, 206, 296, 223, 220, 264, 251, 245, 248, 207, 215, 277, 274, 297, 243, 278, 292, 256, 233, 266, 236, 270, 227, 209, 258, 298] with 99% confidence is | (263.9293815733304, 235.32987768592884) | confidence_interval |
+| 55 | Comparing surds | Fill in the blanks 63^(1/2) _ 37^(1/4) | > | surds_comparison |
+| 56 | Fibonacci Series | The Fibonacci Series of the first 12 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89] | fibonacci_series |
+| 57 | Trigonometric Values | What is sin(0)? | 0 | basic_trigonometry |
+| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 7 sides =  | 900 | sum_of_polygon_angles |
+| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[30, 21, 26, 36, 34, 7, 46, 21, 15, 29, 9, 33, 16, 28, 43] | The Mean is 26.266666666666666 , Standard Deviation is 123.39555555555556, Variance is 11.108355213781902 | data_summary |
+| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 6m is | 452.3893421169302 m^2 | surface_area_sphere |
+| 61 | Volume of Sphere | Volume of sphere with radius 10 m =  | 4188.790204786391 m^3 | volume_sphere |
+| 62 | nth Fibonacci number | What is the 41th Fibonacci number? | 165580141 | nth_fibonacci_number |
+| 63 | Profit or Loss Percent | Profit percent when CP = 411 and SP = 499 is:  | 21.41119221411192 | profit_loss_percent |
+| 64 | Binary to Hexidecimal | 00010 | 0x2 | binary_to_hex |
+| 65 | Multiplication of 2 complex numbers | (-2-6j) * (-10+2j) =  | (32+56j) | multiply_complex_numbers |
+| 66 | Geometric Progression | For the given GP [7, 77, 847, 9317, 102487, 1127357] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 7, common ratio is 11 , 8th term is 136410197 , sum upto 7th term is 13641019.0 | geometric_progression |
+| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 76 , 98 , 2 , 58 =  | (76*98*2*58)^(1/4) = 30.487682589384825 | geometric_mean |
+| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 77 , 98 and 69 =  |  3/((1/77) + (1/98) + (1/69)) = 79.60970388869067 | harmonic_mean |
+| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[229.4364953887822, 570.6032154600009, 199.52328312454694, 658.3975413255898, 605.9566521345233, 616.6627240713517, 572.9546490919761, 508.8683987353998, 666.172347641998, 865.2735159823208, 594.8620516188639, 418.8436115273115, 69.46437421671337, 385.84806581739593] is: | 2015.3622923166513 | euclidian_norm |
+| 70 | Angle between 2 vectors | angle between the vectors [954.08, 488.66, 694.46, 127.67, 912.65, 462.11, 713.4, 179.41, 728.87, 811.04, 760.22, 688.68, 444.93, 237.29, 485.89, 565.71, 520.56, 44.1, 684.62, 665.12] and [736.88, 60.8, 240.61, 677.58, 887.06, 73.3, 470.5, 884.06, 453.97, 168.97, 921.73, 538.36, 967.82, 236.94, 51.62, 402.46, 57.88, 166.91, 676.47, 708.47] is: | 0.63 radians | angle_btw_vectors |
+| 71 | Absolute difference between two numbers | Absolute difference between numbers -87 and 69 =  | 156 | absolute_difference |
+| 72 | Dot Product of 2 Vectors | [14, -1, 7] . [-12, 15, -9] =  | -246 | vector_dot |
+| 73 | Binary 2's Complement | 2's complement of 11010 = | 110 | binary_2s_complement |
+| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[17, 31, 76], [3, 65, 91], [42, 2, 28]]) is: | Matrix([[-273/10550, 179/15825, 2119/63300], [-623/10550, 679/15825, 1319/63300], [227/5275, -317/15825, -253/15825]]) | invert_matrix |
+| 75 | Area of a Sector | Given radius, 4 and angle, 2. Find the area of the sector. | Area of sector = 0.27925 | sector_area |
+| 76 | Mean and Median | Given the series of numbers [87, 97, 75, 27, 91, 31, 15, 40, 73, 74]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 61.0 and Arithmetic median of this series is 73.5 | mean_median |
+| 77 | Determinant to 2x2 Matrix | Det([[83, 41], [15, 13]]) =  |  464 | int_matrix_22_determinant |
+| 78 | Compound Interest | Compound interest for a principle amount of 2702 dollars, 7% rate of interest and for a time period of 2 year is =  | 3093.52 | compound_interest |
+| 79 | Decimal to Hexadecimal | Binary of 386= | 0x182 | decimal_to_hexadeci |
+| 80 | Percentage of a number | What is 64% of 8? | Required percentage = 5.12% | percentage |
+| 81 | Celsius To Fahrenheit | Convert 50 degrees Celsius to degrees Fahrenheit = | 122.0 | celsius_to_fahrenheit |
+| 82 | AP Term Calculation | Find the term number 89 of the AP series: -35, -98, -161 ...  | -5579 | arithmetic_progression_term |
+| 83 | AP Sum Calculation | Find the sum of first 63 terms of the AP series: 7, 100, 193 ...  | 182070.0 | arithmetic_progression_sum |
+| 84 | Converts decimal to octal | The decimal number 265 in Octal is:  | 0o411 | decimal_to_octal |
+| 85 | Converts decimal to Roman Numerals | The number 1439 in Roman Numerals is:  | MCDXXXIX | decimal_to_roman_numerals |
+| 86 | Degrees to Radians | Angle 68 in radians is =  | 1.19 | degree_to_rad |
+| 87 | Radians to Degrees | Angle 3 in degrees is =  | 171.89 | radian_to_deg |
+| 88 | Differentiation | differentiate w.r.t x : d(ln(x)+2*x^3)/dx | 6*x^2 + 1/x | differentiation |
+| 89 | Definite Integral of Quadratic Equation | The definite integral within limits 0 to 1 of the equation 74x^2 + 55x + 86 is =  | 138.1667 | definite_integral |
+| 90 | isprime | 32 | False | is_prime |
+| 91 | Binary Coded Decimal to Integer | Integer of Binary Coded Decimal 1 is =  | 5461 | bcd_to_decimal |
+| 92 | Complex To Polar Form | rexp(itheta) =  | 27.59exp(i-2.38) | complex_to_polar |
+| 93 | Union,Intersection,Difference of Two Sets | Given the two sets a={1, 2, 3, 5, 6, 8} ,b={1, 10, 2, 9}.Find the Union,intersection,a-b,b-a and symmetric difference | Union is {1, 2, 3, 5, 6, 8, 9, 10},Intersection is {1, 2}, a-b is {8, 3, 5, 6},b-a is {9, 10}, Symmetric difference is {3, 5, 6, 8, 9, 10} | set_operation |
+| 94 | Base Conversion | Convert 131222 from base 6 to base 2. | 10111010111110 | base_conversion |
+| 95 | Curved surface area of a cylinder | What is the curved surface area of a cylinder of radius, 27 and height, 94? | CSA of cylinder = 15946.72 | curved_surface_area_cylinder |
+| 96 | Perimeter of Polygons | The perimeter of a 9 sided polygon with lengths of [48, 30, 110, 95, 10, 33, 87, 70, 78]cm is:  | 561 | perimeter_of_polygons |
+| 97 | Power of Powers | The 24^1^3 = 24^(1*3) = 24^3 | 13824 | power_of_powers |
+| 98 | Quotient of Powers with Same Base | The Quotient of 41^2 and 41^3 = 41^(2-3) = 41^-1 | 0.024390243902439025 | quotient_of_power_same_base |
+| 99 | Quotient of Powers with Same Power | The Quotient of 30^5 and 35^5 = (30/35)^5 = 0.8571428571428571^5 | 0.46266436603796024 | quotient_of_power_same_power |
+| 100 | complex Quadratic Equation | Find the roots of given Quadratic Equation 5x^2 + 8x + 2 = 0 | simplified solution : ((-0.31, -1.29)), generalized solution : ((-8 + sqrt(24))/2*5, (-8 - sqrt(24))/2*5) | complex_quadratic |

dev-requirements.txt

@@ -3,3 +3,5 @@ hypothesis
 flake8
 autopep8
 sympy
+numpy
+scipy

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("[[", "<table><tr><td>")
+    string = string.replace("[", "<tr><td>")
+    string = string.replace(", ", "</td><td>")
+    string = string.replace("]]", "</td></tr></table>")
+    string = string.replace("]", "</td></tr>")
+    string = string.replace(" ", "")
+    string = string.replace("\n", "")
+    return string
+
+
 wList = getGenList()
 lines = []
 with open('mathgenerator/mathgen.py', 'r') as f:
     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("[[", "<table><tr><td>")
-        prob = prob.replace("[", "<tr><td>")
-        prob = prob.replace(", ", "</td><td>")
-        prob = prob.replace("]]\n", "</td></tr></table>")
-        prob = prob.replace("]\n", "</td></tr>")
-        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:

mathgenerator/__init__.py

@@ -1,3 +1,5 @@
+import sys
+import traceback
 genList = []
 
 
@@ -8,16 +10,23 @@ 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

mathgenerator/funcs/__init__.py

@@ -2,85 +2,106 @@ 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 *
+from .bcd_to_decimal import *
+from .complex_to_polar import *
+from .set_operation import *
+from .base_conversion import *
+from .curved_surface_area_cylinder import *
+from .perimeter_of_polygons import *
+from .power_of_powers import *
+from .quotient_of_power_same_base import *
+from .quotient_of_power_same_power import *
+from .complex_quadratic import *

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)

mathgenerator/funcs/addition.py

@@ -1,5 +1,4 @@
 from .__init__ import *
-from ..__init__ import Generator
 
 
 def additionFunc(maxSum=99, maxAddend=50):

mathgenerator/funcs/angleBtwVectorsFunc.py

@@ -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

mathgenerator/funcs/angle_btw_vectors.py

@@ -0,0 +1,31 @@
+from .__init__ import *
+import math
+
+
+def angleBtwVectorsFunc(maxEltAmt=20):
+    s = 0
+    v1 = [
+        round(random.uniform(0, 1000), 2)
+        for i in range(random.randint(2, maxEltAmt))
+    ]
+    v2 = [round(random.uniform(0, 1000), 2) for i in v1]
+    for i in range(len(v1)):
+        s += v1[i] * v2[i]
+
+    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(round(math.acos(s / mags), 2)) + " radians"
+    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)

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)

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)

mathgenerator/funcs/arithmetic_progression_sum.py

@@ -0,0 +1,20 @@
+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)

mathgenerator/funcs/arithmetic_progression_term.py

@@ -0,0 +1,20 @@
+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)

mathgenerator/funcs/base_conversion.py

@@ -0,0 +1,58 @@
+from .__init__ import *
+
+# base from 2 to 36
+alpha = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+
+def fromBaseTenTo(n, toBase):
+    assert type(
+        toBase
+    ) == int and toBase >= 2 and toBase <= 36, "toBase({}) must be >=2 and <=36"
+    # trivial cases
+    if toBase == 2:
+        return bin(n)[2:]
+    elif toBase == 8:
+        return oct(n)[2:]
+    elif toBase == 10:
+        return str(n)
+    elif toBase == 16:
+        return hex(n)[2:].upper()
+    res = alpha[n % toBase]
+    n = n // toBase
+    while n > 0:
+        res = alpha[n % toBase] + res
+        n = n // toBase
+    return res
+
+
+# Useful to check answers, but not needed here
+# def toBaseTen(n,fromBase):
+#     return int(n,fromBase)
+
+
+def baseConversionFunc(maxNum=60000, maxBase=16):
+    assert type(
+        maxNum
+    ) == int and maxNum >= 100 and maxNum <= 65536, "maxNum({}) must be >=100 and <=65536".format(
+        maxNum)
+    assert type(
+        maxBase
+    ) == int and maxBase >= 2 and maxBase <= 36, "maxBase({}) must be >= 2 and <=36".format(
+        maxBase)
+
+    n = random.randint(40, maxNum)
+    dist = [10] * 10 + [2] * 5 + [16] * 5 + [i for i in range(2, maxBase + 1)]
+    # set this way since converting to/from bases 2,10,16 are more common -- can be changed if needed.
+    bases = random.choices(dist, k=2)
+    while bases[0] == bases[1]:
+        bases = random.choices(dist, k=2)
+
+    problem = "Convert {} from base {} to base {}.".format(
+        fromBaseTenTo(n, bases[0]), bases[0], bases[1])
+    ans = fromBaseTenTo(n, bases[1])
+    return problem, ans
+
+
+base_conversion = Generator("Base Conversion", 94,
+                            "Convert 152346 from base 8 to base 10.", "54502",
+                            baseConversionFunc)

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)

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)

mathgenerator/funcs/bcd_to_decimal.py

@@ -0,0 +1,25 @@
+from .__init__ import *
+
+
+def BCDtoDecimalFunc(maxNumber=10000):
+    n = random.randint(1000, maxNumber)
+    binstring = ''
+    while True:
+        q, r = divmod(n, 10)
+        nibble = bin(r).replace('0b', "")
+        while len(nibble) < 4:
+            nibble = '0' + nibble
+        binstring = nibble + binstring
+        if q == 0:
+            break
+        else:
+            n = q
+
+    problem = "Integer of Binary Coded Decimal " + str(n) + " is = "
+    solution = int(binstring, 2)
+    return problem, solution
+
+
+bcd_to_decimal = Generator("Binary Coded Decimal to Integer", 91,
+                           "Integer of Binary Coded Decimal b is ", "n",
+                           BCDtoDecimalFunc)

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)

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)

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)

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)

mathgenerator/funcs/celsius_to_fahrenheit.py

@@ -0,0 +1,15 @@
+from .__init__ import *
+
+
+def celsiustofahrenheitFunc(maxTemp=100):
+    celsius = random.randint(-50, maxTemp)
+    fahrenheit = (celsius * (9 / 5)) + 32
+    problem = "Convert " + str(
+        celsius) + " degrees Celsius to degrees Fahrenheit ="
+    solution = str(fahrenheit)
+    return problem, solution
+
+
+celsius_to_fahrenheit = Generator("Celsius To Fahrenheit", 81,
+                                  "(C +(9/5))+32=", "F",
+                                  celsiustofahrenheitFunc)

mathgenerator/funcs/celsiustofahrenheit.py

@@ -1,14 +0,0 @@
-from .__init__ import *
-from ..__init__ import Generator
-
-
-def celsiustofahrenheitFunc(maxTemp=100):
-    celsius = random.randint(-50, maxTemp)
-    fahrenheit = (celsius * (9 / 5)) + 32
-    problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit ="
-    solution = str(fahrenheit)
-    return problem, solution
-
-
-celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81,
-                                "(C +(9/5))+32=", "F", celsiustofahrenheitFunc)

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)

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)

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?", ">/</=",
+    compareFractionsFunc)

mathgenerator/funcs/complex_quadratic.py

@@ -0,0 +1,75 @@
+from .__init__ import *
+
+
+def complexQuadraticFunc(prob_type=0, max_range=10):
+    if prob_type < 0 or prob_type > 1:
+        print("prob_type not supported")
+        print("prob_type = 0 for real roots problems ")
+        print("prob_tpye = 1 for imaginary roots problems")
+        return None
+    if prob_type == 0:
+        d = -1
+        while d < 0:
+            a = random.randrange(1, max_range)
+            b = random.randrange(1, max_range)
+            c = random.randrange(1, max_range)
+
+            d = (b**2 - 4 * a * c)
+    else:
+        d = 0
+        while d >= 0:
+            a = random.randrange(1, max_range)
+            b = random.randrange(1, max_range)
+            c = random.randrange(1, max_range)
+
+            d = (b**2 - 4 * a * c)
+
+    eq = ''
+
+    if a == 1:
+        eq += 'x^2 + '
+    else:
+        eq += str(a) + 'x^2 + '
+
+    if b == 1:
+        eq += 'x + '
+    else:
+        eq += str(b) + 'x + '
+
+    eq += str(c) + ' = 0'
+
+    problem = 'Find the roots of given Quadratic Equation ' + eq
+
+    if d < 0:
+        sqrt_d = (-d)**0.5
+
+        if sqrt_d - int(sqrt_d) == 0:
+            sqrt_d = int(sqrt_d)
+            solution = f'(({-b} + {sqrt_d}i)/2*{a}, ({-b} - {sqrt_d}i)/2*{a})'
+        else:
+            solution = f'(({-b} + sqrt({-d})i)/2*{a}, ({-b} - sqrt({-d})i)/2*{a})'
+
+        return problem, solution
+
+    else:
+        s_root1 = round((-b + (d)**0.5) / (2 * a), 3)
+        s_root2 = round((-b - (d)**0.5) / (2 * a), 3)
+
+        sqrt_d = (d)**0.5
+
+        if sqrt_d - int(sqrt_d) == 0:
+            sqrt_d = int(sqrt_d)
+            g_sol = f'(({-b} + {sqrt_d})/2*{a}, ({-b} - {sqrt_d})/2*{a})'
+        else:
+            g_sol = f'(({-b} + sqrt({d}))/2*{a}, ({-b} - sqrt({d}))/2*{a})'
+
+        solution = f'simplified solution : ({s_root1, s_root2}), generalized solution : ' + g_sol
+
+        return problem, solution
+
+
+complex_quadratic = Generator(
+    "complex Quadratic Equation", 100,
+    "Find the roots of given Quadratic Equation ",
+    "simplified solution : (x1, x2), generalized solution : ((-b + sqrt(d))/2a, (-b - sqrt(d))/2a) or ((-b + sqrt(d)i)/2a, (-b - sqrt(d)i)/2a)",
+    complexQuadraticFunc)

mathgenerator/funcs/complex_to_polar.py

@@ -0,0 +1,18 @@
+from .__init__ import *
+
+
+def complexToPolarFunc(minRealImaginaryNum=-20, maxRealImaginaryNum=20):
+    num = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum),
+                  random.randint(minRealImaginaryNum, maxRealImaginaryNum))
+    a = num.real
+    b = num.imag
+    r = round(math.hypot(a, b), 2)
+    theta = round(math.atan2(b, a), 2)
+    plr = str(r) + "exp(i" + str(theta) + ")"
+    problem = "rexp(itheta) = "
+    solution = plr
+    return problem, solution
+
+
+complex_to_polar = Generator("Complex To Polar Form", 92, "rexp(itheta) = ",
+                             "plr", complexToPolarFunc)

mathgenerator/funcs/compoundInterestFunc.py

@@ -1,18 +0,0 @@
-from .__init__ import *
-
-
-def compoundInterestFunc(maxPrinciple=10000,
-                         maxRate=10,
-                         maxTime=10,
-                         maxPeriod=10):
-    p = random.randint(100, maxPrinciple)
-    r = random.randint(1, maxRate)
-    t = random.randint(1, maxTime)
-    n = random.randint(1, maxPeriod)
-    A = p * ((1 + (r / (100 * n))**(n * t)))
-    problem = "Compound Interest for a principle amount of " + str(
-        p) + " dollars, " + str(
-            r) + "% rate of interest and for a time period of " + str(
-                t) + " compounded monthly is = "
-    solution = round(A, 2)
-    return problem, solution

mathgenerator/funcs/compound_interest.py

@@ -0,0 +1,19 @@
+from .__init__ import *
+
+
+def compoundInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10):
+    p = random.randint(1000, maxPrinciple)
+    r = random.randint(1, maxRate)
+    n = random.randint(1, maxTime)
+    a = p * (1 + r / 100)**n
+    problem = "Compound interest for a principle amount of " + \
+        str(p) + " dollars, " + str(r) + \
+        "% rate of interest and for a time period of " + str(n) + " year is = "
+    solution = round(a, 2)
+    return problem, solution
+
+
+compound_interest = Generator(
+    "Compound Interest", 78,
+    "Compound interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ",
+    "d dollars", compoundInterestFunc)

mathgenerator/funcs/confidence_interval.py

@@ -29,3 +29,8 @@ def confidenceIntervalFunc():
         [x for x in lst], lst_per[j])
     solution = '({}, {})'.format(mean + standard_error, mean - standard_error)
     return problem, solution
+
+
+confidence_interval = Generator("Confidence interval For sample S", 54,
+                                "With X% confidence", "is (A,B)",
+                                confidenceIntervalFunc)

mathgenerator/funcs/cube_root.py

@@ -8,3 +8,8 @@ def cubeRootFunc(minNo=1, maxNo=1000):
     problem = "cuberoot of " + str(b) + " upto 2 decimal places is:"
     solution = str(round(a, 2))
     return problem, solution
+
+
+cube_root = Generator("Cube Root", 47,
+                      "Cuberoot of a upto 2 decimal places is", "b",
+                      cubeRootFunc)

mathgenerator/funcs/curved_surface_area_cylinder.py

@@ -0,0 +1,17 @@
+from .__init__ import *
+
+
+def curvedSurfaceAreaCylinderFunc(maxRadius=49, maxHeight=99):
+    r = random.randint(1, maxRadius)
+    h = random.randint(1, maxHeight)
+    problem = f"What is the curved surface area of a cylinder of radius, {r} and height, {h}?"
+    csa = float(2 * math.pi * r * h)
+    formatted_float = round(csa, 2)  # "{:.5f}".format(csa)
+    solution = f"CSA of cylinder = {formatted_float}"
+    return problem, solution
+
+
+curved_surface_area_cylinder = Generator(
+    "Curved surface area of a cylinder", 95,
+    "What is CSA of a cylinder of radius, r and height, h?", "csa of cylinder",
+    curvedSurfaceAreaCylinderFunc)

mathgenerator/funcs/data_summary.py

@@ -15,14 +15,15 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50):
     for i in range(number_values):
         var += (random_list[i] - mean)**2
 
-    # we're printing stuff here?
-    print(random_list)
-    print(mean)
-    print(var / number_values)
-    print((var / number_values)**0.5)
+    standardDeviation = var / number_values
+    variance = (var / number_values)**0.5
 
     problem = "Find the mean,standard deviation and variance for the data" + \
         str(random_list)
     solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format(
-        mean, var / number_values, (var / number_values)**0.5)
+        mean, standardDeviation, variance)
     return problem, solution
+
+
+data_summary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c",
+                         "Mean:a+b+c/3,Std,Var", dataSummaryFunc)

mathgenerator/funcs/decimal_to_binary.py

@@ -9,3 +9,7 @@ def DecimalToBinaryFunc(max_dec=99):
     solution = str(b)
 
     return problem, solution
+
+
+decimal_to_binary = Generator("Decimal to Binary", 14, "Binary of a=", "b",
+                              DecimalToBinaryFunc)

mathgenerator/funcs/decimal_to_hexadeci.py

@@ -8,3 +8,7 @@ def deciToHexaFunc(max_dec=1000):
     solution = str(b)
 
     return problem, solution
+
+
+decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=",
+                                "b", deciToHexaFunc)

mathgenerator/funcs/decimal_to_octal.py

@@ -0,0 +1,13 @@
+from .__init__ import *
+
+
+def decimalToOctalFunc(maxDecimal=4096):
+    x = random.randint(0, maxDecimal)
+    problem = "The decimal number " + str(x) + " in Octal is: "
+    solution = oct(x)
+    return problem, solution
+
+
+decimal_to_octal = Generator("Converts decimal to octal", 84,
+                             "What's the octal representation of 98?", "0o142",
+                             decimalToOctalFunc)

mathgenerator/funcs/decimal_to_roman_numerals.py

@@ -0,0 +1,38 @@
+from .__init__ import *
+
+
+def decimalToRomanNumeralsFunc(maxDecimal=4000):
+    x = random.randint(0, maxDecimal)
+    problem = "The number " + str(x) + " in Roman Numerals is: "
+    roman_dict = {
+        1: "I",
+        5: "V",
+        10: "X",
+        50: "L",
+        100: "C",
+        500: "D",
+        1000: "M"
+    }
+    divisor = 1
+    while x >= 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)

mathgenerator/funcs/definite_integral.py

@@ -0,0 +1,28 @@
+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)

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)

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)

mathgenerator/funcs/differentiation.py

@@ -0,0 +1,54 @@
+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)

mathgenerator/funcs/distance_two_points.py

@@ -12,3 +12,9 @@ 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)

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)

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)

mathgenerator/funcs/euclidianNormFunc.py

@@ -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

mathgenerator/funcs/euclidian_norm.py

@@ -0,0 +1,16 @@
+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)

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)

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)

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)

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)

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)

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)

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)

mathgenerator/funcs/geometric_mean.py

@@ -25,3 +25,9 @@ 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)

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)

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)

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)

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)

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)

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)

mathgenerator/funcs/invert_matrix.py

@@ -76,3 +76,8 @@ 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)

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)

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)

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)

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)

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)

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)

mathgenerator/funcs/midpoint_of_two_points.py

@@ -10,3 +10,9 @@ 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)

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)

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)

mathgenerator/funcs/multiplicationFunc.py

@@ -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

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)

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)

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)

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)

mathgenerator/funcs/perimeter_of_polygons.py

@@ -0,0 +1,20 @@
+from .__init__ import *
+
+
+def perimeterOfPolygons(maxSides=12, maxLength=120):
+    size_of_sides = random.randint(3, maxSides)
+    sides = []
+    for x in range(size_of_sides):
+        sides.append(random.randint(1, maxLength))
+    problem = "The perimeter of a " + str(size_of_sides) + \
+        " sided polygon with lengths of " + str(sides) + "cm is: "
+    solution = 0
+    for y in range(len(sides)):
+        solution += sides[y]
+    return problem, solution
+
+
+perimeter_of_polygons = Generator(
+    "Perimeter of Polygons", 96,
+    "The perimeter of a x sided polygon with lengths of y cm is: ", "z",
+    perimeterOfPolygons)

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)

mathgenerator/funcs/power_of_powers.py

@@ -0,0 +1,20 @@
+from .__init__ import *
+
+
+def powerOfPowersFunc(maxBase=50, maxPower=10):
+    base = random.randint(1, maxBase)
+    power1 = random.randint(1, maxPower)
+    power2 = random.randint(1, maxPower)
+    step = power1 * power2
+
+    problem = "The {base}^{power1}^{power2} = " \
+              "{base}^({power1}*{power2}) = {base}^{step}".format(base=base,
+                                                                  power1=power1,
+                                                                  power2=power2,
+                                                                  step=step)
+    solution = str(base**step)
+    return problem, solution
+
+
+power_of_powers = Generator("Power of Powers", 97, "6^4^2 = 6^(4*2) = 6^6",
+                            "46656", powerOfPowersFunc)

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)

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)

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)

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)

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)

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)

mathgenerator/funcs/quotient_of_power_same_base.py

@@ -0,0 +1,21 @@
+from .__init__ import *
+
+
+def quotientOfPowerSameBaseFunc(maxBase=50, maxPower=10):
+    base = random.randint(1, maxBase)
+    power1 = random.randint(1, maxPower)
+    power2 = random.randint(1, maxPower)
+    step = power1 - power2
+
+    problem = "The Quotient of {base}^{power1} and {base}^{power2} = " \
+              "{base}^({power1}-{power2}) = {base}^{step}".format(base=base,
+                                                                  power1=power1,
+                                                                  power2=power2,
+                                                                  step=step)
+    solution = str(base**step)
+    return problem, solution
+
+
+quotient_of_power_same_base = Generator("Quotient of Powers with Same Base",
+                                        98, "6^4 / 6^2 = 6^(4-2) = 6^2", "36",
+                                        quotientOfPowerSameBaseFunc)

mathgenerator/funcs/quotient_of_power_same_power.py

@@ -0,0 +1,21 @@
+from .__init__ import *
+
+
+def quotientOfPowerSamePowerFunc(maxBase=50, maxPower=10):
+    base1 = random.randint(1, maxBase)
+    base2 = random.randint(1, maxBase)
+    power = random.randint(1, maxPower)
+    step = base1 / base2
+
+    problem = "The Quotient of {base1}^{power} and {base2}^{power} = " \
+              "({base1}/{base2})^{power} = {step}^{power}".format(base1=base1,
+                                                                  base2=base2,
+                                                                  power=power,
+                                                                  step=step)
+    solution = str(step**power)
+    return problem, solution
+
+
+quotient_of_power_same_power = Generator("Quotient of Powers with Same Power",
+                                         99, "6^4 / 3^4 = (6/3)^4 = 2^4", "16",
+                                         quotientOfPowerSamePowerFunc)

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)

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)

mathgenerator/funcs/set_operation.py

@@ -0,0 +1,27 @@
+from .__init__ import *
+
+
+def set_operation(minval=3, maxval=7, n_a=4, n_b=5):
+    number_variables_a = random.randint(minval, maxval)
+    number_variables_b = random.randint(minval, maxval)
+    a = []
+    b = []
+    for i in range(number_variables_a):
+        a.append(random.randint(1, 10))
+    for i in range(number_variables_b):
+        b.append(random.randint(1, 10))
+    a = set(a)
+    b = set(b)
+    problem = "Given the two sets a=" + \
+        str(a) + " ,b=" + str(b) + ".Find the Union,intersection,a-b,b-a and symmetric difference"
+    solution = "Union is " + str(a.union(b)) + ",Intersection is " + str(
+        a.intersection(b)) + ", a-b is " + str(
+            a.difference(b)) + ",b-a is " + str(
+                b.difference(a)) + ", Symmetric difference is " + str(
+                    a.symmetric_difference(b))
+    return problem, solution
+
+
+set_operation = Generator("Union,Intersection,Difference of Two Sets", 93,
+                          "Union,intersection,difference", "aUb,a^b,a-b,b-a,",
+                          set_operation)

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)

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)

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)

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)

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)

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)