renamed main generator funcs to gen_func

README.md

@@ -68,134 +68,134 @@ This creates the pdf `ws.pdf` in your current directory
 ## algebra
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 11 | [Basic Algebra](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/basic_algebra.py) | 4x + 8 = 10 | 1/2 | basic_algebra | `maxVariable=10`  |
+| 11 | [Basic Algebra](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/basic_algebra.py) | 10x + 7 = 9 | 1/5 | basic_algebra | `maxVariable=10`  |
-| 12 | [Logarithm](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/log.py) | log2(8) | 3 | log | `maxBase=3` `maxVal=8`  |
+| 12 | [Logarithm](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/log.py) | log2(32) | 5 | log | `maxBase=3` `maxVal=8`  |
-| 17 | [Integer Multiplication with 2x2 Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py) | 6 * [[3, 3], [7, 2]] =  | [[18,18],[42,12]] | multiply_int_to_22_matrix | `maxMatrixVal=10` `maxRes=100`  |
+| 17 | [Integer Multiplication with 2x2 Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py) | 2 * [[1, 5], [6, 8]] =  | [[2,10],[12,16]] | multiply_int_to_22_matrix | `maxMatrixVal=10` `maxRes=100`  |
-| 20 | [Midpoint of the two point](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/midpoint_of_two_points.py) | (-10,11),(-4,-12)= | (-7.0,-0.5) | midpoint_of_two_points | `maxValue=20`  |
+| 20 | [Midpoint of the two point](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/midpoint_of_two_points.py) | (-13,-16),(-11,7)= | (-12.0,-4.5) | midpoint_of_two_points | `maxValue=20`  |
-| 21 | [Factoring Quadratic](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/factoring.py) | x^2+4x-21 | (x+7)(x-3) | factoring | `range_x1=10` `range_x2=10`  |
+| 21 | [Factoring Quadratic](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/factoring.py) | x^2+10x+21 | (x+7)(x+3) | factoring | `range_x1=10` `range_x2=10`  |
-| 23 | [Solve a System of Equations in R^2](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/system_of_equations.py) | -x + 8y = -35, -4x + 5y = -32 | x = 3, y = -4 | system_of_equations | `range_x=10` `range_y=10` `coeff_mult_range=10`  |
+| 23 | [Solve a System of Equations in R^2](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/system_of_equations.py) | 10x + 9y = 25, 8x + 7y = 21 | x = 7, y = -5 | system_of_equations | `range_x=10` `range_y=10` `coeff_mult_range=10`  |
-| 24 | [Distance between 2 points](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/distance_two_points.py) | Find the distance between (-4, 5) and (-19, 11) | sqrt(261) | distance_two_points | `maxValXY=20` `minValXY=-20`  |
+| 24 | [Distance between 2 points](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/distance_two_points.py) | Find the distance between (20, 3) and (8, 5) | sqrt(148) | distance_two_points | `maxValXY=20` `minValXY=-20`  |
-| 26 | [Linear Equations](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/linear_equations.py) | 3x + 6y = 18, -14x + 11y = -279 | x = 16, y = -5 | linear_equations | `n=2` `varRange=20` `coeffRange=20`  |
+| 26 | [Linear Equations](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/linear_equations.py) | -16y = 160, -16x + -2y = 228 | x = -13, y = -10 | linear_equations | `n=2` `varRange=20` `coeffRange=20`  |
-| 41 | [Intersection of Two Lines](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/intersection_of_two_lines.py) | Find the point of intersection of the two lines: y = 0/5x + 10 and y = -5/2x + 5 | (-2, 10) | intersection_of_two_lines | `minM=-10` `maxM=10` `minB=-10` `maxB=10` `minDenominator=1` `maxDenominator=6`  |
+| 41 | [Intersection of Two Lines](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/intersection_of_two_lines.py) | Find the point of intersection of the two lines: y = 9/3x + 5 and y = -8/5x - 3 | (-40/23, -5/23) | intersection_of_two_lines | `minM=-10` `maxM=10` `minB=-10` `maxB=10` `minDenominator=1` `maxDenominator=6`  |
-| 43 | [Cross Product of 2 Vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/vector_cross.py) | [-2, -13, 7] X [9, -17, 8] =  | [15, 79, 151] | vector_cross | `minVal=-20` `maxVal=20`  |
+| 43 | [Cross Product of 2 Vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/vector_cross.py) | [8, 11, 12] X [-15, 1, -17] =  | [-199, -44, 173] | vector_cross | `minVal=-20` `maxVal=20`  |
-| 45 | [Simple Interest](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/simple_interest.py) | Simple interest for a principle amount of 2145 dollars, 7% rate of interest and for a time period of 7 years is =  | 1051.05 | simple_interest | `maxPrinciple=10000` `maxRate=10` `maxTime=10`  |
+| 45 | [Simple Interest](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/simple_interest.py) | Simple interest for a principle amount of 3324 dollars, 6% rate of interest and for a time period of 9 years is =  | 1794.96 | simple_interest | `maxPrinciple=10000` `maxRate=10` `maxTime=10`  |
-| 46 | [Multiplication of two matrices](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/matrix_multiplication.py) | Multiply<table><tr><td>-8</td><td>-7</td></tr><tr><td>10</td><td>2</td></tr><tr><td>-7</td><td>-8</td></tr><tr><td>-7</td><td>-10</td></tr></table>and<table><tr><td>9</td><td>2</td><td>2</td><td>1</td></tr><tr><td>-1</td><td>3</td><td>-1</td><td>-6</td></tr></table> | <table><tr><td>-65</td><td>-37</td><td>-9</td><td>34</td></tr><tr><td>88</td><td>26</td><td>18</td><td>-2</td></tr><tr><td>-55</td><td>-38</td><td>-6</td><td>41</td></tr><tr><td>-53</td><td>-44</td><td>-4</td><td>53</td></tr></table> | matrix_multiplication | `maxVal=100` `max_dim=10`  |
+| 46 | [Multiplication of two matrices](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/matrix_multiplication.py) | Multiply<table><tr><td>-5</td><td>-4</td><td>3</td><td>-3</td></tr><tr><td>9</td><td>3</td><td>9</td><td>-8</td></tr><tr><td>-4</td><td>-10</td><td>-6</td><td>9</td></tr></table>and<table><tr><td>-10</td><td>3</td></tr><tr><td>-3</td><td>-5</td></tr><tr><td>5</td><td>-4</td></tr><tr><td>-6</td><td>4</td></tr></table> | <table><tr><td>95</td><td>-19</td></tr><tr><td>-6</td><td>-56</td></tr><tr><td>-14</td><td>98</td></tr></table> | matrix_multiplication | `maxVal=100` `max_dim=10`  |
-| 50 | [Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/quadratic_equation.py) | Zeros of the Quadratic Equation 10x^2+51x+46=0 | [-1.17, -3.93] | quadratic_equation | `maxVal=100`  |
+| 50 | [Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/quadratic_equation.py) | Zeros of the Quadratic Equation 21x^2+108x+86=0 | [-0.98, -4.16] | quadratic_equation | `maxVal=100`  |
-| 65 | [Multiplication of 2 complex numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/multiply_complex_numbers.py) | (-4+11j) * (5-9j) =  | (79+91j) | multiply_complex_numbers | `minRealImaginaryNum=-20` `maxRealImaginaryNum=20`  |
+| 65 | [Multiplication of 2 complex numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/multiply_complex_numbers.py) | (-1-5j) * (-8-1j) =  | (3+41j) | multiply_complex_numbers | `minRealImaginaryNum=-20` `maxRealImaginaryNum=20`  |
-| 72 | [Dot Product of 2 Vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/vector_dot.py) | [-12, 11, 13] . [-4, 9, -13] =  | -22 | vector_dot | `minVal=-20` `maxVal=20`  |
+| 72 | [Dot Product of 2 Vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/vector_dot.py) | [-10, -2, -16] . [-4, 14, 5] =  | -68 | vector_dot | `minVal=-20` `maxVal=20`  |
-| 74 | [Inverse of a Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/invert_matrix.py) | Inverse of Matrix Matrix([[25, 98, 43], [11, 56, 70], [27, 19, 89]]) is: | Matrix([[1218/41533, -2635/41533, 1484/41533], [911/124599, 1064/124599, -1277/124599], [-1303/124599, 2171/124599, 322/124599]]) | invert_matrix | `SquareMatrixDimension=3` `MaxMatrixElement=99` `OnlyIntegerElementsInInvertedMatrix=False`  |
+| 74 | [Inverse of a Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/invert_matrix.py) | Inverse of Matrix Matrix([[3, 44, 61], [90, 92, 19], [34, 23, 25]]) is: | Matrix([[-621/43175, -101/43175, 1592/43175], [1604/129525, 1999/129525, -1811/43175], [1058/129525, -1427/129525, 1228/43175]]) | invert_matrix | `SquareMatrixDimension=3` `MaxMatrixElement=99` `OnlyIntegerElementsInInvertedMatrix=False`  |
-| 77 | [Determinant to 2x2 Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/int_matrix_22_determinant.py) | Det([[11, 84], [38, 41]]) =  |  -2741 | int_matrix_22_determinant | `maxMatrixVal=100`  |
+| 77 | [Determinant to 2x2 Matrix](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/int_matrix_22_determinant.py) | Det([[82, 57], [39, 54]]) =  |  2205 | int_matrix_22_determinant | `maxMatrixVal=100`  |
-| 78 | [Compound Interest](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/compound_interest.py) | Compound interest for a principle amount of 4581 dollars, 4% rate of interest and for a time period of 6 year is =  | 5796.43 | compound_interest | `maxPrinciple=10000` `maxRate=10` `maxTime=10`  |
+| 78 | [Compound Interest](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/compound_interest.py) | Compound interest for a principle amount of 7124 dollars, 7% rate of interest and for a time period of 5 year is =  | 9991.78 | compound_interest | `maxPrinciple=10000` `maxRate=10` `maxTime=10`  |
-| 100 | [complex Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/complex_quadratic.py) | Find the roots of given Quadratic Equation 9x^2 + 7x + 1 = 0 | simplified solution : ((-0.189, -0.589)), generalized solution : ((-7 + sqrt(13))/2*9, (-7 - sqrt(13))/2*9) | complex_quadratic | `prob_type=0` `max_range=10`  |
+| 100 | [complex Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/complex_quadratic.py) | Find the roots of given Quadratic Equation 9x^2 + 8x + 1 = 0 | simplified solution : ((-0.15, -0.738)), generalized solution : ((-8 + sqrt(28))/2*9, (-8 - sqrt(28))/2*9) | complex_quadratic | `prob_type=0` `max_range=10`  |
-| 105 | [Combine Like terms](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/combine_like_terms.py) | 8x^4 + 4x^4 + 6x^1 + 9x^4 + 7x^5 + 10x^3 | 6x^1 + 10x^3 + 21x^4 + 7x^5  | combine_like_terms | `maxCoef=10` `maxExp=20` `maxTerms=10`  |
+| 105 | [Combine Like terms](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/combine_like_terms.py) | 10x^3 + 7x^2 + 9x^3 + 7x^3 + 10x^3 | 7x^2 + 36x^3  | combine_like_terms | `maxCoef=10` `maxExp=20` `maxTerms=10`  |
-| 111 | [Expanding Factored Binomial](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/expanding.py) | (x-3)(x+4) | *x^2-3*x-12 | expanding | `range_x1=10` `range_x2=10` `range_a=10` `range_b=10`  |
+| 111 | [Expanding Factored Binomial](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/algebra/expanding.py) | (x-6)(+2x-3) | *x^2-12*x+18 | expanding | `range_x1=10` `range_x2=10` `range_a=10` `range_b=10`  |
 ## basic_math
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 0 | [Addition](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/addition.py) | 16+43= | 59 | addition | `maxSum=99` `maxAddend=50`  |
+| 0 | [Addition](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/addition.py) | 33+32= | 65 | addition | `maxSum=99` `maxAddend=50`  |
-| 1 | [Subtraction](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/subtraction.py) | 85-8= | 77 | subtraction | `maxMinuend=99` `maxDiff=99`  |
+| 1 | [Subtraction](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/subtraction.py) | 65-49= | 16 | subtraction | `maxMinuend=99` `maxDiff=99`  |
-| 2 | [Multiplication](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/multiplication.py) | 1*4= | 4 | multiplication | `maxMulti=12`  |
+| 2 | [Multiplication](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/multiplication.py) | 4*7= | 28 | multiplication | `maxMulti=12`  |
-| 3 | [Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/division.py) | 9/9= | 1 | division | `maxA=25` `maxB=25`  |
+| 3 | [Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/division.py) | 44/4= | 11 | division | `maxA=25` `maxB=25`  |
 | 6 | [Square Root](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/square_root.py) | sqrt(4)= | 2 | square_root | `minNo=1` `maxNo=12`  |
