diff --git a/.github/ISSUE_TEMPLATE/new-generator-idea.md b/.github/ISSUE_TEMPLATE/new-generator-idea.md index b986c9f..1a08806 100644 --- a/.github/ISSUE_TEMPLATE/new-generator-idea.md +++ b/.github/ISSUE_TEMPLATE/new-generator-idea.md @@ -11,6 +11,6 @@ assignees: '' **Example Solution:** -**Further explanation:** +**Further explanation (optional):** **Would you like to be assigned to this:** diff --git a/README.md b/README.md index 042f337..23532dc 100644 --- a/README.md +++ b/README.md @@ -31,86 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 16+3= | 19 | subtraction | -| 1 | Subtraction | 96-17= | 79 | multiplication | -| 2 | Multiplication | 48*1= | 48 | multiplicationFunc) | -| 3 | Division | 83/97= | 0.8556701030927835 | division | -| 4 | Binary Complement 1s | 1110110111= | 0001001000 | binaryComplement1s | -| 5 | Modulo Division | 91%53= | 38 | binaryComplement1sFunc) | -| 6 | Square Root | sqrt(64)= | 8 | moduloDivision | -| 7 | Power Rule Differentiation | 6x^7 | 42x^6 | squareRoot | -| 8 | Square | 5^2= | 25 | powerRuleDifferentiation | -| 9 | LCM (Least Common Multiple) | LCM of 20 and 10 = | 20 | "(n*m)x^(m-1)", | -| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 20 = | 4 | powerRuleDifferentiationFunc) | -| 11 | Basic Algebra | 9x + 10 = 10 | 0 | square | -| 12 | Logarithm | log3(3) | 1 | lcm | -| 13 | Easy Division | 399/19 = | 21 | lcmFunc) | -| 14 | Decimal to Binary | Binary of 99= | 1100011 | gcd | -| 15 | Binary to Decimal | 011100 | 28 | "c", gcdFunc) | -| 16 | Fraction Division | (6/8)/(4/7) | 21/16 | basicAlgebra | -| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[3, 3], [6, 3]] = | [[6,6],[12,6]] | basicAlgebraFunc) | -| 18 | Area of Triangle | Area of triangle with side lengths: 11 11 17 = | 59.348020186018 | log | -| 19 | Triangle exists check | Does triangle with sides 23, 29 and 34 exist? | Yes | intDivision | -| 20 | Midpoint of the two point | (0,-20),(14,-16)= | (7.0,-18.0) | decimalToBinary | -| 21 | Factoring Quadratic | x^2-5x-36 | (x-9)(x+4) | DecimalToBinaryFunc) | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 32 and 60 = | 88 | binaryToDecimal | -| 23 | Solve a System of Equations in R^2 | 4x - 6y = 14, -7x - 2y = 88 | x = -10, y = -9 | BinaryToDecimalFunc) | -| 24 | Distance between 2 points | Find the distance between (14, -9) and (12, 13) | sqrt(488) | fractionDivision | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 1 = | 13.04 | divideFractionsFunc) | -| 26 | Linear Equations | -12x + 13y = -22 --1x + -7y = -18 | x = 4, y = 2 | intMatrix22Multiplication | -| 27 | Prime Factorisation | Find prime factors of 2 | [2] | 17, "k * [[a,b],[c,d]] | -| 28 | Fraction Multiplication | (8/6)*(4/10) | 8/15 | "[[k*a,k*b],[k*c,k*d]]", | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | multiplyIntToMatrix22) | -| 30 | Combinations of Objects | Number of combinations from 15 objects picked 7 at a time | 6435 | areaOfTriangle | -| 31 | Factorial | 3! = | 6 | "Area of Triangle with side lengths a, b, c | -| 32 | Surface Area of Cube | Surface area of cube with side = 14m is | 1176 m^2 | "area", areaOfTriangleFunc) | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 17m, 7m, 10m is | 718 m^2 | doesTriangleExist | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 36m and radius = 7m is | 1891 m^2 | "Does triangle with sides a, b and c exist?", | -| 35 | Volum of Cube | Volume of cube with side = 10m is | 1000 m^3 | "Yes/No", isTriangleValidFunc) | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 20m, 17m, 4m is | 1360 m^3 | midPointOfTwoPoint | -| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 1m is | 40 m^3 | "((X1,Y1),(X2,Y2)) | -| 38 | Surface Area of cone | Surface area of cone with height = 17m and radius = 9m is | 798 m^2 | MidPointOfTwoPointFunc) | -| 39 | Volume of cone | Volume of cone with height = 15m and radius = 5m is | 392 m^3 | factoring | -| 40 | Common Factors | Common Factors of 69 and 51 = | [1, 3] | "(x-x1)(x-x2)", factoringFunc) | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6/3x + 9 and y = 6x + 2 | (7/4, 25/2) | thirdAngleOfTriangle | -| 42 | Permutations | Number of Permutations from 14 objects picked 1 at a time = | 14 | "Third Angle of the triangle | -| 43 | Cross Product of 2 Vectors | [19, 17, -9] X [10, -10, -2] = | [-124, -52, -360] | thirdAngleOfTriangleFunc) | -| 44 | Compare Fractions | Which symbol represents the comparison between 10/6 and 10/8? | > | systemOfEquations | -| 45 | Simple Interest | Simple interest for a principle amount of 7091 dollars, 10% rate of interest and for a time period of 4 years is = | 2836.4 | "2x + 5y | -| 46 | Multiplication of two matrices | Multiply
28-45
6-5-64
and
-51-32
585-5
-6-8-6-7
-1-53-7
|
497373-43
-23-6551
| systemOfEquationsFunc) | -| 47 | Cube Root | cuberoot of 951 upto 2 decimal places is: | 9.83 | distance2Point | -| 48 | Power Rule Integration | 10x^1 + 10x^6 + 1x^4 + 1x^6 | (10/1)x^2 + (10/6)x^7 + (1/4)x^5 + (1/6)x^7 + c | "Find the distance between (x1,y1) and (x2,y2)", | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 15 , 191, 94 = | 60 | "sqrt(distanceSquared)", distanceTwoPointsFunc) | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 48x^2+119x+57=0 | [-0.65, -1.83] | pythagoreanTheorem | -| 51 | HCF (Highest Common Factor) | HCF of 5 and 18 = | 1 | "Pythagorean Theorem", 25, | -| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/6 | "The hypotenuse of a right triangle given the other two lengths a and b | -| 53 | Exponentiation | 17^7 = | 410338673 | "hypotenuse", pythagoreanTheoremFunc) | -| 54 | Confidence interval For sample S | The confidence interval for sample [247, 230, 236, 207, 226, 278, 221, 297, 280, 267, 240, 259, 291, 284, 242, 252, 257, 220, 260, 213, 294] with 90% confidence is | (262.13973862175516, 242.71740423538768) | # This has multiple variables whereas #23 has only x and y | -| 55 | Comparing surds | Fill in the blanks 17^(1/2) _ 3^(1/6) | > | linearEquations | -| 56 | Fibonacci Series | The Fibonacci Series of the first 14 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] | "x | -| 57 | Trigonometric Values | What is sin(90)? | 1 | primeFactors | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 7 sides = | 900 | "[b, c, d, ...]", primeFactorsFunc) | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[10, 47, 7, 37, 22, 44, 9, 30, 37, 8, 50, 29, 19, 12, 37] | The Mean is 26.533333333333335 , Standard Deviation is 214.38222222222217, Variance is 14.641797096744039 | fractionMultiplication | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 6m is | 452.3893421169302 m^2 | "(a/b)*(c/d) | -| 61 | Volume of Sphere | Volume of sphere with radius 54 m = | 659583.6608064842 m^3 | multiplyFractionsFunc) | -| 62 | nth Fibonacci number | What is the 5th Fibonacci number? | 5 | angleRegularPolygon | -| 63 | Profit or Loss Percent | Loss percent when CP = 801 and SP = 230 is: | 71.28589263420724 | "Angle of a Regular Polygon", 29, | -| 64 | Binary to Hexidecimal | 101111 | 0x2f | "Find the angle of a regular polygon with 6 sides", "120", | -| 65 | Multiplication of 2 complex numbers | (1+19j) * (-5+10j) = | (-195-85j) | regularPolygonAngleFunc) | -| 66 | Geometric Progression | For the given GP [8, 88, 968, 10648, 117128, 1288408] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 8, common ratio is 11 , 11th term is 207499396808 , sum upto 8th term is 171487104.0 | combinations | -| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 9 and 18 = | (9*18)^(1/2) = 12.727922061357855 | "Combinations of Objects", 30, | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 59 and 8 = | 2/((1/59) + (1/8)) = 14.08955223880597 | "Combinations available for picking 4 objects at a time from 6 distinct objects | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[868.2223524505417, 443.64852085459694, 828.1090462421802] is: | 1279.217986044348 | " 15", combinationsFunc) | -| 70 | Angle between 2 vectors | angle between the vectors [47.34750277983446, 802.0548522330859, 163.10760759590525, 544.7736923139344, 595.2668887448631, 781.8577226989729, 505.92984665962115, 212.21898772758718, 417.09503653850567, 498.8451357914803, 216.11050052884383, 316.85172611004697, 531.4467890864679] and [551.4845648456056, 524.0267675199452, 252.30514761182056, 256.4954536977715, 423.09002486817883, 861.6683390714214, 210.90265341510906, 918.3205871874211, 539.9315722140092, 988.4812675617247, 885.1803007416202, 566.6430154592439, 851.2210274645834] is: | NaN | factorial | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 51 and 3 = | 48 | surfaceAreaCubeGen | -| 72 | Dot Product of 2 Vectors | [4, 20, 12] . [15, 11, 9] = | 388 | "Surface area of cube with side a units is", | -| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | "b units^2", surfaceAreaCube) | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[2, 25, 60], [29, 30, 28], [23, 73, 95]]) is: | Matrix([[806/34457, 2005/34457, -1100/34457], [-2111/34457, -1190/34457, 1684/34457], [1427/34457, 429/34457, -665/34457]]) | surfaceAreaCuboidGen | -| 75 | Area of a Sector | Given radius, 28 and angle, 317. Find the area of the sector. | Area of sector = 2168.81594 | "Surface Area of Cuboid", 33, | -| 76 | Mean and Median | Given the series of numbers [67, 33, 40, 90, 81, 12, 91, 80, 5, 66]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 56.5 and Arithmetic median of this series is 66.5 | "Surface area of cuboid with sides | -| 77 | Determinant to 2x2 Matrix | Det([[10, 0], [95, 32]]) = | 320 | "d units^2", surfaceAreaCuboid) | -| 78 | Compound Interest | Compound Interest for a principle amount of 4156 dollars, 8% rate of interest and for a time period of 7 compounded monthly is = | 4156.0 | surfaceAreaCylinderGen | -| 79 | Decimal to Hexadecimal | Binary of 143= | 0x8f | "Surface Area of Cylinder", 34, | -| 80 | Percentage of a number | What is 49% of 13? | Required percentage = 6.37% | "Surface area of cylinder with height | -| 81 | Celsius To Fahrenheit | Convert 39 degrees Celsius to degrees Fahrenheit = | 102.2 | "c units^2", surfaceAreaCylinder) | +| 0 | Addition | 31+3= | 34 | addition | +| 1 | Subtraction | 69-64= | 5 | subtraction | +| 2 | Multiplication | 88*1= | 88 | multiplication | +| 3 | Division | 77/8= | 9.625 | division | +| 4 | Binary Complement 1s | 11100= | 00011 | binary_complement_1s | +| 5 | Modulo Division | 40%27= | 13 | modulo_division | +| 6 | Square Root | sqrt(121)= | 11 | square_root | +| 7 | Power Rule Differentiation | 7x^3 | 21x^2 | power_rule_differentiation | +| 8 | Square | 13^2= | 169 | square | +| 9 | LCM (Least Common Multiple) | LCM of 15 and 9 = | 45 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 4 and 20 = | 4 | gcd | +| 11 | Basic Algebra | 10x + 8 = 9 | 1/10 | basic_algebra | +| 12 | Logarithm | log3(9) | 2 | log | +| 13 | Easy Division | 54/3 = | 18 | int_division | +| 14 | Decimal to Binary | Binary of 82= | 1010010 | decimal_to_binary | +| 15 | Binary to Decimal | 11 | 3 | binary_to_decimal | +| 16 | Fraction Division | (7/9)/(9/8) | 56/81 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[3, 8], [4, 7]] = | [[15,40],[20,35]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 4 10 12 = | 18.734993995195193 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 39, 48 and 2 exist? | No | valid_triangle | +| 20 | Midpoint of the two point | (-17,18),(-10,20)= | (-13.5,19.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-16x+60 | (x-10)(x-6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 35 and 52 = | 93 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | 4x + 2y = -22, 5x + 6y = -31 | x = -5, y = -1 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (2, -19) and (7, -4) | sqrt(250) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 9 = | 15.81 | pythagorean_theorem | +| 26 | Linear Equations | 18x + -12y = -42, 9x + 7y = 161 | x = 7, y = 14 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 45 | [3, 3, 5] | prime_factors | +| 28 | Fraction Multiplication | (7/5)*(3/1) | 21/5 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 16 sides | 157.5 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 5 at a time | 2002 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 7m, 2m, 4m is | 100 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 12m and radius = 3m is | 282 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 19m is | 6859 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 8m, 9m, 10m is | 720 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 4m is | 653 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 46m and radius = 1m is | 147 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 35m and radius = 10m is | 3665 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 71 and 25 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -7x + 9 and y = 0/3x - 10 | (19/7, -10) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 20 objects picked 8 at a time = | 5079110400 | permutation | +| 43 | Cross Product of 2 Vectors | [-4, 4, -3] X [-6, 6, 14] = | [74, 74, 0] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 6/1 and 6/2? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 2266 dollars, 8% rate of interest and for a time period of 6 years is = | 1087.68 | simple_interest | +| 46 | Multiplication of two matrices | Multiply
69-16
61060
-8-6-7-9
and
9108
-2-3-4
-957
8-8-1
|
93-20-1
-206050
-69-25-80
| matrix_multiplication | +| 47 | Cube Root | cuberoot of 196 upto 2 decimal places is: | 5.81 | cube_root | +| 48 | Power Rule Integration | 6x^4 | (6/4)x^5 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 175 , 22, 60 = | 103 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 64x^2+159x+78=0 | [-0.67, -1.81] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 9 and 17 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 5 = | 4/36 | dice_sum_probability | +| 53 | Exponentiation | 18^1 = | 18 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [277, 237, 229, 258, 291, 278, 274, 242, 267, 287, 288, 293, 208, 273, 255, 259, 263, 269, 265, 210, 281, 276, 256, 238, 271, 297, 202, 252] with 95% confidence is | (269.92602102647436, 251.21683611638275) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 58^(1/2) _ 44^(1/1) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | +| 57 | Trigonometric Values | What is cos(90)? | 0 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 11 sides = | 1620 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 43, 11, 20, 7, 47, 42, 16, 37, 29, 39, 11, 36, 25, 49] | The Mean is 28.2 , Standard Deviation is 200.95999999999998, Variance is 14.17603611733548 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 4m is | 201.06192982974676 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 66 m = | 1204260.4287152681 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 96th Fibonacci number? | 51680708854858489856 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 591 and SP = 796 is: | 34.686971235194584 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 101010111 | 0x157 | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (6+16j) * (15-11j) = | (266+174j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 5, common ratio is 6 , 6th term is 38880 , sum upto 8th term is 1679615.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 64 , 71 , 42 , 69 = | (64*71*42*69)^(1/4) = 60.239890804783805 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 13 and 89 = | 2/((1/13) + (1/89)) = 22.68627450980392 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[776.6691324098483, 606.5799343351656, 285.46422221982624, 372.01270687089004, 86.18433302762118, 939.355471377651, 202.1465319226168, 932.3553335024733, 275.1276478308532, 160.88380854198425] is: | 1758.5739637031488 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [601.4612452378941, 933.4356902778246, 438.03974725076324, 281.0471724516086] and [402.0844562515671, 707.7656850759612, 547.0834759350798, 897.3106790199977] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 67 and 24 = | 43 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [12, -8, 13] . [16, -6, 19] = | 487 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of = | | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[52, 89, 11], [44, 72, 61], [17, 87, 7]]) is: | Matrix([[1601/52077, -334/156231, -4637/156231], [-81/17359, -59/52077, 896/52077], [-868/52077, 3011/156231, 172/156231]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 4 and angle, 16. Find the area of the sector. | Area of sector = 2.23402 | sector_area | +| 76 | Mean and Median | Given the series of numbers [90, 44, 84, 5, 79, 31, 78, 89, 56, 34]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 59.0 and Arithmetic median of this series is 67.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[0, 19], [73, 25]]) = | -1387 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 7422 dollars, 10% rate of interest and for a time period of 2 compounded monthly is = | 7422.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 946= | 0x3b2 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 94% of 88? | Required percentage = 82.72% | percentage | +| 81 | Celsius To Fahrenheit | Convert 14 degrees Celsius to degrees Fahrenheit = | 57.2 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 48 of the AP series: 33, 9, -15 ... | -1095 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 12 terms of the AP series: 26, 67, 108 ... | 3018.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 2394 in Octal is: | 0o4532 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 25 in Roman Numerals is: | XXV | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 9 in radians is = | 0.16 | degree_to_rad | +| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | +| 88 | Differentiation | differentiate w.r.t x : d(sec(x)+6*x^4)/dx | 24*x^3 + tan(x)*sec(x) | differentiation | diff --git a/dev-requirements.txt b/dev-requirements.txt index 7b33738..259022d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,5 @@ pytest hypothesis flake8 autopep8 -sympy \ No newline at end of file +sympy +numpy diff --git a/makeReadme.py b/makeReadme.py index f3efc3f..c17e15b 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -1,7 +1,6 @@ -# To use, paste at bottom of mathgen.py code, change line variable and remove all table rows in README.md except for the top 2 and run mathgen.py -# NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * + def array2markdown_table(string): string = string.replace("[[", "
") string = string.replace("[", "
") @@ -19,8 +18,6 @@ with open('mathgenerator/mathgen.py', 'r') as f: lines = f.readlines() allRows = [] -# get the first line of the functions in mathgen.py -line = lines.index('# Funcs_start - DO NOT REMOVE!\n') + 1 for item in wList: myGen = item[2] # NOTE: renamed 'sol' to 'solu' to make it look nicer @@ -29,20 +26,16 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - prob, solu = myGen(10, 4) + prob, solu = myGen(maxVal=10, max_dim=4) prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") prob = array2markdown_table(prob) solu = array2markdown_table(solu) - instName = lines[line] # NOTE: renamed 'def_name' to 'func_name' because it suits it more - func_name = instName[:instName.find('=')].strip() + func_name = item[3] row = [myGen.id, myGen.title, prob, solu, func_name] - print('added', item[1],'-', func_name, 'to the README.md') - line += 1 - if line > len(lines): - break + print('added', item[1], '-', func_name, 'to the README.md') allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 956697a..090e18a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,3 +1,5 @@ +import sys +import traceback genList = [] @@ -8,15 +10,20 @@ class Generator: self.generalProb = generalProb self.generalSol = generalSol self.func = func - genList.append([id, title, self]) + + (filename, line_number, function_name, text) = traceback.extract_stack()[-2] + funcname = filename[filename.rfind('/'):].strip() + funcname = funcname[1:-3] + # print(funcname) + genList.append([id, title, self, funcname]) def __str__(self): return str( self.id ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) def getGenList(): diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 7f2f7d4..9d67f91 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,92 +2,95 @@ import random import math import fractions +from ..__init__ import * + from .addition import * -from .subtractionFunc import * -from .multiplicationFunc import * -from .divisionFunc import * -from .binaryComplement1sFunc import * -from .moduloFunc import * -from .squareRootFunc import * -from .powerRuleDifferentiationFunc import * -from .squareFunc import * -from .lcmFunc import * -from .gcdFunc import * -from .basicAlgebraFunc import * -from .logFunc import * -from .divisionToIntFunc import * -from .DecimalToBinaryFunc import * -from .BinaryToDecimalFunc import * -from .divideFractionsFunc import * -from .multiplyIntToMatrix22 import * -from .areaOfTriangleFunc import * -from .isTriangleValidFunc import * -from .MidPointOfTwoPointFunc import * -from .factoringFunc import * -from .thirdAngleOfTriangleFunc import * -from .systemOfEquationsFunc import * -from .distanceTwoPointsFunc import * -from .pythagoreanTheoremFunc import * -from .linearEquationsFunc import * -from .primeFactorsFunc import * -from .multiplyFractionsFunc import * -from .regularPolygonAngleFunc import * -from .combinationsFunc import * -from .factorialFunc import * -from .surfaceAreaCube import * -from .surfaceAreaCuboid import * -from .surfaceAreaCylinder import * -from .volumeCube import * -from .volumeCuboid import * -from .volumeCylinder import * -from .surfaceAreaCone import * -from .volumeCone import * -from .commonFactorsFunc import * -from .intersectionOfTwoLinesFunc import * -from .permutationFunc import * -from .vectorCrossFunc import * -from .compareFractionsFunc import * -from .simpleInterestFunc import * -from .matrixMultiplicationFunc import * -from .cubeRootFunc import * -from .powerRuleIntegrationFunc import * -from .fourthAngleOfQuadriFunc import * -from .quadraticEquation import * -from .hcfFunc import * -from .DiceSumProbFunc import * -from .exponentiationFunc import * -from .confidenceIntervalFunc import * -from .surdsComparisonFunc import * -from .fibonacciSeriesFunc import * -from .basicTrigonometryFunc import * -from .sumOfAnglesOfPolygonFunc import * -from .dataSummaryFunc import * -from .surfaceAreaSphere import * -from .volumeSphereFunc import * -from .nthFibonacciNumberFunc import * -from .profitLossPercentFunc import * -from .binaryToHexFunc import * -from .multiplyComplexNumbersFunc import * -from .geomProgrFunc import * -from .geometricMeanFunc import * -from .harmonicMeanFunc import * -from .euclidianNormFunc import * -from .angleBtwVectorsFunc import * -from .absoluteDifferenceFunc import * -from .vectorDotFunc import * -from .binary2sComplement import * -from .matrixInversion import * -from .sectorAreaFunc import * -from .meanMedianFunc import * -from .determinantToMatrix22 import * -from .compoundInterestFunc import * -from .deciToHexaFunc import * -from .percentageFunc import * -from .celsiustofahrenheit import * -from .arithmeticProgressionTermFunc import * -from .arithmeticProgressionSumFunc import * -from .decimalToOctalFunc import * -from .decimalToRomanNumeralsFunc import * -from .degreeToRadFunc import * -from .radianToDegFunc import * +from .subtraction import * +from .multiplication import * +from .division import * +from .binary_complement_1s import * +from .modulo_division import * +from .square_root import * +from .power_rule_differentiation import * +from .square import * +from .lcm import * +from .gcd import * +from .basic_algebra import * +from .log import * +from .int_division import * +from .decimal_to_binary import * +from .binary_to_decimal import * +from .divide_fractions import * +from .multiply_int_to_22_matrix import * +from .area_of_triangle import * +from .valid_triangle import * +from .midpoint_of_two_points import * +from .factoring import * +from .third_angle_of_triangle import * +from .system_of_equations import * +from .distance_two_points import * +from .pythagorean_theorem import * +from .linear_equations import * +from .prime_factors import * +from .fraction_multiplication import * +from .angle_regular_polygon import * +from .combinations import * +from .factorial import * +from .surface_area_cube import * +from .surface_area_cuboid import * +from .surface_area_cylinder import * +from .volume_cube import * +from .volume_cuboid import * +from .volume_cylinder import * +from .surface_area_cone import * +from .volume_cone import * +from .common_factors import * +from .intersection_of_two_lines import * +from .permutation import * +from .vector_cross import * +from .compare_fractions import * +from .simple_interest import * +from .matrix_multiplication import * +from .cube_root import * +from .power_rule_integration import * +from .fourth_angle_of_quadrilateral import * +from .quadratic_equation import * +from .hcf import * +from .dice_sum_probability import * +from .exponentiation import * +from .confidence_interval import * +from .surds_comparison import * +from .fibonacci_series import * +from .basic_trigonometry import * +from .sum_of_polygon_angles import * +from .data_summary import * +from .surface_area_sphere import * +from .volume_sphere import * +from .nth_fibonacci_number import * +from .profit_loss_percent import * +from .binary_to_hex import * +from .multiply_complex_numbers import * +from .geometric_progression import * +from .geometric_mean import * +from .harmonic_mean import * +from .euclidian_norm import * +from .angle_btw_vectors import * +from .absolute_difference import * +from .vector_dot import * +from .binary_2s_complement import * +from .invert_matrix import * +from .sector_area import * +from .mean_median import * +from .int_matrix_22_determinant import * +from .compound_interest import * +from .decimal_to_hexadeci import * +from .percentage import * +from .celsius_to_fahrenheit import * +from .arithmetic_progression_term import * +from .arithmetic_progression_sum import * +from .decimal_to_octal import * +from .decimal_to_roman_numerals import * +from .degree_to_rad import * +from .radian_to_deg import * +from .differentiation import * from .definiteIntegralFunc import * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absolute_difference.py similarity index 88% rename from mathgenerator/funcs/absoluteDifferenceFunc.py rename to mathgenerator/funcs/absolute_difference.py index 755e049..fae1fb0 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absolute_difference.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): @@ -13,7 +12,7 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): return problem, solution -absoluteDifference = Generator( +absolute_difference = Generator( "Absolute difference between two numbers", 71, "Absolute difference betweeen two numbers a and b =", "|a-b|", absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/addition.py index df74496..cab6dac 100644 --- a/mathgenerator/funcs/addition.py +++ b/mathgenerator/funcs/addition.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def additionFunc(maxSum=99, maxAddend=50): diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angle_btw_vectors.py similarity index 90% rename from mathgenerator/funcs/angleBtwVectorsFunc.py rename to mathgenerator/funcs/angle_btw_vectors.py index 65ec973..f3b8a65 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angle_btw_vectors.py @@ -1,5 +1,5 @@ from .__init__ import * -from ..__init__ import Generator +import math def angleBtwVectorsFunc(maxEltAmt=20): @@ -15,14 +15,14 @@ def angleBtwVectorsFunc(maxEltAmt=20): solution = '' try: solution = str(math.acos(s / mags)) - except MathDomainError: + except ValueError: print('angleBtwVectorsFunc has some issues with math module, line 16') solution = 'NaN' # would return the answer in radians return problem, solution -angleBtwVectors = Generator( +angle_btw_vectors = Generator( "Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/angle_regular_polygon.py similarity index 86% rename from mathgenerator/funcs/regularPolygonAngleFunc.py rename to mathgenerator/funcs/angle_regular_polygon.py index a264c5a..90f2c71 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/angle_regular_polygon.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): @@ -11,7 +10,7 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): return problem, solution -angleRegularPolygon = Generator( +angle_regular_polygon = Generator( "Angle of a Regular Polygon", 29, "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/area_of_triangle.py similarity index 65% rename from mathgenerator/funcs/areaOfTriangleFunc.py rename to mathgenerator/funcs/area_of_triangle.py index c49167c..488a997 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/area_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -16,6 +15,6 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): return problem, solution -areaOfTriangle = Generator("Area of Triangle", 18, - "Area of Triangle with side lengths a, b, c = ", - "area", areaOfTriangleFunc) +area_of_triangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmetic_progression_sum.py similarity index 63% rename from mathgenerator/funcs/arithmeticProgressionSumFunc.py rename to mathgenerator/funcs/arithmetic_progression_sum.py index 294cb7f..e376c3f 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_sum.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionSum = Generator("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) +arithmetic_progression_sum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmetic_progression_term.py similarity index 62% rename from mathgenerator/funcs/arithmeticProgressionTermFunc.py rename to mathgenerator/funcs/arithmetic_progression_term.py index e549c18..8468921 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_term.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionTerm = Generator("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ...", - "a-n", arithmeticProgressionTermFunc) +arithmetic_progression_term = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basic_algebra.py similarity index 79% rename from mathgenerator/funcs/basicAlgebraFunc.py rename to mathgenerator/funcs/basic_algebra.py index 504ac41..0626cf8 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basic_algebra.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): @@ -26,5 +25,5 @@ def basicAlgebraFunc(maxVariable=10): return problem, solution -basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", - basicAlgebraFunc) +basic_algebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basic_trigonometry.py similarity index 81% rename from mathgenerator/funcs/basicTrigonometryFunc.py rename to mathgenerator/funcs/basic_trigonometry.py index da6d97c..2992034 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basic_trigonometry.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator # Handles degrees in quadrant one @@ -26,5 +25,5 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], return problem, solution -basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", - "ans", basicTrigonometryFunc) +basic_trigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary_2s_complement.py similarity index 76% rename from mathgenerator/funcs/binary2sComplement.py rename to mathgenerator/funcs/binary_2s_complement.py index 891990d..f053020 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary_2s_complement.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): @@ -29,6 +28,6 @@ def binary2sComplementFunc(maxDigits=10): return problem, solution -binary2sComplement = Generator("Binary 2's Complement", 73, - "2's complement of 11010110 =", "101010", - binary2sComplementFunc) +binary_2s_complement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binary_complement_1s.py similarity index 68% rename from mathgenerator/funcs/binaryComplement1sFunc.py rename to mathgenerator/funcs/binary_complement_1s.py index f748af5..da6c481 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binary_complement_1s.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): @@ -16,5 +15,5 @@ def binaryComplement1sFunc(maxDigits=10): return problem, solution -binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", - binaryComplement1sFunc) +binary_complement_1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/binary_to_decimal.py similarity index 53% rename from mathgenerator/funcs/BinaryToDecimalFunc.py rename to mathgenerator/funcs/binary_to_decimal.py index 01fb780..f7e0aa8 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/binary_to_decimal.py @@ -1,8 +1,7 @@ from .__init__ import * -from ..__init__ import Generator -def BinaryToDecimalFunc(max_dig=10): +def binaryToDecimalFunc(max_dig=10): problem = '' for i in range(random.randint(1, max_dig)): @@ -13,5 +12,5 @@ def BinaryToDecimalFunc(max_dig=10): return problem, solution -binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", - BinaryToDecimalFunc) +binary_to_decimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + binaryToDecimalFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binary_to_hex.py similarity index 62% rename from mathgenerator/funcs/binaryToHexFunc.py rename to mathgenerator/funcs/binary_to_hex.py index 12dbe7f..77b03b1 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binary_to_hex.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryToHexFunc(max_dig=10): @@ -12,5 +11,5 @@ def binaryToHexFunc(max_dig=10): return problem, solution -binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", - binaryToHexFunc) +binary_to_hex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsius_to_fahrenheit.py similarity index 63% rename from mathgenerator/funcs/celsiustofahrenheit.py rename to mathgenerator/funcs/celsius_to_fahrenheit.py index 0e66be8..45122d0 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsius_to_fahrenheit.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def celsiustofahrenheitFunc(maxTemp=100): @@ -10,5 +9,5 @@ def celsiustofahrenheitFunc(maxTemp=100): return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, - "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) +celsius_to_fahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinations.py similarity index 95% rename from mathgenerator/funcs/combinationsFunc.py rename to mathgenerator/funcs/combinations.py index ca42532..60c7b41 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def combinationsFunc(maxlength=20): diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/common_factors.py similarity index 70% rename from mathgenerator/funcs/commonFactorsFunc.py rename to mathgenerator/funcs/common_factors.py index 929c48e..a783909 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/common_factors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def commonFactorsFunc(maxVal=100): @@ -25,6 +24,6 @@ def commonFactorsFunc(maxVal=100): return problem, solution -commonFactors = Generator("Common Factors", 40, - "Common Factors of {a} and {b} = ", "[c, d, ...]", - commonFactorsFunc) +common_factors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compare_fractions.py similarity index 92% rename from mathgenerator/funcs/compareFractionsFunc.py rename to mathgenerator/funcs/compare_fractions.py index 19ba5c9..53fe7a0 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compare_fractions.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def compareFractionsFunc(maxVal=10): @@ -27,7 +26,7 @@ def compareFractionsFunc(maxVal=10): return problem, solution -compareFractions = Generator( +compare_fractions = Generator( "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/ 0.5: + power *= -1 + problem += str(coeff) + '*x^' + '(' + str(power) + ')' + else: + problem += str(coeff) + '*x^' + str(power) + if diff_lvl == 2: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(x)' + '+' + genDifferentiationProblem(1) + if diff_lvl == 3: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(' + genDifferentiationProblem(1) + ')' + if diff_lvl == 4: + operator = random.choice(('/', '*')) + problem = '(' + genDifferentiationProblem(2) + ')' + \ + operator + '(' + genDifferentiationProblem(3) + ')' + + return problem + + +def differentiationFunc(diff_lvl=2): + if diff_lvl < 1 or diff_lvl > 4: + print("diff_lvl not supported") + return None + problem = genDifferentiationProblem(diff_lvl) + + x = sympy.symbols('x') + solution = str(sympy.diff(problem.replace('^', '**'), x)) + solution = solution.replace('**', '^') + problem = f"differentiate w.r.t x : d({problem})/dx" + + return problem, solution + + +differentiation = Generator( + "Differentiation", 88, "differentiate w.r.t x : d(f(x))/dx", "g(x)", differentiationFunc) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distance_two_points.py similarity index 68% rename from mathgenerator/funcs/distanceTwoPointsFunc.py rename to mathgenerator/funcs/distance_two_points.py index e5de6ae..6dc6b7d 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distance_two_points.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): @@ -15,6 +14,6 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): return problem, solution -distance2Point = Generator("Distance between 2 points", 24, - "Find the distance between (x1,y1) and (x2,y2)", - "sqrt(distanceSquared)", distanceTwoPointsFunc) +distance_two_points = Generator("Distance between 2 points", 24, + "Find the distance between (x1,y1) and (x2,y2)", + "sqrt(distanceSquared)", distanceTwoPointsFunc) diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divide_fractions.py similarity index 88% rename from mathgenerator/funcs/divideFractionsFunc.py rename to mathgenerator/funcs/divide_fractions.py index 6d90b77..e9a9ec4 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divide_fractions.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divideFractionsFunc(maxVal=10): @@ -33,5 +32,5 @@ def divideFractionsFunc(maxVal=10): return problem, solution -fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", +divide_fractions = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/division.py similarity index 90% rename from mathgenerator/funcs/divisionFunc.py rename to mathgenerator/funcs/division.py index a99d9f7..63e70cb 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divisionFunc(maxRes=99, maxDivid=99): diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidian_norm.py similarity index 52% rename from mathgenerator/funcs/euclidianNormFunc.py rename to mathgenerator/funcs/euclidian_norm.py index 9b66167..cfd178c 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidian_norm.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def euclidianNormFunc(maxEltAmt=20): @@ -9,6 +8,6 @@ def euclidianNormFunc(maxEltAmt=20): return problem, solution -eucldianNorm = Generator("Euclidian norm or L2 norm of a vector", 69, - "Euclidian Norm of a vector V:[v1, v2, ......., vn]", - "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc) +eucldian_norm = Generator("Euclidian norm or L2 norm of a vector", 69, + "Euclidian Norm of a vector V:[v1, v2, ......., vn]", + "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc) diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiation.py similarity index 91% rename from mathgenerator/funcs/exponentiationFunc.py rename to mathgenerator/funcs/exponentiation.py index 1b4cc0c..dd764e4 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def exponentiationFunc(maxBase=20, maxExpo=10): diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorial.py similarity index 90% rename from mathgenerator/funcs/factorialFunc.py rename to mathgenerator/funcs/factorial.py index 463d936..15d1e9d 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorial.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def factorialFunc(maxInput=6): diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoring.py similarity index 95% rename from mathgenerator/funcs/factoringFunc.py rename to mathgenerator/funcs/factoring.py index a0ef82e..170a764 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoring.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def factoringFunc(range_x1=10, range_x2=10): diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacci_series.py similarity index 91% rename from mathgenerator/funcs/fibonacciSeriesFunc.py rename to mathgenerator/funcs/fibonacci_series.py index 117befd..d81c782 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacci_series.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def fibonacciSeriesFunc(minNo=1): @@ -22,6 +21,6 @@ def fibonacciSeriesFunc(minNo=1): return problem, solution -fibonacciSeries = Generator( +fibonacci_series = Generator( "Fibonacci Series", 56, "fibonacci series of first a numbers", "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourth_angle_of_quadrilateral.py similarity index 88% rename from mathgenerator/funcs/fourthAngleOfQuadriFunc.py rename to mathgenerator/funcs/fourth_angle_of_quadrilateral.py index 871b725..1ecc9aa 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourth_angle_of_quadrilateral.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def fourthAngleOfQuadriFunc(maxAngle=180): @@ -15,7 +14,7 @@ def fourthAngleOfQuadriFunc(maxAngle=180): return problem, solution -fourthAngleOfQuadrilateral = Generator( +fourth_angle_of_quadrilateral = Generator( "Fourth Angle of Quadrilateral", 49, "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/fraction_multiplication.py similarity index 75% rename from mathgenerator/funcs/multiplyFractionsFunc.py rename to mathgenerator/funcs/fraction_multiplication.py index 39857c4..5c11940 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/fraction_multiplication.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyFractionsFunc(maxVal=10): @@ -33,6 +32,6 @@ def multiplyFractionsFunc(maxVal=10): return problem, solution -fractionMultiplication = Generator("Fraction Multiplication", 28, - "(a/b)*(c/d)=", "x/y", - multiplyFractionsFunc) +fraction_multiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcd.py similarity index 91% rename from mathgenerator/funcs/gcdFunc.py rename to mathgenerator/funcs/gcd.py index 4f271d1..ef1914b 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcd.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def gcdFunc(maxVal=20): diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometric_mean.py similarity index 78% rename from mathgenerator/funcs/geometricMeanFunc.py rename to mathgenerator/funcs/geometric_mean.py index ad80594..034ddf2 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometric_mean.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def geometricMeanFunc(maxValue=100, maxNum=4): @@ -28,6 +27,6 @@ def geometricMeanFunc(maxValue=100, maxNum=4): return problem, solution -geometricMean = Generator("Geometric Mean of N Numbers", 67, - "Geometric mean of n numbers A1 , A2 , ... , An = ", - "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) +geometric_mean = Generator("Geometric Mean of N Numbers", 67, + "Geometric mean of n numbers A1 , A2 , ... , An = ", + "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geometric_progression.py similarity index 94% rename from mathgenerator/funcs/geomProgrFunc.py rename to mathgenerator/funcs/geometric_progression.py index 0683c3c..7c5c8f3 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geometric_progression.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def geomProgrFunc(number_values=6, @@ -24,7 +23,7 @@ def geomProgrFunc(number_values=6, return problem, solution -geometricprogression = Generator( +geometric_progression = Generator( "Geometric Progression", 66, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc) diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonic_mean.py similarity index 77% rename from mathgenerator/funcs/harmonicMeanFunc.py rename to mathgenerator/funcs/harmonic_mean.py index 5febc7e..179c061 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonic_mean.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def harmonicMeanFunc(maxValue=100, maxNum=4): @@ -29,7 +28,7 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): return problem, solution -harmonicMean = Generator("Harmonic Mean of N Numbers", 68, - "Harmonic mean of n numbers A1 , A2 , ... , An = ", - " n/((1/A1) + (1/A2) + ... + (1/An)) = ans", - harmonicMeanFunc) +harmonic_mean = Generator("Harmonic Mean of N Numbers", 68, + "Harmonic mean of n numbers A1 , A2 , ... , An = ", + " n/((1/A1) + (1/A2) + ... + (1/An)) = ans", + harmonicMeanFunc) diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcf.py similarity index 91% rename from mathgenerator/funcs/hcfFunc.py rename to mathgenerator/funcs/hcf.py index aaab950..f9a0366 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcf.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def hcfFunc(maxVal=20): diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/int_division.py similarity index 73% rename from mathgenerator/funcs/divisionToIntFunc.py rename to mathgenerator/funcs/int_division.py index fa0514b..65cfd08 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/int_division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divisionToIntFunc(maxA=25, maxB=25): @@ -14,4 +13,4 @@ def divisionToIntFunc(maxA=25, maxB=25): return problem, solution -intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) +int_division = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/int_matrix_22_determinant.py similarity index 61% rename from mathgenerator/funcs/determinantToMatrix22.py rename to mathgenerator/funcs/int_matrix_22_determinant.py index 0117389..4e3d3ca 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/int_matrix_22_determinant.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def determinantToMatrix22(maxMatrixVal=100): @@ -14,6 +13,6 @@ def determinantToMatrix22(maxMatrixVal=100): return problem, solution -intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, - "Det([[a,b],[c,d]]) =", " a * d - b * c", - determinantToMatrix22) +int_matrix_22_determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersection_of_two_lines.py similarity index 97% rename from mathgenerator/funcs/intersectionOfTwoLinesFunc.py rename to mathgenerator/funcs/intersection_of_two_lines.py index 4697201..c53f6be 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersection_of_two_lines.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def intersectionOfTwoLinesFunc(minM=-10, @@ -67,7 +66,7 @@ def intersectionOfTwoLinesFunc(minM=-10, return problem, solution -intersectionOfTwoLines = Generator( +intersection_of_two_lines = Generator( "Intersection of Two Lines", 41, "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc) diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/invert_matrix.py similarity index 94% rename from mathgenerator/funcs/matrixInversion.py rename to mathgenerator/funcs/invert_matrix.py index 4eb2787..7a196c5 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/invert_matrix.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator import sympy @@ -79,5 +78,5 @@ def matrixInversion(SquareMatrixDimension=3, return problem, solution -invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", - "A^(-1)", matrixInversion) +invert_matrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcm.py similarity index 92% rename from mathgenerator/funcs/lcmFunc.py rename to mathgenerator/funcs/lcm.py index ef57c2c..c786b52 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcm.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def lcmFunc(maxVal=20): diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linear_equations.py similarity index 80% rename from mathgenerator/funcs/linearEquationsFunc.py rename to mathgenerator/funcs/linear_equations.py index 62dc081..7fb71b6 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linear_equations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def linearEquationsFunc(n=2, varRange=20, coeffRange=20): @@ -26,9 +25,10 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): prob = " + ".join(prob) + " = " + str(res) problem.append(prob) - problem = "\n".join(problem) + # problem = "\n".join(problem) + problem = ", ".join(problem) return problem, solution -linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", - "x=-20 & y=12", linearEquationsFunc) +linear_equations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", + "x=-20 & y=12", linearEquationsFunc) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/log.py similarity index 90% rename from mathgenerator/funcs/logFunc.py rename to mathgenerator/funcs/log.py index dcc7c05..bc147f2 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/log.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def logFunc(maxBase=3, maxVal=8): diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrix_multiplication.py similarity index 85% rename from mathgenerator/funcs/matrixMultiplicationFunc.py rename to mathgenerator/funcs/matrix_multiplication.py index 9706782..51c60f9 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrix_multiplication.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def matrixMultiplicationFunc(maxVal=100, max_dim=10): @@ -54,6 +53,6 @@ def matrixMultiplicationFuncHelper(inp): return string -matrixMultiplication = Generator("Multiplication of two matrices", 46, - "Multiply two matrices A and B", "C", - matrixMultiplicationFunc) +matrix_multiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/mean_median.py similarity index 71% rename from mathgenerator/funcs/meanMedianFunc.py rename to mathgenerator/funcs/mean_median.py index cd20310..91295c7 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/mean_median.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def meanMedianFunc(maxlen=10): @@ -15,6 +14,6 @@ def meanMedianFunc(maxlen=10): return problem, solution -meanMedian = Generator("Mean and Median", 76, - "Mean and median of given set of numbers", - "Mean, Median", meanMedianFunc) +mean_median = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/midpoint_of_two_points.py similarity index 59% rename from mathgenerator/funcs/MidPointOfTwoPointFunc.py rename to mathgenerator/funcs/midpoint_of_two_points.py index 1a126b2..2b021aa 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/midpoint_of_two_points.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def MidPointOfTwoPointFunc(maxValue=20): @@ -13,6 +12,6 @@ def MidPointOfTwoPointFunc(maxValue=20): return problem, solution -midPointOfTwoPoint = Generator("Midpoint of the two point", 20, - "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", - MidPointOfTwoPointFunc) +midPoint_of_two_points = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/modulo_division.py similarity index 72% rename from mathgenerator/funcs/moduloFunc.py rename to mathgenerator/funcs/modulo_division.py index 3d97d52..12f07a2 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/modulo_division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def moduloFunc(maxRes=99, maxModulo=99): @@ -12,4 +11,4 @@ def moduloFunc(maxRes=99, maxModulo=99): return problem, solution -moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) +modulo_division = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplication.py similarity index 72% rename from mathgenerator/funcs/multiplicationFunc.py rename to mathgenerator/funcs/multiplication.py index 1d1d339..7e6e36e 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplication.py @@ -1,10 +1,12 @@ from .__init__ import * -from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): a = random.randint(0, maxMulti) - b = random.randint(0, min(int(maxMulti / a), maxRes)) + if a == 0: + b = random.randint(0, maxRes) + else: + b = random.randint(0, min(int(maxMulti / a), maxRes)) c = a * b problem = str(a) + "*" + str(b) + "=" diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiply_complex_numbers.py similarity index 69% rename from mathgenerator/funcs/multiplyComplexNumbersFunc.py rename to mathgenerator/funcs/multiply_complex_numbers.py index 8f825d0..03762e8 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiply_complex_numbers.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, @@ -13,6 +12,6 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, return problem, solution -complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, - "(x + j) (y + j) = ", "xy + xj + yj -1", - multiplyComplexNumbersFunc) +multiply_complex_numbers = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiply_int_to_22_matrix.py similarity index 87% rename from mathgenerator/funcs/multiplyIntToMatrix22.py rename to mathgenerator/funcs/multiply_int_to_22_matrix.py index 1409a5b..3d79834 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiply_int_to_22_matrix.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): @@ -14,7 +13,7 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): return problem, solution -intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", +multiply_int_to_22_matrix = Generator("Integer Multiplication with 2x2 Matrix", 17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nth_fibonacci_number.py similarity index 59% rename from mathgenerator/funcs/nthFibonacciNumberFunc.py rename to mathgenerator/funcs/nth_fibonacci_number.py index 1983a0d..cfb7e8a 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nth_fibonacci_number.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def nthFibonacciNumberFunc(maxN=100): @@ -11,6 +10,6 @@ def nthFibonacciNumberFunc(maxN=100): return problem, solution -nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, - "What is the nth Fibonacci number", "Fn", - nthFibonacciNumberFunc) +nth_fibonacci_number = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentage.py similarity index 93% rename from mathgenerator/funcs/percentageFunc.py rename to mathgenerator/funcs/percentage.py index 36d72be..e108a10 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentage.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def percentageFunc(maxValue=99, maxpercentage=99): diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutation.py similarity index 88% rename from mathgenerator/funcs/permutationFunc.py rename to mathgenerator/funcs/permutation.py index f4764c0..63d78a8 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def permutationFunc(maxlength=20): @@ -12,7 +11,7 @@ def permutationFunc(maxlength=20): return problem, solution -permutations = Generator( +permutation = Generator( "Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc) diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/power_rule_differentiation.py similarity index 69% rename from mathgenerator/funcs/powerRuleDifferentiationFunc.py rename to mathgenerator/funcs/power_rule_differentiation.py index 6e41170..cdc8c76 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/power_rule_differentiation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -19,6 +18,6 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): return problem, solution -powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", - "(n*m)x^(m-1)", - powerRuleDifferentiationFunc) +power_rule_differentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/power_rule_integration.py similarity index 76% rename from mathgenerator/funcs/powerRuleIntegrationFunc.py rename to mathgenerator/funcs/power_rule_integration.py index 4b5684b..7356a68 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/power_rule_integration.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -22,5 +21,5 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): return problem, solution -powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", - "(n/m)x^(m+1)", powerRuleIntegrationFunc) +power_rule_integration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/prime_factors.py similarity index 70% rename from mathgenerator/funcs/primeFactorsFunc.py rename to mathgenerator/funcs/prime_factors.py index 6eed7a9..575db01 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/prime_factors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def primeFactorsFunc(minVal=1, maxVal=200): @@ -23,5 +22,5 @@ def primeFactorsFunc(minVal=1, maxVal=200): return problem, solution -primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", - "[b, c, d, ...]", primeFactorsFunc) +prime_factors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profit_loss_percent.py similarity index 89% rename from mathgenerator/funcs/profitLossPercentFunc.py rename to mathgenerator/funcs/profit_loss_percent.py index c9d1d4d..c43351c 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profit_loss_percent.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def profitLossPercentFunc(maxCP=1000, maxSP=1000): @@ -17,7 +16,7 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): return problem, solution -profitLossPercent = Generator( +profit_loss_percent = Generator( "Profit or Loss Percent", 63, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc) diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagorean_theorem.py similarity index 88% rename from mathgenerator/funcs/pythagoreanTheoremFunc.py rename to mathgenerator/funcs/pythagorean_theorem.py index 26dc744..7387499 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagorean_theorem.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def pythagoreanTheoremFunc(maxLength=20): @@ -12,7 +11,7 @@ def pythagoreanTheoremFunc(maxLength=20): return problem, solution -pythagoreanTheorem = Generator( +pythagorean_theorem = Generator( "Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc) diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadratic_equation.py similarity index 89% rename from mathgenerator/funcs/quadraticEquation.py rename to mathgenerator/funcs/quadratic_equation.py index 021faff..5961852 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadratic_equation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def quadraticEquation(maxVal=100): @@ -16,7 +15,7 @@ def quadraticEquation(maxVal=100): return problem, solution -quadraticEquationSolve = Generator( +quadratic_equation = Generator( "Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radian_to_deg.py similarity index 50% rename from mathgenerator/funcs/radianToDegFunc.py rename to mathgenerator/funcs/radian_to_deg.py index 05285a8..e48acc0 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radian_to_deg.py @@ -2,7 +2,8 @@ from .__init__ import * from numpy import pi -def degreeToRadFunc(max_rad=pi): +def radianToDegFunc(max_rad=3): + # max_rad is supposed to be pi but random can't handle non-integer a = random.randint(0, max_rad) b = (180 * a) / pi b = round(b, 2) @@ -13,4 +14,5 @@ def degreeToRadFunc(max_rad=pi): return problem, solution -radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) +radian_to_deg = Generator("Radians to Degrees", 87, + "Angle a in degrees is = ", "b", radianToDegFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sector_area.py similarity index 68% rename from mathgenerator/funcs/sectorAreaFunc.py rename to mathgenerator/funcs/sector_area.py index db9dc7e..9a14728 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sector_area.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def sectorAreaFunc(maxRadius=49, maxAngle=359): @@ -12,6 +11,6 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): return problem, solution -sectorArea = Generator("Area of a Sector", 75, - "Area of a sector with radius, r and angle, a ", "Area", - sectorAreaFunc) +sector_area = Generator("Area of a Sector", 75, + "Area of a sector with radius, r and angle, a ", "Area", + sectorAreaFunc) diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simple_interest.py similarity index 91% rename from mathgenerator/funcs/simpleInterestFunc.py rename to mathgenerator/funcs/simple_interest.py index 23f1afc..00242b1 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simple_interest.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): @@ -16,7 +15,7 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): return problem, solution -simpleInterest = Generator( +simple_interest = Generator( "Simple Interest", 45, "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", simpleInterestFunc) diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/square.py similarity index 88% rename from mathgenerator/funcs/squareFunc.py rename to mathgenerator/funcs/square.py index dbe284c..28ed2c3 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/square.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def squareFunc(maxSquareNum=20): diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/square_root.py similarity index 66% rename from mathgenerator/funcs/squareRootFunc.py rename to mathgenerator/funcs/square_root.py index 6cc410a..fa09006 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/square_root.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def squareRootFunc(minNo=1, maxNo=12): @@ -11,4 +10,4 @@ def squareRootFunc(minNo=1, maxNo=12): return problem, solution -squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) +square_root = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtraction.py similarity index 91% rename from mathgenerator/funcs/subtractionFunc.py rename to mathgenerator/funcs/subtraction.py index 9298037..47c7ef2 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtraction.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def subtractionFunc(maxMinuend=99, maxDiff=99): diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sum_of_polygon_angles.py similarity index 50% rename from mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py rename to mathgenerator/funcs/sum_of_polygon_angles.py index c0a9d7b..29519df 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sum_of_polygon_angles.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def sumOfAnglesOfPolygonFunc(maxSides=12): @@ -11,6 +10,6 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): return problem, solution -sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, - "Sum of angles of polygon with n sides = ", - "sum", sumOfAnglesOfPolygonFunc) +sum_of_polygon_angles = Generator("Sum of Angles of Polygon", 58, + "Sum of angles of polygon with n sides = ", + "sum", sumOfAnglesOfPolygonFunc) diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surds_comparison.py similarity index 72% rename from mathgenerator/funcs/surdsComparisonFunc.py rename to mathgenerator/funcs/surds_comparison.py index 278c3c4..7c2825c 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surds_comparison.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surdsComparisonFunc(maxValue=100, maxRoot=10): @@ -18,6 +17,6 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): return problem, solution -surdsComparison = Generator("Comparing surds", 55, - "Fill in the blanks a^(1/b) _ c^(1/d)", "/=", - surdsComparisonFunc) +surds_comparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", "/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surface_area_cone.py similarity index 89% rename from mathgenerator/funcs/surfaceAreaCone.py rename to mathgenerator/funcs/surface_area_cone.py index 8497460..2d86c5e 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surface_area_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): @@ -14,7 +13,7 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaConeGen = Generator( +surface_area_cone = Generator( "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surface_area_cube.py similarity index 52% rename from mathgenerator/funcs/surfaceAreaCube.py rename to mathgenerator/funcs/surface_area_cube.py index 42b07f4..f2f4a99 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surface_area_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): @@ -10,6 +9,6 @@ def surfaceAreaCube(maxSide=20, unit='m'): return problem, solution -surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, - "Surface area of cube with side a units is", - "b units^2", surfaceAreaCube) +surface_area_cube = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surface_area_cuboid.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCuboid.py rename to mathgenerator/funcs/surface_area_cuboid.py index 0889441..723217c 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surface_area_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): return problem, solution -surfaceAreaCuboidGen = Generator( +surface_area_cuboid = Generator( "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surface_area_cylinder.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCylinder.py rename to mathgenerator/funcs/surface_area_cylinder.py index 3a7a1e8..bdbed93 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surface_area_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaCylinderGen = Generator( +surface_area_cylinder = Generator( "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surface_area_sphere.py similarity index 85% rename from mathgenerator/funcs/surfaceAreaSphere.py rename to mathgenerator/funcs/surface_area_sphere.py index 86a9456..bc5e91a 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surface_area_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): @@ -11,7 +10,7 @@ def surfaceAreaSphere(maxSide=20, unit='m'): return problem, solution -surfaceAreaSphereGen = Generator( +surface_area_sphere = Generator( "Surface Area of Sphere", 60, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/system_of_equations.py similarity index 89% rename from mathgenerator/funcs/systemOfEquationsFunc.py rename to mathgenerator/funcs/system_of_equations.py index ef00b0e..c35e549 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/system_of_equations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): @@ -48,6 +47,6 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): # Add random (non-zero) multiple of equations to each other -systemOfEquations = Generator("Solve a System of Equations in R^2", 23, - "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", - systemOfEquationsFunc) +system_of_equations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/third_angle_of_triangle.py similarity index 57% rename from mathgenerator/funcs/thirdAngleOfTriangleFunc.py rename to mathgenerator/funcs/third_angle_of_triangle.py index f5f7afb..b41ff35 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/third_angle_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): @@ -12,6 +11,6 @@ def thirdAngleOfTriangleFunc(maxAngle=89): return problem, solution -thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, - "Third Angle of the triangle = ", "angle3", - thirdAngleOfTriangleFunc) +third_angle_of_triangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/valid_triangle.py similarity index 72% rename from mathgenerator/funcs/isTriangleValidFunc.py rename to mathgenerator/funcs/valid_triangle.py index 19a4240..e8a5128 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/valid_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): @@ -21,6 +20,6 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution -doesTriangleExist = Generator("Triangle exists check", 19, - "Does triangle with sides a, b and c exist?", - "Yes/No", isTriangleValidFunc) +valid_triangle = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vector_cross.py similarity index 72% rename from mathgenerator/funcs/vectorCrossFunc.py rename to mathgenerator/funcs/vector_cross.py index 318beec..92b82a9 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vector_cross.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): @@ -15,5 +14,5 @@ def vectorCrossFunc(minVal=-20, maxVal=20): return problem, solution -vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", - vectorCrossFunc) +vector_cross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vector_dot.py similarity index 70% rename from mathgenerator/funcs/vectorDotFunc.py rename to mathgenerator/funcs/vector_dot.py index 0ca2609..608ce66 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vector_dot.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): @@ -12,5 +11,5 @@ def vectorDotFunc(minVal=-20, maxVal=20): return problem, solution -vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", - vectorDotFunc) +vector_dot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volume_cone.py similarity index 88% rename from mathgenerator/funcs/volumeCone.py rename to mathgenerator/funcs/volume_cone.py index 85dbd55..39a3a26 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volume_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeConeGen = Generator( +volume_cone = Generator( "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volume_cube.py similarity index 55% rename from mathgenerator/funcs/volumeCube.py rename to mathgenerator/funcs/volume_cube.py index ff1ac76..1de5984 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volume_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): @@ -11,6 +10,6 @@ def volumeCube(maxSide=20, unit='m'): return problem, solution -volumeCubeGen = Generator("Volum of Cube", 35, - "Volume of cube with side a units is", "b units^3", - volumeCube) +volume_cube = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volume_cuboid.py similarity index 88% rename from mathgenerator/funcs/volumeCuboid.py rename to mathgenerator/funcs/volume_cuboid.py index d25d753..a1eee6f 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volume_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def volumeCuboid(maxSide=20, unit='m'): return problem, solution -volumeCuboidGen = Generator( +volume_cuboid = Generator( "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volume_cylinder.py similarity index 88% rename from mathgenerator/funcs/volumeCylinder.py rename to mathgenerator/funcs/volume_cylinder.py index e021aab..28b89a1 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volume_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeCylinderGen = Generator( +volume_cylinder = Generator( "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volume_sphere.py similarity index 55% rename from mathgenerator/funcs/volumeSphereFunc.py rename to mathgenerator/funcs/volume_sphere.py index 038607e..b686bd4 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volume_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): @@ -11,6 +10,6 @@ def volumeSphereFunc(maxRadius=100): return problem, solution -volumeSphere = Generator("Volume of Sphere", 61, - "Volume of sphere with radius r m = ", - "(4*pi/3)*r*r*r", volumeSphereFunc) +volume_sphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index d2eee73..b724345 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -7,32 +7,8 @@ import scipy genList = getGenList() -# || Generator class - - -class Generator: - def __init__(self, title, id, generalProb, generalSol, func): - self.title = title - self.id = id - self.generalProb = generalProb - self.generalSol = generalSol - self.func = func - genList.append([id, title, self]) - - def __str__(self): - return str( - self.id - ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - - def __call__(self, *args, **kwargs): - return self.func(*args, **kwargs) - # || Non-generator Functions def genById(id): generator = genList[id][2] return (generator()) - - -# Format is: -# = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) diff --git a/test.py b/test.py index 9df861d..e763dfa 100644 --- a/test.py +++ b/test.py @@ -3,11 +3,13 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(79)) +print(mathgen.genById(88)) # prints each generator in genList """ list = mathgen.getGenList() for item in list: print(item[2]) + +# print(mathgen.getGenList()) """ diff --git a/tests/test_mathgen.py b/tests/test_mathgen.py index ed9066b..745b9dc 100644 --- a/tests/test_mathgen.py +++ b/tests/test_mathgen.py @@ -33,15 +33,15 @@ def test_division(maxRes, maxDivid): @given(maxRes=st.integers(min_value=1), maxModulo=st.integers(min_value=1)) -def test_moduloDivision(maxRes, maxModulo): +def test_modulo_division(maxRes, maxModulo): assume(maxRes > maxModulo) - problem, solution = moduloDivision.func(maxRes, maxModulo) + problem, solution = modulo_division.func(maxRes, maxModulo) assert eval(problem[:-1]) == int(solution) @given(minNo=st.integers(min_value=1), maxNo=st.integers(min_value=1, max_value=2**50)) -def test_squareRoot(minNo, maxNo): +def test_square_root(minNo, maxNo): assume(maxNo > minNo) - problem, solution = squareRoot.func(minNo, maxNo) + problem, solution = square_root.func(minNo, maxNo) assert eval(problem[:-1]) == float(solution)