-| 8 | [Square](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/square.py) | 17^2= | 289 | square | `maxSquareNum=20`  |
+| 8 | [Square](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/square.py) | 19^2= | 361 | square | `maxSquareNum=20`  |
-| 13 | [Complex Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/complex_division.py) | 21/59= | 0.36 | complex_division | `maxRes=99` `maxDivid=99`  |
+| 13 | [Complex Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/complex_division.py) | 58/69= | 0.84 | complex_division | `maxRes=99` `maxDivid=99`  |
-| 16 | [Fraction Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/divide_fractions.py) | (5/2)/(3/10) | 25/3 | divide_fractions | `maxVal=10`  |
+| 16 | [Fraction Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/divide_fractions.py) | (3/1)/(9/7) | 7/3 | divide_fractions | `maxVal=10`  |
-| 28 | [Fraction Multiplication](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/fraction_multiplication.py) | (5/1)*(10/4) | 25/2 | fraction_multiplication | `maxVal=10`  |
+| 28 | [Fraction Multiplication](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/fraction_multiplication.py) | (1/4)*(9/7) | 9/28 | fraction_multiplication | `maxVal=10`  |
-| 31 | [Factorial](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/factorial.py) | 2! =  | 2 | factorial | `maxInput=6`  |
+| 31 | [Factorial](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/factorial.py) | 1! =  | 1 | factorial | `maxInput=6`  |
-| 44 | [Compare Fractions](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/compare_fractions.py) | Which symbol represents the comparison between 8/2 and 9/8? | > | compare_fractions | `maxVal=10`  |
+| 44 | [Compare Fractions](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/compare_fractions.py) | Which symbol represents the comparison between 1/4 and 6/1? | < | compare_fractions | `maxVal=10`  |
-| 47 | [Cube Root](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/cube_root.py) | What is the cube root of 396 up to 2 decimal places? | 7.34 | cube_root | `minNo=1` `maxNo=1000`  |
+| 47 | [Cube Root](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/cube_root.py) | What is the cube root of 182 up to 2 decimal places? | 5.67 | cube_root | `minNo=1` `maxNo=1000`  |
-| 53 | [Exponentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/exponentiation.py) | 2^7 = | 128 | exponentiation | `maxBase=20` `maxExpo=10`  |
+| 53 | [Exponentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/exponentiation.py) | 9^5 = | 59049 | exponentiation | `maxBase=20` `maxExpo=10`  |
-| 71 | [Absolute difference between two numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/absolute_difference.py) | |37--95|= | 132 | absolute_difference | `maxA=100` `maxB=100`  |
+| 71 | [Absolute difference between two numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/absolute_difference.py) | |80--54|= | 134 | absolute_difference | `maxA=100` `maxB=100`  |
-| 80 | [Percentage of a number](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/percentage.py) | What is 99% of 76? | 75.24 | percentage | `maxValue=99` `maxpercentage=99`  |
+| 80 | [Percentage of a number](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/percentage.py) | What is 84% of 55? | 46.20 | percentage | `maxValue=99` `maxpercentage=99`  |
-| 90 | [isprime](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/is_prime.py) | Is 61 prime? | Yes | is_prime | `max_num=100`  |
+| 90 | [isprime](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/is_prime.py) | Is 100 prime? | No | is_prime | `max_num=100`  |
-| 97 | [Power of Powers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/power_of_powers.py) | Simplify 49^8^2= | 49^16 | power_of_powers | `maxBase=50` `maxPower=10`  |
+| 97 | [Power of Powers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/basic_math/power_of_powers.py) | Simplify 29^7^2= | 29^14 | power_of_powers | `maxBase=50` `maxPower=10`  |
 ## calculus
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 7 | [Power Rule Differentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/power_rule_differentiation.py) | 2x^1 + 9x^7 + 6x^4 | 2x^0 + 63x^6 + 24x^3 | power_rule_differentiation | `maxCoef=10` `maxExp=10` `maxTerms=5`  |
+| 7 | [Power Rule Differentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/power_rule_differentiation.py) | 5x^4 + 6x^1 + 10x^1 | 20x^3 + 6x^0 + 10x^0 | power_rule_differentiation | `maxCoef=10` `maxExp=10` `maxTerms=5`  |
-| 48 | [Power Rule Integration](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/power_rule_integration.py) | 5x^2 + 3x^10 + 4x^1 | (5/2)x^3 + (3/10)x^11 + (4/1)x^2 + c | power_rule_integration | `maxCoef=10` `maxExp=10` `maxTerms=5`  |
+| 48 | [Power Rule Integration](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/power_rule_integration.py) | 10x^1 + 10x^5 + 6x^5 | (10/1)x^2 + (10/5)x^6 + (6/5)x^6 + c | power_rule_integration | `maxCoef=10` `maxExp=10` `maxTerms=5`  |
-| 88 | [Differentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/differentiation.py) | differentiate w.r.t x : d(ln(x)+2*x^(-3))/dx | 1/x - 6/x^4 | differentiation | `diff_lvl=2`  |
+| 88 | [Differentiation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/differentiation.py) | differentiate w.r.t x : d(ln(x)+8*x^(-3))/dx | 1/x - 24/x^4 | differentiation | `diff_lvl=2`  |
-| 89 | [Definite Integral of Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/definite_integral.py) | The definite integral within limits 0 to 1 of the equation 100x^2 + 80x + 22 is =  | 95.3333 | definite_integral | `max_coeff=100`  |
+| 89 | [Definite Integral of Quadratic Equation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/definite_integral.py) | The definite integral within limits 0 to 1 of the equation 50x^2 + 39x + 97 is =  | 133.1667 | definite_integral | `max_coeff=100`  |
-| 110 | [Stationary Points](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/stationary_points.py) | f(x)=3*x^3 + 6*x^2 + 9*x + 1 |  | stationary_points | `maxExp=3` `maxCoef=10`  |
+| 110 | [Stationary Points](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/calculus/stationary_points.py) | f(x)=3*x^3 + x^2 + 2*x + 5 |  | stationary_points | `maxExp=3` `maxCoef=10`  |
 ## computer_science
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 4 | [Binary Complement 1s](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_complement_1s.py) | 1= | 0 | binary_complement_1s | `maxDigits=10`  |
+| 4 | [Binary Complement 1s](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_complement_1s.py) | 1111101101= | 0000010010 | binary_complement_1s | `maxDigits=10`  |
-| 5 | [Modulo Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/modulo_division.py) | 51%46= | 5 | modulo_division | `maxRes=99` `maxModulo=99`  |
+| 5 | [Modulo Division](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/modulo_division.py) | 26%25= | 1 | modulo_division | `maxRes=99` `maxModulo=99`  |
-| 14 | [Decimal to Binary](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_binary.py) | Binary of 58= | 111010 | decimal_to_binary | `max_dec=99`  |
+| 14 | [Decimal to Binary](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_binary.py) | Binary of 20= | 10100 | decimal_to_binary | `max_dec=99`  |
-| 15 | [Binary to Decimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_to_decimal.py) | 0110001111 | 399 | binary_to_decimal | `max_dig=10`  |
+| 15 | [Binary to Decimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_to_decimal.py) | 1 | 1 | binary_to_decimal | `max_dig=10`  |
-| 56 | [Fibonacci Series](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/fibonacci_series.py) | The Fibonacci Series of the first 8 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13] | fibonacci_series | `minNo=1`  |
+| 56 | [Fibonacci Series](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/fibonacci_series.py) | The Fibonacci Series of the first 1 numbers is ? | [0] | fibonacci_series | `minNo=1`  |
-| 62 | [nth Fibonacci number](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/nth_fibonacci_number.py) | What is the 78th Fibonacci number? | 8944394323791488 | nth_fibonacci_number | `maxN=100`  |
+| 62 | [nth Fibonacci number](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/nth_fibonacci_number.py) | What is the 98th Fibonacci number? | 135301852344707186688 | nth_fibonacci_number | `maxN=100`  |
-| 64 | [Binary to Hexidecimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_to_hex.py) | 111011 | 0x3b | binary_to_hex | `max_dig=10`  |
+| 64 | [Binary to Hexidecimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_to_hex.py) | 0000011 | 0x3 | binary_to_hex | `max_dig=10`  |
-| 73 | [Binary 2's Complement](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_2s_complement.py) | 2's complement of 11010 = | 110 | binary_2s_complement | `maxDigits=10`  |
+| 73 | [Binary 2's Complement](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/binary_2s_complement.py) | 2's complement of  = |  | binary_2s_complement | `maxDigits=10`  |
-| 79 | [Decimal to Hexadecimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py) | Binary of 456= | 0x1c8 | decimal_to_hexadeci | `max_dec=1000`  |
+| 79 | [Decimal to Hexadecimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_hexadeci.py) | Binary of 867= | 0x363 | decimal_to_hexadeci | `max_dec=1000`  |
-| 84 | [Converts decimal to octal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_octal.py) | The decimal number 3211 in Octal is:  | 0o6213 | decimal_to_octal | `maxDecimal=4096`  |
+| 84 | [Converts decimal to octal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_octal.py) | The decimal number 1941 in Octal is:  | 0o3625 | decimal_to_octal | `maxDecimal=4096`  |
-| 91 | [Binary Coded Decimal to Integer](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/bcd_to_decimal.py) | Integer of Binary Coded Decimal 7 is =  | 29237 | bcd_to_decimal | `maxNumber=10000`  |
+| 91 | [Binary Coded Decimal to Integer](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/bcd_to_decimal.py) | Integer of Binary Coded Decimal 9 is =  | 38456 | bcd_to_decimal | `maxNumber=10000`  |
-| 103 | [Decimal to Binary Coded Decimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_bcd.py) | BCD of Decimal Number 5763 is =  | 1683 | decimal_to_bcd | `maxNumber=10000`  |
+| 103 | [Decimal to Binary Coded Decimal](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/computer_science/decimal_to_bcd.py) | BCD of Decimal Number 8960 is =  | 2300 | decimal_to_bcd | `maxNumber=10000`  |
 ## geometry
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 18 | [Area of Triangle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/area_of_triangle.py) | Area of triangle with side lengths: 15 18 11 =  | 82.3164625090267 | area_of_triangle | `maxA=20` `maxB=20` `maxC=20`  |
+| 18 | [Area of Triangle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/area_of_triangle.py) | Area of triangle with side lengths: 14 12 4 =  | 22.24859546128699 | area_of_triangle | `maxA=20` `maxB=20` `maxC=20`  |
-| 19 | [Triangle exists check](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/valid_triangle.py) | Does triangle with sides 16, 30 and 26 exist? | Yes | valid_triangle | `maxSideLength=50`  |
+| 19 | [Triangle exists check](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/valid_triangle.py) | Does triangle with sides 23, 45 and 40 exist? | Yes | valid_triangle | `maxSideLength=50`  |
-| 22 | [Third Angle of Triangle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/third_angle_of_triangle.py) | Third angle of triangle with angles 75 and 64 =  | 41 | third_angle_of_triangle | `maxAngle=89`  |
+| 22 | [Third Angle of Triangle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/third_angle_of_triangle.py) | Third angle of triangle with angles 70 and 54 =  | 56 | third_angle_of_triangle | `maxAngle=89`  |
-| 25 | [Pythagorean Theorem](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/pythagorean_theorem.py) | The hypotenuse of a right triangle given the other two lengths 7 and 6 =  | 9.22 | pythagorean_theorem | `maxLength=20`  |
+| 25 | [Pythagorean Theorem](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/pythagorean_theorem.py) | The hypotenuse of a right triangle given the other two lengths 5 and 19 =  | 19.65 | pythagorean_theorem | `maxLength=20`  |
 | 29 | [Angle of a Regular Polygon](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/angle_regular_polygon.py) | Find the angle of a regular polygon with 19 sides | 161.05 | angle_regular_polygon | `minVal=3` `maxVal=20`  |
-| 32 | [Surface Area of Cube](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cube.py) | Surface area of cube with side = 7m is | 294 m^2 | surface_area_cube | `maxSide=20` `unit='m'`  |
+| 32 | [Surface Area of Cube](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cube.py) | Surface area of cube with side = 3m is | 54 m^2 | surface_area_cube | `maxSide=20` `unit='m'`  |
-| 33 | [Surface Area of Cuboid](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cuboid.py) | Surface area of cuboid with sides = 9m, 6m, 3m is | 198 m^2 | surface_area_cuboid | `maxSide=20` `unit='m'`  |
+| 33 | [Surface Area of Cuboid](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cuboid.py) | Surface area of cuboid with sides = 10m, 3m, 18m is | 528 m^2 | surface_area_cuboid | `maxSide=20` `unit='m'`  |
-| 34 | [Surface Area of Cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cylinder.py) | Surface area of cylinder with height = 35m and radius = 1m is | 226 m^2 | surface_area_cylinder | `maxRadius=20` `maxHeight=50` `unit='m'`  |
+| 34 | [Surface Area of Cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cylinder.py) | Surface area of cylinder with height = 16m and radius = 7m is | 1011 m^2 | surface_area_cylinder | `maxRadius=20` `maxHeight=50` `unit='m'`  |
-| 35 | [Volum of Cube](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cube.py) | Volume of cube with side = 19m is | 6859 m^3 | volume_cube | `maxSide=20` `unit='m'`  |
+| 35 | [Volum of Cube](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cube.py) | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | `maxSide=20` `unit='m'`  |
-| 36 | [Volume of Cuboid](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cuboid.py) | Volume of cuboid with sides = 14m, 18m, 8m is | 2016 m^3 | volume_cuboid | `maxSide=20` `unit='m'`  |
+| 36 | [Volume of Cuboid](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cuboid.py) | Volume of cuboid with sides = 20m, 17m, 18m is | 6120 m^3 | volume_cuboid | `maxSide=20` `unit='m'`  |
-| 37 | [Volume of cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cylinder.py) | Volume of cylinder with height = 2m and radius = 4m is | 100 m^3 | volume_cylinder | `maxRadius=20` `maxHeight=50` `unit='m'`  |
+| 37 | [Volume of cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cylinder.py) | Volume of cylinder with height = 14m and radius = 19m is | 15877 m^3 | volume_cylinder | `maxRadius=20` `maxHeight=50` `unit='m'`  |
-| 38 | [Surface Area of cone](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cone.py) | Surface area of cone with height = 10m and radius = 1m is | 34 m^2 | surface_area_cone | `maxRadius=20` `maxHeight=50` `unit='m'`  |
+| 38 | [Surface Area of cone](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_cone.py) | Surface area of cone with height = 49m and radius = 10m is | 1885 m^2 | surface_area_cone | `maxRadius=20` `maxHeight=50` `unit='m'`  |
-| 39 | [Volume of cone](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cone.py) | Volume of cone with height = 41m and radius = 2m is | 171 m^3 | volume_cone | `maxRadius=20` `maxHeight=50` `unit='m'`  |
+| 39 | [Volume of cone](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_cone.py) | Volume of cone with height = 32m and radius = 17m is | 9684 m^3 | volume_cone | `maxRadius=20` `maxHeight=50` `unit='m'`  |
-| 49 | [Fourth Angle of Quadrilateral](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py) | Fourth angle of quadrilateral with angles 47 , 186, 23 = | 104 | fourth_angle_of_quadrilateral | `maxAngle=180`  |
+| 49 | [Fourth Angle of Quadrilateral](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py) | Fourth angle of quadrilateral with angles 108 , 131, 30 = | 91 | fourth_angle_of_quadrilateral | `maxAngle=180`  |
-| 57 | [Trigonometric Values](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/basic_trigonometry.py) | What is tan(90)? | ∞ | basic_trigonometry | `angles=[0, 30, 45, 60, 90]` `functions=['sin', 'cos', 'tan']`  |
+| 57 | [Trigonometric Values](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/basic_trigonometry.py) | What is tan(0)? | 0 | basic_trigonometry | `angles=[0, 30, 45, 60, 90]` `functions=['sin', 'cos', 'tan']`  |
-| 58 | [Sum of Angles of Polygon](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/sum_of_polygon_angles.py) | Sum of angles of polygon with 8 sides =  | 1080 | sum_of_polygon_angles | `maxSides=12`  |
+| 58 | [Sum of Angles of Polygon](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/sum_of_polygon_angles.py) | Sum of angles of polygon with 3 sides =  | 180 | sum_of_polygon_angles | `maxSides=12`  |
 | 60 | [Surface Area of Sphere](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/surface_area_sphere.py) | Surface area of Sphere with radius = 2m is | 50.26548245743669 m^2 | surface_area_sphere | `maxSide=20` `unit='m'`  |
-| 61 | [Volume of Sphere](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_sphere.py) | Volume of sphere with radius 70 m =  | 1436755.040241732 m^3 | volume_sphere | `maxRadius=100`  |
+| 61 | [Volume of Sphere](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/volume_sphere.py) | Volume of sphere with radius 13 m =  | 9202.7720799157 m^3 | volume_sphere | `maxRadius=100`  |
-| 70 | [Angle between 2 vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/angle_btw_vectors.py) | angle between the vectors [809.39, 750.64, 808.48] and [99.52, 21.47, 323.85] is: | 0.69 radians | angle_btw_vectors | `maxEltAmt=20`  |
+| 70 | [Angle between 2 vectors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/angle_btw_vectors.py) | angle between the vectors [104.59, 296.77, 598.39, 80.0, 385.49, 89.79, 590.2, 1.03, 216.98, 262.6, 802.62, 978.03, 157.13, 762.68, 45.06, 267.85, 13.03, 425.11, 594.3] and [443.1, 96.25, 851.74, 839.47, 450.02, 808.83, 674.73, 331.39, 673.46, 653.79, 777.36, 196.12, 742.14, 623.79, 475.72, 730.93, 633.66, 667.95, 751.75] is: | 0.76 radians | angle_btw_vectors | `maxEltAmt=20`  |
-| 75 | [Area of a Sector](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/sector_area.py) | Given radius, 38 and angle, 119. Find the area of the sector. | Area of sector = 1499.55199 | sector_area | `maxRadius=49` `maxAngle=359`  |
+| 75 | [Area of a Sector](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/sector_area.py) | Given radius, 18 and angle, 2. Find the area of the sector. | Area of sector = 5.65487 | sector_area | `maxRadius=49` `maxAngle=359`  |
-| 86 | [Degrees to Radians](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/degree_to_rad.py) | Angle 187 in radians is =  | 3.26 | degree_to_rad | `max_deg=360`  |
+| 86 | [Degrees to Radians](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/degree_to_rad.py) | Angle 253 in radians is =  | 4.42 | degree_to_rad | `max_deg=360`  |
 | 87 | [Radians to Degrees](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/radian_to_deg.py) | Angle 2 in degrees is =  | 114.59 | radian_to_deg | `max_rad=3`  |
-| 95 | [Curved surface area of a cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py) | What is the curved surface area of a cylinder of radius, 25 and height, 26? | CSA of cylinder = 4084.07 | curved_surface_area_cylinder | `maxRadius=49` `maxHeight=99`  |
+| 95 | [Curved surface area of a cylinder](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/curved_surface_area_cylinder.py) | What is the curved surface area of a cylinder of radius, 42 and height, 10? | CSA of cylinder = 2638.94 | curved_surface_area_cylinder | `maxRadius=49` `maxHeight=99`  |
-| 96 | [Perimeter of Polygons](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/perimeter_of_polygons.py) | The perimeter of a 11 sided polygon with lengths of [39, 70, 58, 27, 85, 119, 47, 59, 113, 38, 45]cm is:  | 700 | perimeter_of_polygons | `maxSides=12` `maxLength=120`  |
+| 96 | [Perimeter of Polygons](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/perimeter_of_polygons.py) | The perimeter of a 8 sided polygon with lengths of [57, 48, 54, 31, 104, 7, 97, 7]cm is:  | 405 | perimeter_of_polygons | `maxSides=12` `maxLength=120`  |
-| 104 | [Circumference](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/circumference.py) | Circumference of circle with radius 76 | 477.5220833456485 | circumference | `maxRadius=100`  |
+| 104 | [Circumference](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/circumference.py) | Circumference of circle with radius 28 | 175.92918860102841 | circumference | `maxRadius=100`  |
-| 108 | [Arc length of Angle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/arc_length.py) | Given radius, 30 and angle, 240. Find the arc length of the angle. | Arc length of the angle = 125.66371 | arc_length | `maxRadius=49` `maxAngle=359`  |
+| 108 | [Arc length of Angle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/arc_length.py) | Given radius, 33 and angle, 301. Find the arc length of the angle. | Arc length of the angle = 173.36355 | arc_length | `maxRadius=49` `maxAngle=359`  |
-| 112 | [Area of Circle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/area_of_circle.py) | Area of circle with radius 37 | 4302.571428571428 | area_of_circle | `maxRadius=100`  |
+| 112 | [Area of Circle](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/geometry/area_of_circle.py) | Area of circle with radius 81 | 20620.285714285714 | area_of_circle | `maxRadius=100`  |
 ## misc
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 9 | [LCM (Least Common Multiple)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/lcm.py) | LCM of 19 and 2 = | 38 | lcm | `maxVal=20`  |
+| 9 | [LCM (Least Common Multiple)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/lcm.py) | LCM of 16 and 19 = | 304 | lcm | `maxVal=20`  |
-| 10 | [GCD (Greatest Common Denominator)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/gcd.py) | GCD of 16 and 6 =  | 2 | gcd | `maxVal=20`  |
+| 10 | [GCD (Greatest Common Denominator)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/gcd.py) | GCD of 1 and 12 =  | 1 | gcd | `maxVal=20`  |
-| 27 | [Prime Factorisation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/prime_factors.py) | Find prime factors of 78 | [2, 3, 13] | prime_factors | `minVal=1` `maxVal=200`  |
+| 27 | [Prime Factorisation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/prime_factors.py) | Find prime factors of 169 | [13, 13] | prime_factors | `minVal=1` `maxVal=200`  |
-| 40 | [Common Factors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/common_factors.py) | Common Factors of 21 and 77 =  | [1, 7] | common_factors | `maxVal=100`  |
+| 40 | [Common Factors](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/common_factors.py) | Common Factors of 48 and 67 =  | [1] | common_factors | `maxVal=100`  |
-| 51 | [HCF (Highest Common Factor)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/hcf.py) | HCF of 17 and 3 =  | 1 | hcf | `maxVal=20`  |
+| 51 | [HCF (Highest Common Factor)](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/hcf.py) | HCF of 10 and 6 =  | 2 | hcf | `maxVal=20`  |
-| 55 | [Comparing surds](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/surds_comparison.py) | Fill in the blanks 58^(1/5) _ 18^(1/8) | > | surds_comparison | `maxValue=100` `maxRoot=10`  |
+| 55 | [Comparing surds](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/surds_comparison.py) | Fill in the blanks 51^(1/7) _ 7^(1/4) | > | surds_comparison | `maxValue=100` `maxRoot=10`  |
-| 63 | [Profit or Loss Percent](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/profit_loss_percent.py) | Loss percent when CP = 821 and SP = 113 is:  | 86.23629719853837 | profit_loss_percent | `maxCP=1000` `maxSP=1000`  |
+| 63 | [Profit or Loss Percent](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/profit_loss_percent.py) | Profit percent when CP = 16 and SP = 196 is:  | 1125.0 | profit_loss_percent | `maxCP=1000` `maxSP=1000`  |
-| 66 | [Geometric Progression](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/geometric_progression.py) | For the given GP [5, 15, 45, 135, 405, 1215] ,Find the value of a,common ratio,10th term value, sum upto 11th term | The value of a is 5, common ratio is 3 , 10th term is 98415 , sum upto 11th term is 442865.0 | geometric_progression | `number_values=6` `min_value=2` `max_value=12` `n_term=7` `sum_term=5`  |
+| 66 | [Geometric Progression](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/geometric_progression.py) | For the given GP [3, 12, 48, 192, 768, 3072] ,Find the value of a,common ratio,10th term value, sum upto 8th term | The value of a is 3, common ratio is 4 , 10th term is 786432 , sum upto 8th term is 65535.0 | geometric_progression | `number_values=6` `min_value=2` `max_value=12` `n_term=7` `sum_term=5`  |
-| 67 | [Geometric Mean of N Numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/geometric_mean.py) | Geometric mean of 4 numbers 76 , 17 , 48 , 57 =  | (76*17*48*57)^(1/4) = 43.36053695794891 | geometric_mean | `maxValue=100` `maxNum=4`  |
+| 67 | [Geometric Mean of N Numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/geometric_mean.py) | Geometric mean of 4 numbers 51 , 77 , 62 , 72 =  | (51*77*62*72)^(1/4) = 64.70625602593176 | geometric_mean | `maxValue=100` `maxNum=4`  |
-| 68 | [Harmonic Mean of N Numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/harmonic_mean.py) | Harmonic mean of 4 numbers 12 , 23 , 94 , 96 =  |  4/((1/12) + (1/23) + (1/94) + (1/96)) = 27.0514173998045 | harmonic_mean | `maxValue=100` `maxNum=4`  |
+| 68 | [Harmonic Mean of N Numbers](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/harmonic_mean.py) | Harmonic mean of 4 numbers 86 , 70 , 91 , 11 =  |  4/((1/86) + (1/70) + (1/91) + (1/11)) = 31.296033736866974 | harmonic_mean | `maxValue=100` `maxNum=4`  |
-| 69 | [Euclidian norm or L2 norm of a vector](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/euclidian_norm.py) | Euclidian norm or L2 norm of the vector[802.4475305377166, 660.7012519538307, 370.72333556197833, 54.54747734093479, 367.379416204208, 945.4792894951261, 219.91075384694793, 302.48678829534293] is: | 1545.8386466508773 | euclidian_norm | `maxEltAmt=20`  |
+| 69 | [Euclidian norm or L2 norm of a vector](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/euclidian_norm.py) | Euclidian norm or L2 norm of the vector[350.37640204706764, 267.36207256487256, 909.0435795264115, 802.6858926435999, 918.1006749495702, 868.4754635821735, 751.2551651468856, 155.99149031988512, 842.4880119121881, 466.59314571766276, 174.37320803605527, 201.99028302994392, 857.0557600458039, 472.3155684465278, 693.4305596009841, 678.7843734115539, 591.0195002345957, 560.290210411179, 828.7547053283382, 462.8660305249392] is: | 2883.230420380704 | euclidian_norm | `maxEltAmt=20`  |
-| 81 | [Celsius To Fahrenheit](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/celsius_to_fahrenheit.py) | Convert 6 degrees Celsius to degrees Fahrenheit = | 42.8 | celsius_to_fahrenheit | `maxTemp=100`  |
+| 81 | [Celsius To Fahrenheit](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/celsius_to_fahrenheit.py) | Convert -12 degrees Celsius to degrees Fahrenheit = | 10.399999999999999 | celsius_to_fahrenheit | `maxTemp=100`  |
-| 82 | [AP Term Calculation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/arithmetic_progression_term.py) | Find the term number 67 of the AP series: -19, -81, -143 ...  | -4111 | arithmetic_progression_term | `maxd=100` `maxa=100` `maxn=100`  |
+| 82 | [AP Term Calculation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/arithmetic_progression_term.py) | Find the term number 42 of the AP series: 65, 134, 203 ...  | 2894 | arithmetic_progression_term | `maxd=100` `maxa=100` `maxn=100`  |
-| 83 | [AP Sum Calculation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/arithmetic_progression_sum.py) | Find the sum of first 45 terms of the AP series: 58, 32, 6 ...  | -23130.0 | arithmetic_progression_sum | `maxd=100` `maxa=100` `maxn=100`  |
+| 83 | [AP Sum Calculation](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/arithmetic_progression_sum.py) | Find the sum of first 59 terms of the AP series: 51, 132, 213 ...  | 141600.0 | arithmetic_progression_sum | `maxd=100` `maxa=100` `maxn=100`  |
-| 85 | [Converts decimal to Roman Numerals](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/decimal_to_roman_numerals.py) | The number 0 in Roman Numerals is:  | MMMDCCCXXXV | decimal_to_roman_numerals | `maxDecimal=4000`  |
+| 85 | [Converts decimal to Roman Numerals](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/decimal_to_roman_numerals.py) | The number 0 in Roman Numerals is:  | CCCII | decimal_to_roman_numerals | `maxDecimal=4000`  |
-| 92 | [Complex To Polar Form](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/complex_to_polar.py) | 17.12(2.0theta + i-17.0theta) | -1.45 | complex_to_polar | `minRealImaginaryNum=-20, maxRealImaginaryNum=20`  |
+| 92 | [Complex To Polar Form](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/complex_to_polar.py) | 9.22(9.0theta + i2.0theta) | 0.22 | complex_to_polar | `minRealImaginaryNum=-20, maxRealImaginaryNum=20`  |
-| 93 | [Union,Intersection,Difference of Two Sets](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/set_operation.py) | Given the two sets a={8, 9, 5} ,b={10, 3, 6, 7}.Find the Union,intersection,a-b,b-a and symmetric difference | Union is {3, 5, 6, 7, 8, 9, 10},Intersection is set(), a-b is {8, 9, 5},b-a is {10, 3, 6, 7}, Symmetric difference is {3, 5, 6, 7, 8, 9, 10} | set_operation | `minval=3` `maxval=7` `n_a=4` `n_b=5`  |
+| 93 | [Union,Intersection,Difference of Two Sets](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/set_operation.py) | Given the two sets a={9, 10, 5, 7} ,b={8, 4, 7}.Find the Union,intersection,a-b,b-a and symmetric difference | Union is {4, 5, 7, 8, 9, 10},Intersection is {7}, a-b is {9, 10, 5},b-a is {8, 4}, Symmetric difference is {4, 5, 8, 9, 10} | set_operation | `minval=3` `maxval=7` `n_a=4` `n_b=5`  |
-| 94 | [Base Conversion](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/base_conversion.py) | Convert E87 from base 16 to base 10. | 3719 | base_conversion | `maxNum=60000` `maxBase=16`  |
+| 94 | [Base Conversion](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/base_conversion.py) | Convert 7CE1 from base 16 to base 9. | 47761 | base_conversion | `maxNum=60000` `maxBase=16`  |
-| 98 | [Quotient of Powers with Same Base](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/quotient_of_power_same_base.py) | The Quotient of 31^8 and 31^8 = 31^(8-8) = 31^0 | 1 | quotient_of_power_same_base | `maxBase=50` `maxPower=10`  |
+| 98 | [Quotient of Powers with Same Base](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/quotient_of_power_same_base.py) | The Quotient of 42^4 and 42^6 = 42^(4-6) = 42^-2 | 0.0005668934240362812 | quotient_of_power_same_base | `maxBase=50` `maxPower=10`  |
-| 99 | [Quotient of Powers with Same Power](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/quotient_of_power_same_power.py) | The Quotient of 24^1 and 19^1 = (24/19)^1 = 1.263157894736842^1 | 1.263157894736842 | quotient_of_power_same_power | `maxBase=50` `maxPower=10`  |
+| 99 | [Quotient of Powers with Same Power](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/quotient_of_power_same_power.py) | The Quotient of 39^1 and 4^1 = (39/4)^1 = 9.75^1 | 9.75 | quotient_of_power_same_power | `maxBase=50` `maxPower=10`  |
-| 101 | [Leap Year or Not](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/is_leap_year.py) | Year 2086  | is not a leap year | is_leap_year | `minNumber=1900` `maxNumber=2099`  |
+| 101 | [Leap Year or Not](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/is_leap_year.py) | Year 1918  | is not a leap year | is_leap_year | `minNumber=1900` `maxNumber=2099`  |
-| 102 | [Minute to Hour conversion](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/minutes_to_hours.py) | Convert 680 minutes to Hours & Minutes | 11 hours and 20 minutes | minutes_to_hours | `maxMinutes=999`  |
+| 102 | [Minute to Hour conversion](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/minutes_to_hours.py) | Convert 805 minutes to Hours & Minutes | 13 hours and 25 minutes | minutes_to_hours | `maxMinutes=999`  |
-| 106 | [signum function](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/signum_function.py) | signum of -93 is = | -1 | signum_function | `min=-999` `max=999`  |
+| 106 | [signum function](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/signum_function.py) | signum of 884 is = | 1 | signum_function | `min=-999` `max=999`  |
-| 109 | [Binomial distribution](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/binomial_distribution.py) | A manufacturer of metal pistons finds that, on average, 40.52% of the pistons they manufacture are rejected because they are incorrectly sized. What is the probability that a batch of 20 pistons will contain no more than 2 rejected pistons? | 0.32 | binomial_distribution | ``  |
+| 109 | [Binomial distribution](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/misc/binomial_distribution.py) | A manufacturer of metal pistons finds that, on average, 37.33% of the pistons they manufacture are rejected because they are incorrectly sized. What is the probability that a batch of 19 pistons will contain no more than 6 rejected pistons? | 39.71 | binomial_distribution | ``  |
 ## statistics
 | Id   | Skill | Example problem | Example Solution | Function Name | Kwargs |
 |------|-------|-----------------|------------------|---------------|--------|
-| 30 | [Combinations of Objects](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/combinations.py) | Number of combinations from 17 objects picked 0 at a time  | 1 | combinations | `maxlength=20`  |
+| 30 | [Combinations of Objects](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/combinations.py) | Number of combinations from 20 objects picked 8 at a time  | 125970 | combinations | `maxlength=20`  |
-| 42 | [Permutations](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/permutation.py) | Number of Permutations from 16 objects picked 8 at a time =   | 518918400 | permutation | `maxlength=20`  |
+| 42 | [Permutations](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/permutation.py) | Number of Permutations from 11 objects picked 7 at a time =   | 1663200 | permutation | `maxlength=20`  |
-| 52 | [Probability of a certain sum appearing on faces of dice](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/dice_sum_probability.py) | If 3 dice are rolled at the same time, the probability of getting a sum of 5 = | 6/216 | dice_sum_probability | `maxDice=3`  |
+| 52 | [Probability of a certain sum appearing on faces of dice](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/dice_sum_probability.py) | If 3 dice are rolled at the same time, the probability of getting a sum of 10 = | 27/216 | dice_sum_probability | `maxDice=3`  |
-| 54 | [Confidence interval For sample S](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/confidence_interval.py) | The confidence interval for sample [272, 287, 274, 273, 266, 212, 242, 258, 291, 243, 248, 240, 236, 232, 249, 207, 271, 251, 206, 282, 295, 283, 238, 210, 234, 288, 268, 229, 289, 219, 294, 264, 215] with 95% confidence is | (262.9335851189468, 244.09671791135625) | confidence_interval | ``  |
+| 54 | [Confidence interval For sample S](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/confidence_interval.py) | The confidence interval for sample [208, 223, 298, 225, 200, 247, 258, 226, 253, 284, 216, 203, 237, 263, 218, 286, 248, 233, 288, 207] with 80% confidence is | (249.58829083537802, 232.511709164622) | confidence_interval | ``  |
-| 59 | [Mean,Standard Deviation,Variance](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/data_summary.py) | Find the mean,standard deviation and variance for the data[50, 29, 15, 50, 26, 25, 12, 16, 31, 38, 31, 5, 7, 42, 36] | The Mean is 27.533333333333335 , Standard Deviation is 193.0488888888889, Variance is 13.894203427648845 | data_summary | `number_values=15` `minval=5` `maxval=50`  |
+| 59 | [Mean,Standard Deviation,Variance](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/data_summary.py) | Find the mean,standard deviation and variance for the data[20, 47, 20, 8, 42, 20, 27, 9, 30, 29, 13, 20, 24, 41, 43] | The Mean is 26.2 , Standard Deviation is 144.42666666666668, Variance is 12.017764628526667 | data_summary | `number_values=15` `minval=5` `maxval=50`  |
-| 76 | [Mean and Median](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/mean_median.py) | Given the series of numbers [6, 9, 17, 22, 26, 35, 37, 58, 75, 83]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 36.8 and Arithmetic median of this series is 30.5 | mean_median | `maxlen=10`  |
+| 76 | [Mean and Median](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/mean_median.py) | Given the series of numbers [4, 15, 17, 25, 38, 42, 58, 71, 75, 77]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 42.2 and Arithmetic median of this series is 40.0 | mean_median | `maxlen=10`  |
-| 107 | [Conditional Probability](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/conditional_probability.py) | Someone tested positive for a nasty disease which only 0.18% of population have. Test sensitivity (true positive) is equal to SN= 93.38% whereas test specificity (true negative) SP= 93.15%. What is the probability that this guy really has that disease? | 2.4% | conditional_probability | ``  |
+| 107 | [Conditional Probability](https://github.com/lukew3/mathgenerator/blob/main/mathgenerator/funcs/statistics/conditional_probability.py) | Someone tested positive for a nasty disease which only 1.63% of population have. Test sensitivity (true positive) is equal to SN= 98.57% whereas test specificity (true negative) SP= 90.98%. What is the probability that this guy really has that disease? | 15.33% | conditional_probability | ``  |

mathgenerator/funcs/algebra/basic_algebra.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def basicAlgebraFunc(maxVariable=10, format='string'):
+def gen_func(maxVariable=10, format='string'):
     a = random.randint(1, maxVariable)
     b = random.randint(1, maxVariable)
     c = random.randint(b, maxVariable)
@@ -32,5 +32,5 @@ def basicAlgebraFunc(maxVariable=10, format='string'):
         return a, b, c, x
 
 
-basic_algebra = Generator("Basic Algebra", 11, basicAlgebraFunc,
+basic_algebra = Generator("Basic Algebra", 11, gen_func,
                           ["maxVariable=10"])

mathgenerator/funcs/algebra/combine_like_terms.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def likeTermCombineFunc(maxCoef=10, maxExp=20, maxTerms=10, format='string'):
+def gen_func(maxCoef=10, maxExp=20, maxTerms=10, format='string'):
     numTerms = random.randint(1, maxTerms)
     problem = ""
     solution = ""
@@ -46,5 +46,5 @@ def combineTerms(string):
     return final_string
 
 
-combine_like_terms = Generator("Combine Like terms", 105, likeTermCombineFunc,
+combine_like_terms = Generator("Combine Like terms", 105, gen_func,
                                ["maxCoef=10", "maxExp=20", "maxTerms=10"])

mathgenerator/funcs/algebra/complex_quadratic.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def complexQuadraticFunc(prob_type=0, max_range=10, format='string'):
+def gen_func(prob_type=0, max_range=10, format='string'):
     if prob_type < 0 or prob_type > 1:
         print("prob_type not supported")
         print("prob_type = 0 for real roots problems ")
@@ -69,5 +69,5 @@ def complexQuadraticFunc(prob_type=0, max_range=10, format='string'):
 
 
 complex_quadratic = Generator("complex Quadratic Equation", 100,
-                              complexQuadraticFunc,
+                              gen_func,
                               ["prob_type=0", "max_range=10"])

mathgenerator/funcs/algebra/compound_interest.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def compoundInterestFunc(maxPrinciple=10000,
+def gen_func(maxPrinciple=10000,
                          maxRate=10,
                          maxTime=10,
                          format='string'):
@@ -22,5 +22,5 @@ def compoundInterestFunc(maxPrinciple=10000,
 
 
 compound_interest = Generator(
-    "Compound Interest", 78, compoundInterestFunc,
+    "Compound Interest", 78, gen_func,
     ["maxPrinciple=10000", "maxRate=10", "maxTime=10"])

mathgenerator/funcs/algebra/distance_two_points.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def distanceTwoPointsFunc(maxValXY=20, minValXY=-20, format='string'):
+def gen_func(maxValXY=20, minValXY=-20, format='string'):
     point1X = random.randint(minValXY, maxValXY + 1)
     point1Y = random.randint(minValXY, maxValXY + 1)
     point2X = random.randint(minValXY, maxValXY + 1)
@@ -20,5 +20,5 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20, format='string'):
 
 
 distance_two_points = Generator("Distance between 2 points", 24,
-                                distanceTwoPointsFunc,
+                                gen_func,
                                 ["maxValXY=20", "minValXY=-20"])

mathgenerator/funcs/algebra/expanding.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def expandingFunc(range_x1=10,
+def gen_func(range_x1=10,
                   range_x2=10,
                   range_a=10,
                   range_b=10,
@@ -55,5 +55,5 @@ def expandingFunc(range_x1=10,
 
 
 expanding = Generator(
-    "Expanding Factored Binomial", 111, expandingFunc,
+    "Expanding Factored Binomial", 111, gen_func,
     ["range_x1=10", "range_x2=10", "range_a=10", "range_b=10"])

mathgenerator/funcs/algebra/factoring.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def factoringFunc(range_x1=10, range_x2=10, format='string'):
+def gen_func(range_x1=10, range_x2=10, format='string'):
     x1 = random.randint(-range_x1, range_x1)
     x2 = random.randint(-range_x2, range_x2)
 
@@ -34,5 +34,5 @@ def factoringFunc(range_x1=10, range_x2=10, format='string'):
         return b, c, x1, x2
 
 
-factoring = Generator("Factoring Quadratic", 21, factoringFunc,
+factoring = Generator("Factoring Quadratic", 21, gen_func,
                       ["range_x1=10", "range_x2=10"])

mathgenerator/funcs/algebra/int_matrix_22_determinant.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def determinantToMatrix22(maxMatrixVal=100, format='string'):
+def gen_func(maxMatrixVal=100, format='string'):
     a = random.randint(0, maxMatrixVal)
     b = random.randint(0, maxMatrixVal)
     c = random.randint(0, maxMatrixVal)
@@ -20,5 +20,5 @@ def determinantToMatrix22(maxMatrixVal=100, format='string'):
 
 
 int_matrix_22_determinant = Generator("Determinant to 2x2 Matrix", 77,
-                                      determinantToMatrix22,
+                                      gen_func,
                                       ["maxMatrixVal=100"])

mathgenerator/funcs/algebra/intersection_of_two_lines.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import fractions
 
 
-def intersectionOfTwoLinesFunc(minM=-10,
+def gen_func(minM=-10,
              maxM=10,
              minB=-10,
              maxB=10,
@@ -75,7 +75,7 @@ def intersectionOfTwoLinesFunc(minM=-10,
 
 
 intersection_of_two_lines = Generator(
-    "Intersection of Two Lines", 41, intersectionOfTwoLinesFunc, [
+    "Intersection of Two Lines", 41, gen_func, [
         "minM=-10", "maxM=10", "minB=-10", "maxB=10", "minDenominator=1",
         "maxDenominator=6"
     ])

mathgenerator/funcs/algebra/invert_matrix.py

@@ -2,7 +2,7 @@ from .__init__ import *
 import sympy
 
 
-def matrixInversion(SquareMatrixDimension=3,
+def gen_func(SquareMatrixDimension=3,
                     MaxMatrixElement=99,
                     OnlyIntegerElementsInInvertedMatrix=False,
                     format='string'):
@@ -85,7 +85,7 @@ def matrixInversion(SquareMatrixDimension=3,
         return Mat, sympy.Matrix.inv(Mat)
 
 
-invert_matrix = Generator("Inverse of a Matrix", 74, matrixInversion, [
+invert_matrix = Generator("Inverse of a Matrix", 74, gen_func, [
     "SquareMatrixDimension=3", "MaxMatrixElement=99",
     "OnlyIntegerElementsInInvertedMatrix=False"
 ])

mathgenerator/funcs/algebra/linear_equations.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def linearEquationsFunc(n=2, varRange=20, coeffRange=20, format='string'):
+def gen_func(n=2, varRange=20, coeffRange=20, format='string'):
     if n > 10:
         print("[!] n cannot be greater than 10")
         return None, None
@@ -36,5 +36,5 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20, format='string'):
         return problem, solution
 
 
-linear_equations = Generator("Linear Equations", 26, linearEquationsFunc,
+linear_equations = Generator("Linear Equations", 26, gen_func,
                              ["n=2", "varRange=20", "coeffRange=20"])

mathgenerator/funcs/algebra/log.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def logFunc(maxBase=3, maxVal=8, format='string'):
+def gen_func(maxBase=3, maxVal=8, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(2, maxBase)
     c = pow(b, a)
@@ -18,4 +18,4 @@ def logFunc(maxBase=3, maxVal=8, format='string'):
         return b, c, a
 
 
-log = Generator("Logarithm", 12, logFunc, ["maxBase=3", "maxVal=8"])
+log = Generator("Logarithm", 12, gen_func, ["maxBase=3", "maxVal=8"])

mathgenerator/funcs/algebra/matrix_multiplication.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def matrixMultiplicationFunc(maxVal=100, max_dim=10, format='string'):
+def gen_func(maxVal=100, max_dim=10, format='string'):
     m = random.randint(2, max_dim)
     n = random.randint(2, max_dim)
     k = random.randint(2, max_dim)
@@ -59,5 +59,5 @@ def matrixMultiplicationFuncHelper(inp):
 
 
 matrix_multiplication = Generator("Multiplication of two matrices", 46,
-                                  matrixMultiplicationFunc,
+                                  gen_func,
                                   ["maxVal=100", "max_dim=10"])

mathgenerator/funcs/algebra/midpoint_of_two_points.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def MidPointOfTwoPointFunc(maxValue=20, format='string'):
+def gen_func(maxValue=20, format='string'):
     x1 = random.randint(-20, maxValue)
     y1 = random.randint(-20, maxValue)
     x2 = random.randint(-20, maxValue)
@@ -20,4 +20,4 @@ def MidPointOfTwoPointFunc(maxValue=20, format='string'):
 
 
 midPoint_of_two_points = Generator("Midpoint of the two point", 20,
-                                   MidPointOfTwoPointFunc, ["maxValue=20"])
+                                   gen_func, ["maxValue=20"])

mathgenerator/funcs/algebra/multiply_complex_numbers.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def multiplyComplexNumbersFunc(minRealImaginaryNum=-20,
+def gen_func(minRealImaginaryNum=-20,
              maxRealImaginaryNum=20,
              format='string'):
     num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum),
@@ -21,5 +21,5 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20,
 
 
 multiply_complex_numbers = Generator(
-    "Multiplication of 2 complex numbers", 65, multiplyComplexNumbersFunc,
+    "Multiplication of 2 complex numbers", 65, gen_func,
     ["minRealImaginaryNum=-20", "maxRealImaginaryNum=20"])

mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100, format='string'):
+def gen_func(maxMatrixVal=10, maxRes=100, format='string'):
     a = random.randint(0, maxMatrixVal)
     b = random.randint(0, maxMatrixVal)
     c = random.randint(0, maxMatrixVal)
@@ -30,5 +30,5 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100, format='string'):
 
 
 multiply_int_to_22_matrix = Generator("Integer Multiplication with 2x2 Matrix",
-                                      17, multiplyIntToMatrix22,
+                                      17, gen_func,
                                       ["maxMatrixVal=10", "maxRes=100"])

mathgenerator/funcs/algebra/quadratic_equation.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def quadraticEquation(maxVal=100, format='string'):
+def gen_func(maxVal=100, format='string'):
     a = random.randint(1, maxVal)
     c = random.randint(1, maxVal)
     b = random.randint(
@@ -22,5 +22,5 @@ def quadraticEquation(maxVal=100, format='string'):
         return a, b, c, res
 
 
-quadratic_equation = Generator("Quadratic Equation", 50, quadraticEquation,
+quadratic_equation = Generator("Quadratic Equation", 50, gen_func,
                                ["maxVal=100"])

mathgenerator/funcs/algebra/simple_interest.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def simpleInterestFunc(maxPrinciple=10000,
+def gen_func(maxPrinciple=10000,
                        maxRate=10,
                        maxTime=10,
                        format='string'):
@@ -23,5 +23,5 @@ def simpleInterestFunc(maxPrinciple=10000,
         return a, b, c, d
 
 
-simple_interest = Generator("Simple Interest", 45, simpleInterestFunc,
+simple_interest = Generator("Simple Interest", 45, gen_func,
                             ["maxPrinciple=10000", "maxRate=10", "maxTime=10"])

mathgenerator/funcs/algebra/system_of_equations.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def systemOfEquationsFunc(range_x=10,
+def gen_func(range_x=10,
              range_y=10,
              coeff_mult_range=10,
              format='string'):
@@ -56,5 +56,5 @@ def systemOfEquationsFunc(range_x=10,
 
 
 system_of_equations = Generator(
-    "Solve a System of Equations in R^2", 23, systemOfEquationsFunc,
+    "Solve a System of Equations in R^2", 23, gen_func,
     ["range_x=10", "range_y=10", "coeff_mult_range=10"])

mathgenerator/funcs/algebra/vector_cross.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def vectorCrossFunc(minVal=-20, maxVal=20, format='string'):
+def gen_func(minVal=-20, maxVal=20, format='string'):
     a = [random.randint(minVal, maxVal) for i in range(3)]
     b = [random.randint(minVal, maxVal) for i in range(3)]
     c = [
@@ -19,5 +19,5 @@ def vectorCrossFunc(minVal=-20, maxVal=20, format='string'):
         return a, b, c
 
 
-vector_cross = Generator("Cross Product of 2 Vectors", 43, vectorCrossFunc,
+vector_cross = Generator("Cross Product of 2 Vectors", 43, gen_func,
                          ["minVal=-20", "maxVal=20"])

mathgenerator/funcs/algebra/vector_dot.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def vectorDotFunc(minVal=-20, maxVal=20, format='string'):
+def gen_func(minVal=-20, maxVal=20, format='string'):
     a = [random.randint(minVal, maxVal) for i in range(3)]
     b = [random.randint(minVal, maxVal) for i in range(3)]
     c = a[0] * b[0] + a[1] * b[1] + a[2] * b[2]
@@ -16,5 +16,5 @@ def vectorDotFunc(minVal=-20, maxVal=20, format='string'):
         return a, b, c
 
 
-vector_dot = Generator("Dot Product of 2 Vectors", 72, vectorDotFunc,
+vector_dot = Generator("Dot Product of 2 Vectors", 72, gen_func,
                        ["minVal=-20", "maxVal=20"])

mathgenerator/funcs/basic_math/absolute_difference.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def main(maxA=100, maxB=100, format='string'):
+def gen_func(maxA=100, maxB=100, format='string'):
     a = random.randint(-1 * maxA, maxA)
     b = random.randint(-1 * maxB, maxB)
     absDiff = abs(a - b)
@@ -15,4 +15,4 @@ def main(maxA=100, maxB=100, format='string'):
 
 
 absolute_difference = Generator("Absolute difference between two numbers", 71,
-                                main, ["maxA=100", "maxB=100"])
+                                gen_func, ["maxA=100", "maxB=100"])

mathgenerator/funcs/basic_math/addition.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def main(maxSum=99, maxAddend=50, format='string'):
+def gen_func(maxSum=99, maxAddend=50, format='string'):
     if maxAddend > maxSum:
         maxAddend = maxSum
     a = random.randint(0, maxAddend)
@@ -21,4 +21,4 @@ def main(maxSum=99, maxAddend=50, format='string'):
         return a, b, c
 
 
-addition = Generator("Addition", 0, main, ["maxSum=99", "maxAddend=50"])
+addition = Generator("Addition", 0, gen_func, ["maxSum=99", "maxAddend=50"])

mathgenerator/funcs/basic_math/compare_fractions.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def compareFractionsFunc(maxVal=10, format='string'):
+def gen_func(maxVal=10, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
     c = random.randint(1, maxVal)
@@ -34,5 +34,5 @@ def compareFractionsFunc(maxVal=10, format='string'):
         return a, b, c, d, solution
 
 
-compare_fractions = Generator("Compare Fractions", 44, compareFractionsFunc,
+compare_fractions = Generator("Compare Fractions", 44, gen_func,
                               ["maxVal=10"])

mathgenerator/funcs/basic_math/complex_division.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def complexDivisionFunc(maxRes=99, maxDivid=99, format='string'):
+def gen_func(maxRes=99, maxDivid=99, format='string'):
     a = random.randint(0, maxDivid)
     b = random.randint(1, min(maxRes, maxDivid))
     c = a / b
@@ -16,5 +16,5 @@ def complexDivisionFunc(maxRes=99, maxDivid=99, format='string'):
         return a, b, c
 
 
-complex_division = Generator("Complex Division", 13, complexDivisionFunc,
+complex_division = Generator("Complex Division", 13, gen_func,
                              ["maxRes=99", "maxDivid=99"])

mathgenerator/funcs/basic_math/cube_root.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def cubeRootFunc(minNo=1, maxNo=1000, format='string'):
+def gen_func(minNo=1, maxNo=1000, format='string'):
     b = random.randint(minNo, maxNo)
     a = b**(1 / 3)
 
@@ -13,4 +13,4 @@ def cubeRootFunc(minNo=1, maxNo=1000, format='string'):
         return b, a
 
 
-cube_root = Generator("Cube Root", 47, cubeRootFunc, ["minNo=1", "maxNo=1000"])
+cube_root = Generator("Cube Root", 47, gen_func, ["minNo=1", "maxNo=1000"])

mathgenerator/funcs/basic_math/divide_fractions.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def divideFractionsFunc(maxVal=10, format='string'):
+def gen_func(maxVal=10, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
 
@@ -44,5 +44,5 @@ def divideFractionsFunc(maxVal=10, format='string'):
         return a, b, c, d, x
 
 
-divide_fractions = Generator("Fraction Division", 16, divideFractionsFunc,
+divide_fractions = Generator("Fraction Division", 16, gen_func,
                              ["maxVal=10"])

mathgenerator/funcs/basic_math/division.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def divisionToIntFunc(maxA=25, maxB=25, format='string'):
+def gen_func(maxA=25, maxB=25, format='string'):
     a = random.randint(1, maxA)
     b = random.randint(1, maxB)
 
@@ -18,4 +18,4 @@ def divisionToIntFunc(maxA=25, maxB=25, format='string'):
         return divisor, dividend, quotient
 
 
-division = Generator("Division", 3, divisionToIntFunc, ["maxA=25", "maxB=25"])
+division = Generator("Division", 3, gen_func, ["maxA=25", "maxB=25"])

mathgenerator/funcs/basic_math/exponentiation.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def exponentiationFunc(maxBase=20, maxExpo=10, format='string'):
+def gen_func(maxBase=20, maxExpo=10, format='string'):
     base = random.randint(1, maxBase)
     expo = random.randint(1, maxExpo)
 
@@ -13,5 +13,5 @@ def exponentiationFunc(maxBase=20, maxExpo=10, format='string'):
         return base, expo, base**expo
 
 
-exponentiation = Generator("Exponentiation", 53, exponentiationFunc,
+exponentiation = Generator("Exponentiation", 53, gen_func,
                            ["maxBase=20", "maxExpo=10"])

mathgenerator/funcs/basic_math/factorial.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def factorialFunc(maxInput=6, format='string'):
+def gen_func(maxInput=6, format='string'):
     a = random.randint(0, maxInput)
     n = a
     b = 1
@@ -17,4 +17,4 @@ def factorialFunc(maxInput=6, format='string'):
         return a, b
 
 
-factorial = Generator("Factorial", 31, factorialFunc, ["maxInput=6"])
+factorial = Generator("Factorial", 31, gen_func, ["maxInput=6"])

mathgenerator/funcs/basic_math/fraction_multiplication.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def multiplyFractionsFunc(maxVal=10, format='string'):
+def gen_func(maxVal=10, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
     c = random.randint(1, maxVal)
@@ -41,4 +41,4 @@ def multiplyFractionsFunc(maxVal=10, format='string'):
 
 
 fraction_multiplication = Generator("Fraction Multiplication", 28,
-                                    multiplyFractionsFunc, ["maxVal=10"])
+                                    gen_func, ["maxVal=10"])

mathgenerator/funcs/basic_math/is_prime.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def isprime(max_num=100, format='string'):
+def gen_func(max_num=100, format='string'):
     a = random.randint(2, max_num)
     problem = f"Is {a} prime?"
     if a == 2:
@@ -24,4 +24,4 @@ def isprime(max_num=100, format='string'):
         return a, solution
 
 
-is_prime = Generator('isprime', 90, isprime, ["max_num=100"])
+is_prime = Generator('isprime', 90, gen_func, ["max_num=100"])

mathgenerator/funcs/basic_math/multiplication.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def multiplicationFunc(maxMulti=12, format='string'):
+def gen_func(maxMulti=12, format='string'):
     a = random.randint(0, maxMulti)
     b = random.randint(0, maxMulti)
     c = a * b
@@ -17,5 +17,5 @@ def multiplicationFunc(maxMulti=12, format='string'):
         return a, b, c
 
 
-multiplication = Generator("Multiplication", 2, multiplicationFunc,
+multiplication = Generator("Multiplication", 2, gen_func,
                            ["maxMulti=12"])

mathgenerator/funcs/basic_math/percentage.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def percentageFunc(maxValue=99, maxpercentage=99, format='string'):
+def gen_func(maxValue=99, maxpercentage=99, format='string'):
     a = random.randint(1, maxpercentage)
     b = random.randint(1, maxValue)
     problem = f"What is {a}% of {b}?"
@@ -17,5 +17,5 @@ def percentageFunc(maxValue=99, maxpercentage=99, format='string'):
         return a, b, formatted_float
 
 
-percentage = Generator("Percentage of a number", 80, percentageFunc,
+percentage = Generator("Percentage of a number", 80, gen_func,
                        ["maxValue=99", "maxpercentage=99"])

mathgenerator/funcs/basic_math/power_of_powers.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def powerOfPowersFunc(maxBase=50, maxPower=10, format='string'):
+def gen_func(maxBase=50, maxPower=10, format='string'):
     base = random.randint(1, maxBase)
     power1 = random.randint(1, maxPower)
     power2 = random.randint(1, maxPower)
@@ -20,5 +20,5 @@ def powerOfPowersFunc(maxBase=50, maxPower=10, format='string'):
         return base, power1, power2, base, step
 
 
-power_of_powers = Generator("Power of Powers", 97, powerOfPowersFunc,
+power_of_powers = Generator("Power of Powers", 97, gen_func,
                             ["maxBase=50", "maxPower=10"])

mathgenerator/funcs/basic_math/square.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def squareFunc(maxSquareNum=20, format='string'):
+def gen_func(maxSquareNum=20, format='string'):
     a = random.randint(1, maxSquareNum)
     b = a * a
 
@@ -17,4 +17,4 @@ def squareFunc(maxSquareNum=20, format='string'):
         return a, b
 
 
-square = Generator("Square", 8, squareFunc, ["maxSquareNum=20"])
+square = Generator("Square", 8, gen_func, ["maxSquareNum=20"])

mathgenerator/funcs/basic_math/square_root.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def squareRootFunc(minNo=1, maxNo=12, format='string'):
+def gen_func(minNo=1, maxNo=12, format='string'):
     b = random.randint(minNo, maxNo)
     a = b * b
 
@@ -17,5 +17,5 @@ def squareRootFunc(minNo=1, maxNo=12, format='string'):
         return a, b
 
 
-square_root = Generator("Square Root", 6, squareRootFunc,
+square_root = Generator("Square Root", 6, gen_func,
                         ["minNo=1", "maxNo=12"])

mathgenerator/funcs/basic_math/subtraction.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def subtractionFunc(maxMinuend=99, maxDiff=99, format='string'):
+def gen_func(maxMinuend=99, maxDiff=99, format='string'):
     a = random.randint(0, maxMinuend)
     b = random.randint(max(0, (a - maxDiff)), a)
     c = a - b
@@ -16,5 +16,5 @@ def subtractionFunc(maxMinuend=99, maxDiff=99, format='string'):
         return a, b, c
 
 
-subtraction = Generator("Subtraction", 1, subtractionFunc,
+subtraction = Generator("Subtraction", 1, gen_func,
                         ["maxMinuend=99", "maxDiff=99"])

mathgenerator/funcs/calculus/definite_integral.py

@@ -3,7 +3,7 @@ import scipy
 from scipy.integrate import quad
 
 
-def definiteIntegralFunc(max_coeff=100, format='string'):
+def gen_func(max_coeff=100, format='string'):
     def integrand(x, a, b, c):
         return a * x**2 + b * x + c
 
@@ -26,4 +26,4 @@ def definiteIntegralFunc(max_coeff=100, format='string'):
 
 
 definite_integral = Generator("Definite Integral of Quadratic Equation", 89,
-                              definiteIntegralFunc, ["max_coeff=100"])
+                              gen_func, ["max_coeff=100"])

mathgenerator/funcs/calculus/differentiation.py

@@ -34,7 +34,7 @@ def genDifferentiationProblem(diff_lvl=2):
     return problem
 
 
-def differentiationFunc(diff_lvl=2, format='string'):
+def gen_func(diff_lvl=2, format='string'):
     if diff_lvl < 1 or diff_lvl > 4:
         print("diff_lvl not supported")
         return None
@@ -53,5 +53,5 @@ def differentiationFunc(diff_lvl=2, format='string'):
         return problem, solution
 
 
-differentiation = Generator("Differentiation", 88, differentiationFunc,
+differentiation = Generator("Differentiation", 88, gen_func,
                             ["diff_lvl=2"])

mathgenerator/funcs/calculus/power_rule_differentiation.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def powerRuleDifferentiationFunc(maxCoef=10,
+def gen_func(maxCoef=10,
              maxExp=10,
              maxTerms=5,
              format='string'):
@@ -28,5 +28,5 @@ def powerRuleDifferentiationFunc(maxCoef=10,
 
 
 power_rule_differentiation = Generator(
-    "Power Rule Differentiation", 7, powerRuleDifferentiationFunc,
+    "Power Rule Differentiation", 7, gen_func,
     ["maxCoef=10", "maxExp=10", "maxTerms=5"])

mathgenerator/funcs/calculus/power_rule_integration.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def powerRuleIntegrationFunc(maxCoef=10,
+def gen_func(maxCoef=10,
              maxExp=10,
              maxTerms=5,
              format='string'):
@@ -31,5 +31,5 @@ def powerRuleIntegrationFunc(maxCoef=10,
 
 
 power_rule_integration = Generator("Power Rule Integration", 48,
-                                   powerRuleIntegrationFunc,
+                                   gen_func,
                                    ["maxCoef=10", "maxExp=10", "maxTerms=5"])

mathgenerator/funcs/calculus/stationary_points.py

@@ -2,7 +2,7 @@ from .__init__ import *
 import sympy
 
 
-def stationaryPointsFunc(maxExp=3, maxCoef=10, format='string'):
+def gen_func(maxExp=3, maxCoef=10, format='string'):
     while True:
         x = sympy.symbols('x')
         problem = 0
@@ -24,5 +24,5 @@ def stationaryPointsFunc(maxExp=3, maxCoef=10, format='string'):
             return problem, solution
 
 
-stationary_points = Generator("Stationary Points", 110, stationaryPointsFunc,
+stationary_points = Generator("Stationary Points", 110, gen_func,
                               ["maxExp=3", "maxCoef=10"])

mathgenerator/funcs/computer_science/bcd_to_decimal.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def BCDtoDecimalFunc(maxNumber=10000, format='string'):
+def gen_func(maxNumber=10000, format='string'):
     n = random.randint(1000, maxNumber)
     binstring = ''
     while True:
@@ -26,4 +26,4 @@ def BCDtoDecimalFunc(maxNumber=10000, format='string'):
 
 
 bcd_to_decimal = Generator("Binary Coded Decimal to Integer", 91,
-                           BCDtoDecimalFunc, ["maxNumber=10000"])
+                           gen_func, ["maxNumber=10000"])

mathgenerator/funcs/computer_science/binary_2s_complement.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def binary2sComplementFunc(maxDigits=10, format='string'):
+def gen_func(maxDigits=10, format='string'):
     digits = random.randint(1, maxDigits)
     question = ''.join([str(random.randint(0, 1))
                         for i in range(digits)]).lstrip('0')
@@ -34,4 +34,4 @@ def binary2sComplementFunc(maxDigits=10, format='string'):
 
 
 binary_2s_complement = Generator("Binary 2's Complement", 73,
-                                 binary2sComplementFunc, ["maxDigits=10"])
+                                 gen_func, ["maxDigits=10"])

mathgenerator/funcs/computer_science/binary_complement_1s.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def binaryComplement1sFunc(maxDigits=10, format='string'):
+def gen_func(maxDigits=10, format='string'):
     question = ''
     answer = ''
 
@@ -20,4 +20,4 @@ def binaryComplement1sFunc(maxDigits=10, format='string'):
 
 
 binary_complement_1s = Generator("Binary Complement 1s", 4,
-                                 binaryComplement1sFunc, ["maxDigits=10"])
+                                 gen_func, ["maxDigits=10"])

mathgenerator/funcs/computer_science/binary_to_decimal.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def binaryToDecimalFunc(max_dig=10, format='string'):
+def gen_func(max_dig=10, format='string'):
     problem = ''
 
     for i in range(random.randint(1, max_dig)):
@@ -17,5 +17,5 @@ def binaryToDecimalFunc(max_dig=10, format='string'):
         return problem, solution
 
 
-binary_to_decimal = Generator("Binary to Decimal", 15, binaryToDecimalFunc,
+binary_to_decimal = Generator("Binary to Decimal", 15, gen_func,
                               ["max_dig=10"])

mathgenerator/funcs/computer_science/binary_to_hex.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def binaryToHexFunc(max_dig=10, format='string'):
+def gen_func(max_dig=10, format='string'):
     problem = ''
     for i in range(random.randint(1, max_dig)):
         temp = str(random.randint(0, 1))
@@ -16,5 +16,5 @@ def binaryToHexFunc(max_dig=10, format='string'):
         return problem, solution
 
 
-binary_to_hex = Generator("Binary to Hexidecimal", 64, binaryToHexFunc,
+binary_to_hex = Generator("Binary to Hexidecimal", 64, gen_func,
                           ["max_dig=10"])

mathgenerator/funcs/computer_science/decimal_to_bcd.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def DecimalToBCDFunc(maxNumber=10000, format='string'):
+def gen_func(maxNumber=10000, format='string'):
     n = random.randint(1000, maxNumber)
     x = n
     # binstring = ''
@@ -22,4 +22,4 @@ def DecimalToBCDFunc(maxNumber=10000, format='string'):
 
 
 decimal_to_bcd = Generator("Decimal to Binary Coded Decimal", 103,
-                           DecimalToBCDFunc, ["maxNumber=10000"])
+                           gen_func, ["maxNumber=10000"])

mathgenerator/funcs/computer_science/decimal_to_binary.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def DecimalToBinaryFunc(max_dec=99, format='string'):
+def gen_func(max_dec=99, format='string'):
     a = random.randint(1, max_dec)
     b = bin(a).replace("0b", "")
 
@@ -15,5 +15,5 @@ def DecimalToBinaryFunc(max_dec=99, format='string'):
         return a, str(b)
 
 
-decimal_to_binary = Generator("Decimal to Binary", 14, DecimalToBinaryFunc,
+decimal_to_binary = Generator("Decimal to Binary", 14, gen_func,
                               ["max_dec=99"])

mathgenerator/funcs/computer_science/decimal_to_hexadeci.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def deciToHexaFunc(max_dec=1000, format='string'):
+def gen_func(max_dec=1000, format='string'):
     a = random.randint(0, max_dec)
     b = hex(a)
 
@@ -15,5 +15,5 @@ def deciToHexaFunc(max_dec=1000, format='string'):
         return a, str(b)
 
 
-decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, deciToHexaFunc,
+decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, gen_func,
                                 ["max_dec=1000"])

mathgenerator/funcs/computer_science/decimal_to_octal.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def decimalToOctalFunc(maxDecimal=4096, format='string'):
+def gen_func(maxDecimal=4096, format='string'):
     x = random.randint(0, maxDecimal)
     problem = "The decimal number " + str(x) + " in Octal is: "
     solution = oct(x)
@@ -15,4 +15,4 @@ def decimalToOctalFunc(maxDecimal=4096, format='string'):
 
 
 decimal_to_octal = Generator("Converts decimal to octal", 84,
-                             decimalToOctalFunc, ["maxDecimal=4096"])
+                             gen_func, ["maxDecimal=4096"])

mathgenerator/funcs/computer_science/fibonacci_series.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def fibonacciSeriesFunc(minNo=1, format='string'):
+def gen_func(minNo=1, format='string'):
     n = random.randint(minNo, 20)
 
     def createFibList(n):
@@ -26,5 +26,5 @@ def fibonacciSeriesFunc(minNo=1, format='string'):
         return n, fibList
 
 
-fibonacci_series = Generator("Fibonacci Series", 56, fibonacciSeriesFunc,
+fibonacci_series = Generator("Fibonacci Series", 56, gen_func,
                              ["minNo=1"])

mathgenerator/funcs/computer_science/modulo_division.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def moduloFunc(maxRes=99, maxModulo=99, format='string'):
+def gen_func(maxRes=99, maxModulo=99, format='string'):
     a = random.randint(0, maxModulo)
     b = random.randint(0, min(maxRes, maxModulo))
     c = a % b if b != 0 else 0
@@ -16,5 +16,5 @@ def moduloFunc(maxRes=99, maxModulo=99, format='string'):
         return a, b, c
 
 
-modulo_division = Generator("Modulo Division", 5, moduloFunc,
+modulo_division = Generator("Modulo Division", 5, gen_func,
                             ["maxRes=99", "maxModulo=99"])

mathgenerator/funcs/computer_science/nth_fibonacci_number.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def nthFibonacciNumberFunc(maxN=100, format='string'):
+def gen_func(maxN=100, format='string'):
     golden_ratio = (1 + math.sqrt(5)) / 2
     n = random.randint(1, maxN)
     problem = f"What is the {n}th Fibonacci number?"
@@ -18,4 +18,4 @@ def nthFibonacciNumberFunc(maxN=100, format='string'):
 
 
 nth_fibonacci_number = Generator("nth Fibonacci number", 62,
-                                 nthFibonacciNumberFunc, ["maxN=100"])
+                                 gen_func, ["maxN=100"])

mathgenerator/funcs/geometry/angle_btw_vectors.py

@@ -2,7 +2,7 @@ from .__init__ import *
 import math
 
 
-def angleBtwVectorsFunc(maxEltAmt=20, format='string'):
+def gen_func(maxEltAmt=20, format='string'):
     s = 0
     v1 = [
         round(random.uniform(0, 1000), 2)
@@ -34,4 +34,4 @@ def angleBtwVectorsFunc(maxEltAmt=20, format='string'):
 
 
 angle_btw_vectors = Generator("Angle between 2 vectors", 70,
-                              angleBtwVectorsFunc, ["maxEltAmt=20"])
+                              gen_func, ["maxEltAmt=20"])

mathgenerator/funcs/geometry/angle_regular_polygon.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def regularPolygonAngleFunc(minVal=3, maxVal=20, format='string'):
+def gen_func(minVal=3, maxVal=20, format='string'):
     sideNum = random.randint(minVal, maxVal)
     problem = f"Find the angle of a regular polygon with {sideNum} sides"
 
@@ -17,5 +17,5 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20, format='string'):
 
 
 angle_regular_polygon = Generator("Angle of a Regular Polygon", 29,
-                                  regularPolygonAngleFunc,
+                                  gen_func,
                                   ["minVal=3", "maxVal=20"])

mathgenerator/funcs/geometry/arc_length.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def arclengthFunc(maxRadius=49, maxAngle=359, format='string'):
+def gen_func(maxRadius=49, maxAngle=359, format='string'):
     radius = random.randint(1, maxRadius)
     angle = random.randint(1, maxAngle)
     problem = f"Given radius, {radius} and angle, {angle}. Find the arc length of the angle."
@@ -19,5 +19,5 @@ def arclengthFunc(maxRadius=49, maxAngle=359, format='string'):
         return radius, angle, formatted_float
 
 
-arc_length = Generator("Arc length of Angle", 108, arclengthFunc,
+arc_length = Generator("Arc length of Angle", 108, gen_func,
                        ["maxRadius=49", "maxAngle=359"])

mathgenerator/funcs/geometry/area_of_circle.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def areaCircle(maxRadius=100, format='string'):
+def gen_func(maxRadius=100, format='string'):
     r = random.randint(0, maxRadius)
     pi = 22 / 7
     area = pi * r * r
@@ -15,5 +15,5 @@ def areaCircle(maxRadius=100, format='string'):
         return r, area
 
 
-area_of_circle = Generator("Area of Circle", 112, areaCircle,
+area_of_circle = Generator("Area of Circle", 112, gen_func,
                            ["maxRadius=100"])

mathgenerator/funcs/geometry/area_of_triangle.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20, format='string'):
+def gen_func(maxA=20, maxB=20, maxC=20, format='string'):
     a = random.randint(1, maxA)
     b = random.randint(1, maxB)
     c = random.randint(1, maxC)
@@ -20,5 +20,5 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20, format='string'):
         return a, b, c, area
 
 
-area_of_triangle = Generator("Area of Triangle", 18, areaOfTriangleFunc,
+area_of_triangle = Generator("Area of Triangle", 18, gen_func,
                              ["maxA=20", "maxB=20", "maxC=20"])

mathgenerator/funcs/geometry/basic_trigonometry.py

@@ -4,7 +4,7 @@ import math
 
 
 # Handles degrees in quadrant one
-def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90],
+def gen_func(angles=[0, 30, 45, 60, 90],
                           functions=["sin", "cos", "tan"],
                           format='string'):
     angle = random.choice(angles)
@@ -35,5 +35,5 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90],
 
 
 basic_trigonometry = Generator(
-    "Trigonometric Values", 57, basicTrigonometryFunc,
+    "Trigonometric Values", 57, gen_func,
     ["angles=[0, 30, 45, 60, 90]", "functions=['sin', 'cos', 'tan']"])

mathgenerator/funcs/geometry/circumference.py

@@ -2,7 +2,7 @@ from .__init__ import *
 import math
 
 
-def circumferenceCircle(maxRadius=100, format='string'):
+def gen_func(maxRadius=100, format='string'):
     r = random.randint(0, maxRadius)
     circumference = 2 * math.pi * r
 
@@ -15,5 +15,5 @@ def circumferenceCircle(maxRadius=100, format='string'):
         return r, circumference
 
 
-circumference = Generator("Circumference", 104, circumferenceCircle,
+circumference = Generator("Circumference", 104, gen_func,
                           ["maxRadius=100"])

mathgenerator/funcs/geometry/curved_surface_area_cylinder.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def curvedSurfaceAreaCylinderFunc(maxRadius=49, maxHeight=99, format='string'):
+def gen_func(maxRadius=49, maxHeight=99, format='string'):
     r = random.randint(1, maxRadius)
     h = random.randint(1, maxHeight)
     csa = float(2 * math.pi * r * h)
@@ -18,5 +18,5 @@ def curvedSurfaceAreaCylinderFunc(maxRadius=49, maxHeight=99, format='string'):
 
 
 curved_surface_area_cylinder = Generator("Curved surface area of a cylinder",
-                                         95, curvedSurfaceAreaCylinderFunc,
+                                         95, gen_func,
                                          ["maxRadius=49", "maxHeight=99"])

mathgenerator/funcs/geometry/degree_to_rad.py

@@ -2,7 +2,7 @@ from .__init__ import *
 from numpy import pi
 
 
-def degreeToRadFunc(max_deg=360, format='string'):
+def gen_func(max_deg=360, format='string'):
     a = random.randint(0, max_deg)
     b = (pi * a) / 180
     b = round(b, 2)
@@ -17,5 +17,5 @@ def degreeToRadFunc(max_deg=360, format='string'):
         return a, b
 
 
-degree_to_rad = Generator("Degrees to Radians", 86, degreeToRadFunc,
+degree_to_rad = Generator("Degrees to Radians", 86, gen_func,
                           ["max_deg=360"])

mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def fourthAngleOfQuadriFunc(maxAngle=180, format='string'):
+def gen_func(maxAngle=180, format='string'):
     angle1 = random.randint(1, maxAngle)
     angle2 = random.randint(1, 240 - angle1)
     angle3 = random.randint(1, 340 - (angle1 + angle2))
@@ -20,5 +20,5 @@ def fourthAngleOfQuadriFunc(maxAngle=180, format='string'):
 
 
 fourth_angle_of_quadrilateral = Generator("Fourth Angle of Quadrilateral", 49,
-                                          fourthAngleOfQuadriFunc,
+                                          gen_func,
                                           ["maxAngle=180"])

mathgenerator/funcs/geometry/perimeter_of_polygons.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def perimeterOfPolygons(maxSides=12, maxLength=120, format='string'):
+def gen_func(maxSides=12, maxLength=120, format='string'):
     size_of_sides = random.randint(3, maxSides)
     sides = []
     for x in range(size_of_sides):
@@ -21,5 +21,5 @@ def perimeterOfPolygons(maxSides=12, maxLength=120, format='string'):
 
 
 perimeter_of_polygons = Generator("Perimeter of Polygons", 96,
-                                  perimeterOfPolygons,
+                                  gen_func,
                                   ["maxSides=12", "maxLength=120"])

mathgenerator/funcs/geometry/pythagorean_theorem.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def pythagoreanTheoremFunc(maxLength=20, format='string'):
+def gen_func(maxLength=20, format='string'):
     a = random.randint(1, maxLength)
     b = random.randint(1, maxLength)
     c = (a**2 + b**2)**0.5
@@ -17,4 +17,4 @@ def pythagoreanTheoremFunc(maxLength=20, format='string'):
 
 
 pythagorean_theorem = Generator("Pythagorean Theorem", 25,
-                                pythagoreanTheoremFunc, ["maxLength=20"])
+                                gen_func, ["maxLength=20"])

mathgenerator/funcs/geometry/radian_to_deg.py

@@ -2,7 +2,7 @@ from .__init__ import *
 from numpy import pi
 
 
-def radianToDegFunc(max_rad=3, format='string'):
+def gen_func(max_rad=3, format='string'):
     # max_rad is supposed to be pi but random can't handle non-integer
     a = random.randint(0, max_rad)
     b = (180 * a) / pi
@@ -18,5 +18,5 @@ def radianToDegFunc(max_rad=3, format='string'):
         return a, b
 
 
-radian_to_deg = Generator("Radians to Degrees", 87, radianToDegFunc,
+radian_to_deg = Generator("Radians to Degrees", 87, gen_func,
                           ["max_rad=3"])

mathgenerator/funcs/geometry/sector_area.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def sectorAreaFunc(maxRadius=49, maxAngle=359, format='string'):
+def gen_func(maxRadius=49, maxAngle=359, format='string'):
     r = random.randint(1, maxRadius)
     a = random.randint(1, maxAngle)
     secArea = float((a / 360) * math.pi * r * r)
@@ -17,5 +17,5 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359, format='string'):
         return r, a, formatted_float
 
 
-sector_area = Generator("Area of a Sector", 75, sectorAreaFunc,
+sector_area = Generator("Area of a Sector", 75, gen_func,
                         ["maxRadius=49", "maxAngle=359"])

mathgenerator/funcs/geometry/sum_of_polygon_angles.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def sumOfAnglesOfPolygonFunc(maxSides=12, format='string'):
+def gen_func(maxSides=12, format='string'):
     side_count = random.randint(3, maxSides)
     sum = (side_count - 2) * 180
 
@@ -15,4 +15,4 @@ def sumOfAnglesOfPolygonFunc(maxSides=12, format='string'):
 
 
 sum_of_polygon_angles = Generator("Sum of Angles of Polygon", 58,
-                                  sumOfAnglesOfPolygonFunc, ["maxSides=12"])
+                                  gen_func, ["maxSides=12"])

mathgenerator/funcs/geometry/surface_area_cone.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m', format='string'):
+def gen_func(maxRadius=20, maxHeight=50, unit='m', format='string'):
     a = random.randint(1, maxHeight)
     b = random.randint(1, maxRadius)
 
@@ -18,5 +18,5 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m', format='string'):
         return a, b, ans, unit
 
 
-surface_area_cone = Generator("Surface Area of cone", 38, surfaceAreaCone,
+surface_area_cone = Generator("Surface Area of cone", 38, gen_func,
                               ["maxRadius=20", "maxHeight=50", "unit='m'"])

mathgenerator/funcs/geometry/surface_area_cube.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def surfaceAreaCube(maxSide=20, unit='m', format='string'):
+def gen_func(maxSide=20, unit='m', format='string'):
     a = random.randint(1, maxSide)
     ans = 6 * a * a
 
@@ -15,5 +15,5 @@ def surfaceAreaCube(maxSide=20, unit='m', format='string'):
         return a, ans, unit
 
 
-surface_area_cube = Generator("Surface Area of Cube", 32, surfaceAreaCube,
+surface_area_cube = Generator("Surface Area of Cube", 32, gen_func,
                               ["maxSide=20", "unit='m'"])

mathgenerator/funcs/geometry/surface_area_cuboid.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def surfaceAreaCuboid(maxSide=20, unit='m', format='string'):
+def gen_func(maxSide=20, unit='m', format='string'):
     a = random.randint(1, maxSide)
     b = random.randint(1, maxSide)
     c = random.randint(1, maxSide)
@@ -18,4 +18,4 @@ def surfaceAreaCuboid(maxSide=20, unit='m', format='string'):
 
 
 surface_area_cuboid = Generator("Surface Area of Cuboid", 33,
-                                surfaceAreaCuboid, ["maxSide=20", "unit='m'"])
+                                gen_func, ["maxSide=20", "unit='m'"])

mathgenerator/funcs/geometry/surface_area_cylinder.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m', format='string'):
+def gen_func(maxRadius=20, maxHeight=50, unit='m', format='string'):
     a = random.randint(1, maxHeight)
     b = random.randint(1, maxRadius)
     ans = int(2 * math.pi * a * b + 2 * math.pi * b * b)
@@ -17,5 +17,5 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m', format='string'):
 
 
 surface_area_cylinder = Generator("Surface Area of Cylinder", 34,
-                                  surfaceAreaCylinder,
+                                  gen_func,
                                   ["maxRadius=20", "maxHeight=50", "unit='m'"])

mathgenerator/funcs/geometry/surface_area_sphere.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def surfaceAreaSphere(maxSide=20, unit='m', format='string'):
+def gen_func(maxSide=20, unit='m', format='string'):
     r = random.randint(1, maxSide)
     ans = 4 * math.pi * r * r
 
@@ -16,4 +16,4 @@ def surfaceAreaSphere(maxSide=20, unit='m', format='string'):
 
 
 surface_area_sphere = Generator("Surface Area of Sphere", 60,
-                                surfaceAreaSphere, ["maxSide=20", "unit='m'"])
+                                gen_func, ["maxSide=20", "unit='m'"])

mathgenerator/funcs/geometry/third_angle_of_triangle.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def thirdAngleOfTriangleFunc(maxAngle=89, format='string'):
+def gen_func(maxAngle=89, format='string'):
     angle1 = random.randint(1, maxAngle)
     angle2 = random.randint(1, maxAngle)
     angle3 = 180 - (angle1 + angle2)
@@ -16,4 +16,4 @@ def thirdAngleOfTriangleFunc(maxAngle=89, format='string'):
 
 
 third_angle_of_triangle = Generator("Third Angle of Triangle", 22,
-                                    thirdAngleOfTriangleFunc, ["maxAngle=89"])
+                                    gen_func, ["maxAngle=89"])

mathgenerator/funcs/geometry/valid_triangle.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def isTriangleValidFunc(maxSideLength=50, format='string'):
+def gen_func(maxSideLength=50, format='string'):
     sideA = random.randint(1, maxSideLength)
     sideB = random.randint(1, maxSideLength)
     sideC = random.randint(1, maxSideLength)
@@ -25,5 +25,5 @@ def isTriangleValidFunc(maxSideLength=50, format='string'):
         return sideA, sideB, sideC, exists
 
 
-valid_triangle = Generator("Triangle exists check", 19, isTriangleValidFunc,
+valid_triangle = Generator("Triangle exists check", 19, gen_func,
                            ["maxSideLength=50"])

mathgenerator/funcs/geometry/volume_cone.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def volumeCone(maxRadius=20, maxHeight=50, unit='m', format='string'):
+def gen_func(maxRadius=20, maxHeight=50, unit='m', format='string'):
     a = random.randint(1, maxHeight)
     b = random.randint(1, maxRadius)
     ans = int(math.pi * b * b * a * (1 / 3))
@@ -16,5 +16,5 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m', format='string'):
         return a, b, ans, unit
 
 
-volume_cone = Generator("Volume of cone", 39, volumeCone,
+volume_cone = Generator("Volume of cone", 39, gen_func,
                         ["maxRadius=20", "maxHeight=50", "unit='m'"])

mathgenerator/funcs/geometry/volume_cube.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def volumeCube(maxSide=20, unit='m', format='string'):
+def gen_func(maxSide=20, unit='m', format='string'):
     a = random.randint(1, maxSide)
     ans = a**3
 
@@ -15,5 +15,5 @@ def volumeCube(maxSide=20, unit='m', format='string'):
         return a, ans, unit
 
 
-volume_cube = Generator("Volum of Cube", 35, volumeCube,
+volume_cube = Generator("Volum of Cube", 35, gen_func,
                         ["maxSide=20", "unit='m'"])

mathgenerator/funcs/geometry/volume_cuboid.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def volumeCuboid(maxSide=20, unit='m', format='string'):
+def gen_func(maxSide=20, unit='m', format='string'):
     a = random.randint(1, maxSide)
     b = random.randint(1, maxSide)
     c = random.randint(1, maxSide)
@@ -17,5 +17,5 @@ def volumeCuboid(maxSide=20, unit='m', format='string'):
         return a, b, c, ans, unit
 
 
-volume_cuboid = Generator("Volume of Cuboid", 36, volumeCuboid,
+volume_cuboid = Generator("Volume of Cuboid", 36, gen_func,
                           ["maxSide=20", "unit='m'"])

mathgenerator/funcs/geometry/volume_cylinder.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def volumeCylinder(maxRadius=20, maxHeight=50, unit='m', format='string'):
+def gen_func(maxRadius=20, maxHeight=50, unit='m', format='string'):
     a = random.randint(1, maxHeight)
     b = random.randint(1, maxRadius)
     ans = int(math.pi * b * b * a)
@@ -16,5 +16,5 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m', format='string'):
         return a, b, ans, unit
 
 
-volume_cylinder = Generator("Volume of cylinder", 37, volumeCylinder,
+volume_cylinder = Generator("Volume of cylinder", 37, gen_func,
                             ["maxRadius=20", "maxHeight=50", "unit='m'"])

mathgenerator/funcs/geometry/volume_sphere.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def volumeSphereFunc(maxRadius=100, format='string'):
+def gen_func(maxRadius=100, format='string'):
     r = random.randint(1, maxRadius)
     ans = (4 * math.pi / 3) * r**3
 
@@ -15,5 +15,5 @@ def volumeSphereFunc(maxRadius=100, format='string'):
         return r, ans
 
 
-volume_sphere = Generator("Volume of Sphere", 61, volumeSphereFunc,
+volume_sphere = Generator("Volume of Sphere", 61, gen_func,
                           ["maxRadius=100"])

mathgenerator/funcs/misc/arithmetic_progression_sum.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def arithmeticProgressionSumFunc(maxd=100,
+def gen_func(maxd=100,
              maxa=100,
              maxn=100,
              format='string'):
@@ -25,5 +25,5 @@ def arithmeticProgressionSumFunc(maxd=100,
 
 
 arithmetic_progression_sum = Generator("AP Sum Calculation", 83,
-                                       arithmeticProgressionSumFunc,
+                                       gen_func,
                                        ["maxd=100", "maxa=100", "maxn=100"])

mathgenerator/funcs/misc/arithmetic_progression_term.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def arithmeticProgressionTermFunc(maxd=100,
+def gen_func(maxd=100,
              maxa=100,
              maxn=100,
              format='string'):
@@ -24,5 +24,5 @@ def arithmeticProgressionTermFunc(maxd=100,
 
 
 arithmetic_progression_term = Generator("AP Term Calculation", 82,
-                                        arithmeticProgressionTermFunc,
+                                        gen_func,
                                         ["maxd=100", "maxa=100", "maxn=100"])

mathgenerator/funcs/misc/base_conversion.py

@@ -30,7 +30,7 @@ def fromBaseTenTo(n, toBase):
 #     return int(n,fromBase)
 
 
-def baseConversionFunc(maxNum=60000, maxBase=16, format='string'):
+def gen_func(maxNum=60000, maxBase=16, format='string'):
     assert type(
         maxNum
     ) == int and maxNum >= 100 and maxNum <= 65536, "maxNum({}) must be >=100 and <=65536".format(
@@ -59,5 +59,5 @@ def baseConversionFunc(maxNum=60000, maxBase=16, format='string'):
             n, bases[1])
 
 
-base_conversion = Generator("Base Conversion", 94, baseConversionFunc,
+base_conversion = Generator("Base Conversion", 94, gen_func,
                             ["maxNum=60000", "maxBase=16"])

mathgenerator/funcs/misc/binomial_distribution.py

@@ -13,7 +13,7 @@ def newton_symbol(n, k):
     return factorial(n) / (factorial(k) * factorial(n - k))
 
 
-def binomialDistFunc(format='string'):
+def gen_func(format='string'):
     rejected_fraction = float(random.randint(30, 40)) + random.random()
     batch = random.randint(10, 20)
     rejections = random.randint(1, 9)
@@ -40,4 +40,4 @@ def binomialDistFunc(format='string'):
 
 
 binomial_distribution = Generator("Binomial distribution", 109,
-                                  binomialDistFunc, [""])
+                                  gen_func, [""])

mathgenerator/funcs/misc/celsius_to_fahrenheit.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def celsiustofahrenheitFunc(maxTemp=100, format='string'):
+def gen_func(maxTemp=100, format='string'):
     celsius = random.randint(-50, maxTemp)
     fahrenheit = (celsius * (9 / 5)) + 32
 
@@ -17,4 +17,4 @@ def celsiustofahrenheitFunc(maxTemp=100, format='string'):
 
 
 celsius_to_fahrenheit = Generator("Celsius To Fahrenheit", 81,
-                                  celsiustofahrenheitFunc, ["maxTemp=100"])
+                                  gen_func, ["maxTemp=100"])

mathgenerator/funcs/misc/common_factors.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def commonFactorsFunc(maxVal=100, format='string'):
+def gen_func(maxVal=100, format='string'):
     a = x = random.randint(1, maxVal)
     b = y = random.randint(1, maxVal)
 
@@ -29,5 +29,5 @@ def commonFactorsFunc(maxVal=100, format='string'):
         return a, b, arr
 
 
-common_factors = Generator("Common Factors", 40, commonFactorsFunc,
+common_factors = Generator("Common Factors", 40, gen_func,
                            ["maxVal=100"])

mathgenerator/funcs/misc/complex_to_polar.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def complexToPolarFunc(minRealImaginaryNum=-20,
+def gen_func(minRealImaginaryNum=-20,
                        maxRealImaginaryNum=20,
                        format='string'):
     num = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum),
@@ -23,5 +23,5 @@ def complexToPolarFunc(minRealImaginaryNum=-20,
 
 
 complex_to_polar = Generator(
-    "Complex To Polar Form", 92, complexToPolarFunc,
+    "Complex To Polar Form", 92, gen_func,
     ["minRealImaginaryNum=-20, maxRealImaginaryNum=20"])

mathgenerator/funcs/misc/decimal_to_roman_numerals.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def decimalToRomanNumeralsFunc(maxDecimal=4000, format='string'):
+def gen_func(maxDecimal=4000, format='string'):
     x = random.randint(0, maxDecimal)
     roman_dict = {
         1: "I",
@@ -42,5 +42,5 @@ def decimalToRomanNumeralsFunc(maxDecimal=4000, format='string'):
 
 
 decimal_to_roman_numerals = Generator("Converts decimal to Roman Numerals", 85,
-                                      decimalToRomanNumeralsFunc,
+                                      gen_func,
                                       ["maxDecimal=4000"])

mathgenerator/funcs/misc/euclidian_norm.py

@@ -3,7 +3,7 @@ from .__init__ import *
 import math
 
 
-def euclidianNormFunc(maxEltAmt=20, format='string'):
+def gen_func(maxEltAmt=20, format='string'):
     vec = [
         random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))
     ]
@@ -19,4 +19,4 @@ def euclidianNormFunc(maxEltAmt=20, format='string'):
 
 
 eucldian_norm = Generator("Euclidian norm or L2 norm of a vector", 69,
-                          euclidianNormFunc, ["maxEltAmt=20"])
+                          gen_func, ["maxEltAmt=20"])

mathgenerator/funcs/misc/gcd.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def gcdFunc(maxVal=20, format='string'):
+def gen_func(maxVal=20, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
     x, y = a, b
@@ -18,5 +18,5 @@ def gcdFunc(maxVal=20, format='string'):
         return a, b, x
 
 
-gcd = Generator("GCD (Greatest Common Denominator)", 10, gcdFunc,
+gcd = Generator("GCD (Greatest Common Denominator)", 10, gen_func,
                 ["maxVal=20"])

mathgenerator/funcs/misc/geometric_mean.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def geometricMeanFunc(maxValue=100, maxNum=4, format='string'):
+def gen_func(maxValue=100, maxNum=4, format='string'):
     a = random.randint(1, maxValue)
     b = random.randint(1, maxValue)
     c = random.randint(1, maxValue)
@@ -28,4 +28,4 @@ def geometricMeanFunc(maxValue=100, maxNum=4, format='string'):
 
 
 geometric_mean = Generator("Geometric Mean of N Numbers", 67,
-                           geometricMeanFunc, ["maxValue=100", "maxNum=4"])
+                           gen_func, ["maxValue=100", "maxNum=4"])

mathgenerator/funcs/misc/geometric_progression.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def geomProgrFunc(number_values=6,
+def gen_func(number_values=6,
              min_value=2,
              max_value=12,
              n_term=7,
@@ -31,6 +31,6 @@ def geomProgrFunc(number_values=6,
         return GP, n_term, sum_term, a, r, n_term, value_nth_term, sum_term, sum_till_nth_term
 
 
-geometric_progression = Generator("Geometric Progression", 66, geomProgrFunc, [
+geometric_progression = Generator("Geometric Progression", 66, gen_func, [
     "number_values=6", "min_value=2", "max_value=12", "n_term=7", "sum_term=5"
 ])

mathgenerator/funcs/misc/harmonic_mean.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def harmonicMeanFunc(maxValue=100, maxNum=4, format='string'):
+def gen_func(maxValue=100, maxNum=4, format='string'):
 
     a = random.randint(1, maxValue)
     b = random.randint(1, maxValue)
@@ -28,5 +28,5 @@ def harmonicMeanFunc(maxValue=100, maxNum=4, format='string'):
     return problem, solution
 
 
-harmonic_mean = Generator("Harmonic Mean of N Numbers", 68, harmonicMeanFunc,
+harmonic_mean = Generator("Harmonic Mean of N Numbers", 68, gen_func,
                           ["maxValue=100", "maxNum=4"])

mathgenerator/funcs/misc/hcf.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def hcfFunc(maxVal=20, format='string'):
+def gen_func(maxVal=20, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
     x, y = a, b
@@ -18,4 +18,4 @@ def hcfFunc(maxVal=20, format='string'):
         return a, b, x
 
 
-hcf = Generator("HCF (Highest Common Factor)", 51, hcfFunc, ["maxVal=20"])
+hcf = Generator("HCF (Highest Common Factor)", 51, gen_func, ["maxVal=20"])

mathgenerator/funcs/misc/is_leap_year.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def IsLeapYear(minNumber=1900, maxNumber=2099, format='string'):
+def gen_func(minNumber=1900, maxNumber=2099, format='string'):
     year = random.randint(minNumber, maxNumber)
     problem = "Year " + str(year) + " "
     if (year % 4) == 0:
@@ -27,5 +27,5 @@ def IsLeapYear(minNumber=1900, maxNumber=2099, format='string'):
         return year, ans
 
 
-is_leap_year = Generator("Leap Year or Not", 101, IsLeapYear,
+is_leap_year = Generator("Leap Year or Not", 101, gen_func,
                          ["minNumber=1900", "maxNumber=2099"])

mathgenerator/funcs/misc/lcm.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def lcmFunc(maxVal=20, format='string'):
+def gen_func(maxVal=20, format='string'):
     a = random.randint(1, maxVal)
     b = random.randint(1, maxVal)
     c = a * b
@@ -21,4 +21,4 @@ def lcmFunc(maxVal=20, format='string'):
         return a, b, d
 
 
-lcm = Generator("LCM (Least Common Multiple)", 9, lcmFunc, ["maxVal=20"])
+lcm = Generator("LCM (Least Common Multiple)", 9, gen_func, ["maxVal=20"])

mathgenerator/funcs/misc/minutes_to_hours.py

@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def minutesToHoursFunc(maxMinutes=999, format='string'):
+def gen_func(maxMinutes=999, format='string'):
     minutes = random.randint(1, maxMinutes)
     ansHours = int(minutes / 60)
     ansMinutes = minutes % 60
@@ -17,4 +17,4 @@ def minutesToHoursFunc(maxMinutes=999, format='string'):
 
 
 minutes_to_hours = Generator("Minute to Hour conversion", 102,
-                             minutesToHoursFunc, ["maxMinutes=999"])
+                             gen_func, ["maxMinutes=999"])