diff --git a/Makefile b/Makefile
index bd04e35..9414a0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
-FLAKE_FLAGS = --ignore=E501,F401,F403,F405
+IGNORE_ERRORS = E501,F401,F403,F405
+PKG = mathgenerator
+
+format:
+ python -m autopep8 --ignore=$(IGNORE_ERRORS) -i $(PKG)/*
lint:
- python -m flake8 $(FLAKE_FLAGS)
+ python -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG)
test:
python -m pytest --verbose -s tests
diff --git a/README.md b/README.md
index a3c7db3..6777b5c 100644
--- a/README.md
+++ b/README.md
@@ -30,84 +30,66 @@ problem, solution = mathgen.genById(0)
| Id | Skill | Example problem | Example Solution | Function Name |
|------|-----------------------------------|--------------------|-----------------------|--------------------------|
-
-| 0 | Addition | 5+49= | 54 | addition |
-| 1 | Subtraction | 63-53= | 10 | subtraction |
-| 2 | Multiplication | 21*2= | 42 | multiplication |
-| 3 | Division | 87/60= | 1.45 | division |
-| 4 | Binary Complement 1s | 11011111= | 00100000 | binaryComplement1s |
-| 5 | Modulo Division | 10%10= | 0 | moduloDivision |
-| 6 | Square Root | sqrt(16)= | 4 | squareRoot |
-| 7 | Power Rule Differentiation | 9x^6 + 8x^6 + 5x^9 + 1x^6 + 10x^1 | 54x^5 + 48x^5 + 45x^8 + 6x^5 + 10x^0 | powerRuleDifferentiation |
-| 8 | Square | 6^2= | 36 | square |
-| 9 | LCM (Least Common Multiple) | LCM of 9 and 6 = | 18 | lcm |
-| 10 | GCD (Greatest Common Denominator) | GCD of 3 and 15 = | 3 | gcd |
-| 11 | Basic Algebra | 2x + 2 = 9 | 7/2 | basicAlgebra |
-| 12 | Logarithm | log2(4) | 2 | log |
-| 13 | Easy Division | 180/15 = | 12 | intDivision |
-| 14 | Decimal to Binary | Binary of 53= | 110101 | decimalToBinary |
-| 15 | Binary to Decimal | 1000110111 | 567 | binaryToDecimal |
-| 16 | Fraction Division | (10/4)/(1/10) | 25 | fractionDivision |
-| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[0, 4], [6, 2]] = | [[0,4],[6,2]] | intMatrix22Multiplication |
-| 18 | Area of Triangle | Area of triangle with side lengths: 8 3 19 = | (4.3470649019239876e-15+70.9929573971954j) | areaOfTriangle |
-| 19 | Triangle exists check | Does triangle with sides 8, 12 and 39 exist? | No | doesTriangleExist |
-| 20 | Midpoint of the two point | (-17,-16),(-6,9)= | (-11.5,-3.5) | midPointOfTwoPoint |
-| 21 | Factoring Quadratic | x^2-15x+56 | (x-8)(x-7) | factoring |
-| 22 | Third Angle of Triangle | Third angle of triangle with angles 17 and 81 = | 82 | thirdAngleOfTriangle |
-| 23 | Solve a System of Equations in R^2 | -7x - 5y = 22, 5x - 4y = 7 | x = -1, y = -3 | systemOfEquations |
-| 24 | Distance between 2 points | Find the distance between (-4, -13) and (15, 10) | sqrt(890) | distance2Point |
-| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 11 and 2 = | 11.18 | pythagoreanTheorem |
-| 26 | Linear Equations | -9x + 15y = 171
--9x + 9y = 135 | x = -9, y = 6 | linearEquations |
-| 27 | Prime Factorisation | Find prime factors of 61 | [61] | primeFactors |
-| 28 | Fraction Multiplication | (8/7)*(9/10) | 36/35 | fractionMultiplication |
-| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 20 sides | 162.0 | angleRegularPolygon |
-| 30 | Combinations of Objects | Number of combinations from 13 objects picked 8 at a time | 1287 | combinations |
-| 31 | Factorial | 6! = | 720 | factorial |
-| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen |
-| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 3m, 18m, 1m is | 150 m^2 | surfaceAreaCuboidGen |
-| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 20m and radius = 15m is | 3298 m^2 | surfaceAreaCylinderGen |
-| 35 | Volum of Cube | Volume of cube with side = 7m is | 343 m^3 | volumeCubeGen |
-| 36 | Volume of Cuboid | Volume of cuboid with sides = 16m, 5m, 11m is | 880 m^3 | volumeCuboidGen |
-| 37 | Volume of cylinder | Volume of cylinder with height = 28m and radius = 12m is | 12666 m^3 | volumeCylinderGen |
-| 38 | Surface Area of cone | Surface area of cone with height = 29m and radius = 1m is | 94 m^2 | surfaceAreaConeGen |
-| 39 | Volume of cone | Volume of cone with height = 2m and radius = 15m is | 471 m^3 | volumeConeGen |
-| 40 | Common Factors | Common Factors of 52 and 53 = | [1] | commonFactors |
-| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -8/4x + 3 and y = -6x - 4 | (-7/4, 13/2) | intersectionOfTwoLines |
-| 42 | Permutations | Number of Permutations from 13 objects picked 1 at a time = | 13 | permutations |
-| 43 | Cross Product of 2 Vectors | [-6, -20, -15] X [-17, 14, 18] = | [-150, 363, -424] | vectorCross |
-| 44 | Compare Fractions | Which symbol represents the comparison between 7/4 and 5/6? | > | compareFractions |
-| 45 | Simple Interest | Simple interest for a principle amount of 4813 dollars, 2% rate of interest and for a time period of 4 years is = | 385.04 | simpleInterest |
-| 46 | Multiplication of two matrices | Multiply
- -11 -69 54 67
- 54 -24 52 35
- 9 -76 82 65
- 37 -40 87 -85
- 42 45 74 75
-
- and
-
- 62 -96 -68 97 -88 71 69
- -38 48 -31 8 53 18 100
- 57 -41 54 81 -74 -80 47
- -63 -10 86 -6 77 31 -12 | 797 -5140 11565 2353 -1526 -4266 -5925
- 5019 -8818 2890 9048 -7177 327 3350
- 4025 -8524 11762 6517 -5883 -5274 -3905
- 14128 -8189 -3888 10826 -18359 -7688 3662
- 387 -5656 6195 9978 -1012 197 9976 | matrixMultiplication |
-| 47 | Cube Root | cuberoot of 566 upto 2 decimal places is: | 8.27 | CubeRoot |
-| 48 | Power Rule Integration | 6x^3 + 6x^4 + 5x^2 + 10x^9 | (6/3)x^4 + (6/4)x^5 + (5/2)x^3 + (10/9)x^10 + c | powerRuleIntegration |
-| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 6 , 199, 42 = | 113 | fourthAngleOfQuadrilateral |
-| 50 | Quadratic Equation | Zeros of the Quadratic Equation 63x^2+118x+19=0 | [-0.18, -1.7] | quadraticEquationSolve |
-| 51 | HCF (Highest Common Factor) | HCF of 20 and 14 = | 2 | hcf |
-| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 5 = | 6/216 | diceSumProbability |
-| 53 | Exponentiation | 1^3 = | 1 | exponentiation |
-| 54 | Confidence interval For sample S | The confidence interval for sample [289, 284, 269, 211, 272, 298, 290, 220, 206, 224, 230, 222, 227, 209, 262, 255, 282, 253, 274, 265, 258, 248, 277, 279, 223, 221, 219, 286, 259, 297, 234, 201, 232, 203, 294, 252, 207, 278, 202] with 80% confidence is | (255.4031906501125, 242.64809140116955) | confidenceInterval |
-| 55 | Comparing surds | Fill in the blanks 50^(1/9) _ 61^(1/7) | < | surdsComparison |
-| 56 | Fibonacci Series | The Fibonacci Series of the first 1 numbers is ? | [0] | fibonacciSeries |
-| 57 | Trigonometric Values | What is sin(30)? | 1/2 | basicTrigonometry |
-| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 8 sides = | 1080 | sumOfAnglesOfPolygon |
-| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 17, 17, 20, 25, 38, 45, 19, 38, 31, 23, 16, 42, 28, 16] | The Mean is 25.733333333333334 , Standard Deviation is 107.66222222222224, Variance is 10.376040777783318 | dataSummary |
+| 0 | Addition | 42+2= | 44 | addition |
+| 1 | Subtraction | 32-26= | 6 | subtraction |
+| 2 | Multiplication | 77*1= | 77 | multiplication |
+| 3 | Division | 66/9= | 7.333333333333333 | division |
+| 4 | Binary Complement 1s | 1010000 | 0101111 | binaryComplement1s |
+| 5 | Modulo Division | 61%35= | 26 | moduloDivision |
+| 6 | Square Root | sqrt(1)= | 1 | squareRoot |
+| 7 | Power Rule Differentiation | 5x^5 | 25x^4 | powerRuleDifferentiation |
+| 8 | Square | 20^2= | 400 | square |
+| 9 | LCM (Least Common Multiple) | LCM of 19 and 5 = | 95 | lcm |
+| 10 | GCD (Greatest Common Denominator) | GCD of 10 and 11 = | 1 | gcd |
+| 11 | Basic Algebra | 3x + 7 = 8 | 1/3 | basicAlgebra |
+| 12 | Logarithm | log2(128) | 7 | log |
+| 13 | Easy Division | 306/18 = | 17 | intDivision |
+| 14 | Decimal to Binary | Binary of 28= | 11100 | decimalToBinary |
+| 15 | Binary to Decimal | 10001101 | 141 | binaryToDecimal |
+| 16 | Fraction Division | (4/1)/(6/3) | 2 | fractionDivision |
+| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[10, 3], [0, 1]] = | [[50,15],[0,5]] | intMatrix22Multiplication |
+| 18 | Area of Triangle | Area of triangle with side lengths: 13 2 14 = | 11.659223816361019 | areaOfTriangle |
+| 19 | Triangle exists check | Does triangle with sides 3, 4 and 25 exist? | No | doesTriangleExist |
+| 20 | Midpoint of the two point | (4,-11),(17,-5)= | (10.5,-8.0) | midPointOfTwoPoint |
+| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring |
+| 22 | Third Angle of Triangle | Third angle of triangle with angles 20 and 62 = | 98 | thirdAngleOfTriangle |
+| 23 | Solve a System of Equations in R^2 | 5x - 7y = -84, 4x + 5y = 7 | x = -7, y = 7 | systemOfEquations |
+| 24 | Distance between 2 points | Find the distance between (5, -18) and (1, 19) | sqrt(1385) | distance2Point |
+| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 15 and 5 = | 15.81 | pythagoreanTheorem |
+| 26 | Linear Equations | -6x + -17y = -220
+-13x + -19y = -120 | x = -20, y = 20 | linearEquations |
+| 27 | Prime Factorisation | Find prime factors of 62 | [2, 31] | primeFactors |
+| 28 | Fraction Multiplication | (8/4)*(1/2) | 1 | fractionMultiplication |
+| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 19 sides | 161.05 | angleRegularPolygon |
+| 30 | Combinations of Objects | Number of combinations from 12 objects picked 1 at a time | 12 | combinations |
+| 31 | Factorial | 0! = | 1 | factorial |
+| 32 | Surface Area of Cube | Surface area of cube with side = 8m is | 384 m^2 | surfaceAreaCubeGen |
+| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 18m, 17m, 1m is | 682 m^2 | surfaceAreaCuboidGen |
+| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 31m and radius = 1m is | 201 m^2 | surfaceAreaCylinderGen |
+| 35 | Volum of Cube | Volume of cube with side = 9m is | 729 m^3 | volumeCubeGen |
+| 36 | Volume of Cuboid | Volume of cuboid with sides = 20m, 1m, 10m is | 200 m^3 | volumeCuboidGen |
+| 37 | Volume of cylinder | Volume of cylinder with height = 7m and radius = 7m is | 1077 m^3 | volumeCylinderGen |
+| 38 | Surface Area of cone | Surface area of cone with height = 47m and radius = 13m is | 2522 m^2 | surfaceAreaConeGen |
+| 39 | Volume of cone | Volume of cone with height = 4m and radius = 4m is | 67 m^3 | volumeConeGen |
+| 40 | Common Factors | Common Factors of 20 and 90 = | [1, 2, 5, 10] | commonFactors |
+| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -3/6x + 1 and y = 0/2x + 6 | (-10, 6) | intersectionOfTwoLines |
+| 42 | Permutations | Number of Permutations from 11 objects picked 2 at a time = | 110 | permutations |
+| 43 | Cross Product of 2 Vectors | [-19, -3, 2] X [-15, -12, 7] = | [3, 103, 183] | vectorCross |
+| 44 | Compare Fractions | Which symbol represents the comparison between 8/6 and 3/1? | < | compareFractions |
+| 45 | Simple Interest | Simple interest for a principle amount of 9862 dollars, 4% rate of interest and for a time period of 1 years is = | 394.48 | simpleInterest |
+| 46 | Multiplication of two matrices | Multiply
| -50 | 36 | 7 | -26 | -2 | 63 |
| 88 | -37 | 60 | -19 | 61 | -56 |
| 48 | -5 | 69 | -87 | -64 | -92 |
| -84 | -50 | -79 | -19 | 86 | -13 |
| 0 | 28 | 12 | -14 | 73 | -49 |
| 94 | -90 | 2 | 26 | -38 | 19 |
| 2 | -11 | 79 | -77 | 98 | -77 |
| -87 | 70 | 72 | -32 | 64 | -99 |
and | 34 | 32 | -6 | -32 | 46 | -23 | 78 | -81 | -18 |
| -17 | 24 | 49 | -62 | -50 | 77 | 38 | -98 | -64 |
| -23 | -78 | 43 | 5 | -83 | -5 | 4 | -92 | -16 |
| 46 | -47 | -92 | 52 | -25 | -37 | 44 | 51 | -7 |
| 20 | 26 | 70 | 37 | 96 | -73 | 49 | 84 | 42 |
| -72 | -15 | -80 | -24 | 58 | -47 | -41 | 45 | -69 |
| | -8245 | -1057 | -423 | -3535 | -569 | 2034 | -6329 | 1219 | -5765 |
| 6619 | 567 | 10737 | 2391 | 4001 | -6291 | 10147 | -7387 | 6383 |
| 1472 | -161 | 13318 | -5565 | -12574 | 10381 | 638 | -23699 | 2621 |
| 1593 | 5598 | 3465 | 7899 | 13170 | -6487 | -4857 | 24642 | 10618 |
| 3592 | 3027 | 12206 | 1473 | 2120 | -412 | 6082 | -635 | 4561 |
| 3748 | -1803 | -11460 | 2072 | 5462 | -8183 | 2423 | 11 | 947 |
| 2400 | 960 | 22950 | 2483 | 952 | -1974 | 4625 | -5512 | 9372 |
| 1132 | -2067 | 22392 | 1884 | -12276 | 8196 | 1949 | -7148 | 5677 |
| matrixMultiplication |
+| 47 | Cube Root | cuberoot of 771 upto 2 decimal places is: | 9.17 | CubeRoot |
+| 48 | Power Rule Integration | 1x^3 + 8x^8 + 10x^10 | (1/3)x^4 + (8/8)x^9 + (10/10)x^11 + c | powerRuleIntegration |
+| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 52 , 84, 154 = | 70 | fourthAngleOfQuadrilateral |
+| 50 | Quadratic Equation | Zeros of the Quadratic Equation 51x^2+152x+80=0 | [-0.68, -2.3] | quadraticEquationSolve |
+| 51 | HCF (Highest Common Factor) | HCF of 11 and 7 = | 1 | hcf |
+| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability |
+| 53 | Exponentiation | 9^9 = | 387420489 | exponentiation |
+| 54 | Confidence interval For sample S | The confidence interval for sample [291, 254, 274, 207, 253, 289, 268, 280, 225, 240, 278, 270, 247, 252, 211, 212, 295, 241, 290, 206, 222, 263, 264, 228, 229, 256, 209, 292] with 99% confidence is | (265.560249263099, 237.72546502261523) | confidenceInterval |
+| 55 | Comparing surds | Fill in the blanks 16^(1/7) _ 67^(1/6) | < | surdsComparison |
+| 56 | Fibonacci Series | The Fibonacci Series of the first 11 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55] | fibonacciSeries |
+| 57 | Trigonometric Values | What is cos(60)? | 1/2 | basicTrigonometry |
+| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sumOfAnglesOfPolygon |
+| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[38, 29, 43, 25, 7, 10, 13, 14, 43, 44, 30, 42, 48, 48, 42] | The Mean is 31.733333333333334 , Standard Deviation is 199.26222222222222, Variance is 14.116027140177303 | dataSummary |
| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 13m is | 2123.7166338267 m^2 | surfaceAreaSphereGen |
-| 60 | Volume of Sphere | Volume of sphere with radius 100 m = | 4188790.2047863905 m^3 | volumeSphere |
-| 61 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 6 and 66 = | 2/((1/6) + (1/66)) = 11.0 | harmonicMean |
+| 60 | Volume of Sphere | Volume of sphere with radius 84 m = | 2482712.7095377133 m^3 | volumeSphere |
\ No newline at end of file
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 6e46af4..c29cf4e 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,3 +1,4 @@
pytest
hypothesis
-flake8
\ No newline at end of file
+flake8
+autopep8
\ No newline at end of file
diff --git a/makeReadme.py b/makeReadme.py
index 7ca8f2c..64f7989 100644
--- a/makeReadme.py
+++ b/makeReadme.py
@@ -1,10 +1,10 @@
-#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
+# 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
wList = getGenList()
allRows = []
-f=open('mathgen.py')
-lines=f.readlines()
-line = 720 #This has to be changed depending on which line the first generator appears on
+f = open('mathgen.py')
+lines = f.readlines()
+line = 720 # This has to be changed depending on which line the first generator appears on
for item in wList:
myGen = item[2]
prob, sol = myGen()
@@ -13,10 +13,10 @@ for item in wList:
instName = lines[line]
def_name = instName[:instName.find('=')].strip()
row = [myGen.id, myGen.title, prob, sol, def_name]
- line+=1
+ line += 1
allRows.append(row)
-g=open('../README.md', "a")
+g = open('../README.md', "a")
for row in allRows:
tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str(row[2]) + " | " + str(row[3]) + " | " + str(row[4]) + " |\n"
g.write(tableLine)
diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index a164434..f0d022d 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -4,7 +4,6 @@ import fractions
genList = []
-
# || Generator class
class Generator:
def __init__(self, title, id, generalProb, generalSol, func):
@@ -36,7 +35,8 @@ def getGenList():
def additionFunc(maxSum=99, maxAddend=50):
a = random.randint(0, maxAddend)
- b = random.randint(0, min((maxSum - a), maxAddend)) # The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
+ # The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
+ b = random.randint(0, min((maxSum - a), maxAddend))
c = a + b
problem = str(a) + "+" + str(b) + "="
solution = str(c)
@@ -78,7 +78,7 @@ def binaryComplement1sFunc(maxDigits=10):
question += temp
answer += "0" if temp == "1" else "1"
- problem = question+"="
+ problem = question + "="
solution = answer
return problem, solution
@@ -248,7 +248,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20):
c = random.randint(1, maxC)
s = (a + b + c) / 2
area = (s * (s - a) * (s - b) * (s - c)) ** 0.5
- problem = "Area of triangle with side lengths: " + str(a) + " " + str(b) + " " + str(c) + " = "
+ problem = "Area of triangle with side lengths: " + \
+ str(a) + " " + str(b) + " " + str(c) + " = "
solution = area
return problem, solution
@@ -259,7 +260,8 @@ def isTriangleValidFunc(maxSideLength=50):
sideC = random.randint(1, maxSideLength)
sideSums = [sideA + sideB, sideB + sideC, sideC + sideA]
sides = [sideC, sideA, sideB]
- exists = True & (sides[0] < sideSums[0]) & (sides[1] < sideSums[1]) & (sides[2] < sideSums[2])
+ exists = True & (sides[0] < sideSums[0]) & (
+ sides[1] < sideSums[1]) & (sides[2] < sideSums[2])
problem = f"Does triangle with sides {sideA}, {sideB} and {sideC} exist?"
if exists:
solution = "Yes"
@@ -352,7 +354,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10):
# No redundant 1s
y_coeff = abs(coeffs[1]) if abs(coeffs[1]) != 1 else ''
# Don't include if 0, unless x is also 0 (probably never happens)
- y_str = f'{y_coeff}y' if coeffs[1] != 0 else ('' if x_str != '' else '0')
+ y_str = f'{y_coeff}y' if coeffs[1] != 0 else (
+ '' if x_str != '' else '0')
return f'{x_str}{op}{y_str} = {coeffs[2]}'
problem = f"{coeffToFuncString(new_c1)}, {coeffToFuncString(new_c2)}"
@@ -372,7 +375,6 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20):
problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})"
return problem, solution
-
def pythagoreanTheoremFunc(maxLength=20):
a = random.randint(1, maxLength)
b = random.randint(1, maxLength)
@@ -391,7 +393,8 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20):
soln = [random.randint(-varRange, varRange) for i in range(n)]
problem = list()
- solution = ", ".join(["{} = {}".format(vars[i], soln[i]) for i in range(n)])
+ solution = ", ".join(["{} = {}".format(vars[i], soln[i])
+ for i in range(n)])
for _ in range(n):
coeff = [random.randint(-coeffRange, coeffRange) for i in range(n)]
res = sum([coeff[i] * soln[i] for i in range(n)])
@@ -469,7 +472,8 @@ def combinationsFunc(maxlength=20):
b = random.randint(0, 9)
solution = int(factorial(a) / (factorial(b) * factorial(a - b)))
- problem = "Number of combinations from {} objects picked {} at a time ".format(a, b)
+ problem = "Number of combinations from {} objects picked {} at a time ".format(
+ a, b)
return problem, solution
@@ -615,8 +619,10 @@ def intersectionOfTwoLinesFunc(
x = f"{x.numerator}/{x.denominator}"
return x
- m1 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
- m2 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
+ m1 = (random.randint(minM, maxM), random.randint(
+ minDenominator, maxDenominator))
+ m2 = (random.randint(minM, maxM), random.randint(
+ minDenominator, maxDenominator))
b1 = random.randint(minB, maxB)
b2 = random.randint(minB, maxB)
equation1 = generateEquationString(m1, b1)
@@ -642,7 +648,8 @@ def permutationFunc(maxlength=20):
a = random.randint(10, maxlength)
b = random.randint(0, 9)
solution = int(math.factorial(a) / (math.factorial(a - b)))
- problem = "Number of Permutations from {} objects picked {} at a time = ".format(a, b)
+ problem = "Number of Permutations from {} objects picked {} at a time = ".format(
+ a, b)
return problem, solution
@@ -685,7 +692,8 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10):
b = random.randint(1, maxRate)
c = random.randint(1, maxTime)
d = (a * b * c) / 100
- problem = "Simple interest for a principle amount of " + str(a) + " dollars, " + str(b) + "% rate of interest and for a time period of " + str(c) + " years is = "
+ problem = "Simple interest for a principle amount of " + str(a) + " dollars, " + str(
+ b) + "% rate of interest and for a time period of " + str(c) + " years is = "
solution = round(d, 2)
return problem, solution
@@ -718,7 +726,8 @@ def matrixMultiplicationFunc(maxVal=100):
for t in range(n):
temp += a[r][t] * b[t][c]
res[r].append(temp)
- problem = f"Multiply \n{a_string}\n and \n\n{b_string}" # consider using a, b instead of a_string, b_string if the problem doesn't look right
+ # consider using a, b instead of a_string, b_string if the problem doesn't look right
+ problem = f"Multiply \n{a_string}\n and \n\n{b_string}"
solution = matrixMultiplicationFuncHelper(res)
return problem, solution
@@ -754,34 +763,43 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5):
coefficient = random.randint(1, maxCoef)
exponent = random.randint(1, maxExp)
problem += str(coefficient) + "x^" + str(exponent)
- solution += "(" + str(coefficient) + "/" + str(exponent) + ")x^" + str(exponent + 1)
+ solution += "(" + str(coefficient) + "/" + \
+ str(exponent) + ")x^" + str(exponent + 1)
solution = solution + " + c"
return problem, solution
-
-def fourthAngleOfQuadriFunc(maxAngle=180):
- angle1 = random.randint(1, maxAngle)
- angle2 = random.randint(1, 240 - angle1)
- angle3 = random.randint(1, 340 - (angle1 + angle2))
- sum_ = angle1 + angle2 + angle3
- angle4 = 360 - sum_
- problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} ="
- solution = angle4
+def fourthAngleOfQuadriFunc(total=360):
+ def rand_anglesquad():
+ a=180
+ b=0
+ c=0
+ d=0
+ while(c==0 or d==0):
+ a=random.randint(1, total-20)
+ b=random.randint(1, total-a-10)
+ c=random.randint(1, total-a-b)
+ d=total-a-b-c
+ return a, b, c, d
+ a, b, c, d=rand_anglesquad()
+ problem="Fourth angle of a quadrilateral with three angles {}, {}, {} (in degrees)".format(a, b, c)
+ solution=d
return problem, solution
-
def quadraticEquation(maxVal=100):
a = random.randint(1, maxVal)
c = random.randint(1, maxVal)
- b = random.randint(round(math.sqrt(4 * a * c)) + 1, round(math.sqrt(4 * maxVal * maxVal)))
+ b = random.randint(round(math.sqrt(4 * a * c)) + 1,
+ round(math.sqrt(4 * maxVal * maxVal)))
problem = "Zeros of the Quadratic Equation {}x^2+{}x+{}=0".format(a, b, c)
D = math.sqrt(b * b - 4 * a * c)
- solution = str([round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)])
+ solution = str([round((-b + D) / (2 * a), 2),
+ round((-b - D) / (2 * a), 2)])
return problem, solution
+
def hcfFunc(maxVal=20):
a = random.randint(1, maxVal)
b = random.randint(1, maxVal)
@@ -792,61 +810,67 @@ def hcfFunc(maxVal=20):
solution = str(x)
return problem, solution
+
def DiceSumProbFunc(maxDice=3):
- a = random.randint(1,maxDice)
- b = random.randint(a,6*a)
- count=0
- for i in [1,2,3,4,5,6]:
- if a==1:
- if i==b:
- count=count+1
- elif a==2:
- for j in [1,2,3,4,5,6]:
- if i+j==b:
- count=count+1
- elif a==3:
- for j in [1,2,3,4,5,6]:
- for k in [1,2,3,4,5,6]:
- if i+j+k==b:
- count=count+1
- problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(a,b)
- solution="{}/{}".format(count, 6**a)
+ a = random.randint(1, maxDice)
+ b = random.randint(a, 6 * a)
+ count = 0
+ for i in [1, 2, 3, 4, 5, 6]:
+ if a == 1:
+ if i == b:
+ count = count + 1
+ elif a == 2:
+ for j in [1, 2, 3, 4, 5, 6]:
+ if i + j == b:
+ count = count + 1
+ elif a == 3:
+ for j in [1, 2, 3, 4, 5, 6]:
+ for k in [1, 2, 3, 4, 5, 6]:
+ if i + j + k == b:
+ count = count + 1
+ problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(
+ a, b)
+ solution = "{}/{}".format(count, 6**a)
return problem, solution
-def exponentiationFunc(maxBase = 20,maxExpo = 10):
+
+def exponentiationFunc(maxBase=20, maxExpo=10):
base = random.randint(1, maxBase)
expo = random.randint(1, maxExpo)
problem = f"{base}^{expo} ="
solution = str(base ** expo)
return problem, solution
+
def confidenceIntervalFunc():
- n=random.randint(20,40)
- j=random.randint(0,3)
- lst=random.sample(range(200,300),n)
- lst_per=[80 ,90, 95, 99]
+ n = random.randint(20, 40)
+ j = random.randint(0, 3)
+ lst = random.sample(range(200, 300), n)
+ lst_per = [80, 90, 95, 99]
lst_t = [1.282, 1.645, 1.960, 2.576]
- mean=0
- sd=0
+ mean = 0
+ sd = 0
for i in lst:
- count= i + mean
- mean=count
- mean = mean/n
+ count = i + mean
+ mean = count
+ mean = mean / n
for i in lst:
- x=(i-mean)**2+sd
- sd=x
- sd=sd/n
- standard_error = lst_t[j]*math.sqrt(sd/n)
- problem= 'The confidence interval for sample {} with {}% confidence is'.format([x for x in lst], lst_per[j])
- solution= '({}, {})'.format(mean+standard_error, mean-standard_error)
+ x = (i - mean)**2 + sd
+ sd = x
+ sd = sd / n
+ standard_error = lst_t[j] * math.sqrt(sd / n)
+ problem = 'The confidence interval for sample {} with {}% confidence is'.format(
+ [x for x in lst], lst_per[j])
+ solution = '({}, {})'.format(mean + standard_error, mean - standard_error)
return problem, solution
-def surdsComparisonFunc(maxValue = 100, maxRoot = 10):
- radicand1,radicand2 = tuple(random.sample(range(1,maxValue),2))
- degree1, degree2 = tuple(random.sample(range(1,maxRoot),2))
+
+def surdsComparisonFunc(maxValue=100, maxRoot=10):
+ radicand1, radicand2 = tuple(random.sample(range(1, maxValue), 2))
+ degree1, degree2 = tuple(random.sample(range(1, maxRoot), 2))
problem = f"Fill in the blanks {radicand1}^(1/{degree1}) _ {radicand2}^(1/{degree2})"
- first = math.pow(radicand1, 1/degree1)
- second = math.pow(radicand2, 1/degree2)
+ first = math.pow(radicand1, 1 / degree1)
+ second = math.pow(radicand2, 1 / degree2)
solution = "="
if first > second:
solution = ">"
@@ -854,72 +878,162 @@ def surdsComparisonFunc(maxValue = 100, maxRoot = 10):
solution = "<"
return problem, solution
+
def fibonacciSeriesFunc(minNo=1):
- n = random.randint(minNo,20)
+ n = random.randint(minNo, 20)
+
def createFibList(n):
- l=[]
+ fibList = []
for i in range(n):
- if i<2:
- l.append(i)
+ if i < 2:
+ fibList.append(i)
else:
- val = l[i-1]+l[i-2]
- l.append(val)
- return l
- fibList=createFibList(n)
- problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?"
+ val = fibList[i - 1] + fibList[i - 2]
+ fibList.append(val)
+ return fibList
+ fibList = createFibList(n)
+ problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?"
solution = fibList
- return problem,solution
+ return problem, solution
-def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one
- angle=random.choice(angles)
- function=random.choice(functions)
- problem=f"What is {function}({angle})?"
- expression='math.'+function+'(math.radians(angle))'
- result_fraction_map={0.0:"0",0.5:"1/2",0.71:"1/√2",0.87:"√3/2",1.0:"1",0.58:"1/√3",1.73:"√3"}
+# Handles degrees in quadrant one
+def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], functions=["sin", "cos", "tan"]):
+ angle = random.choice(angles)
+ function = random.choice(functions)
- solution=result_fraction_map[round(eval(expression),2)] if round(eval(expression),2)<=99999 else "∞" #for handling the ∞ condition
+ problem = f"What is {function}({angle})?"
+ expression = 'math.' + function + '(math.radians(angle))'
+ result_fraction_map = {0.0: "0", 0.5: "1/2", 0.71: "1/√2",
+ 0.87: "√3/2", 1.0: "1", 0.58: "1/√3", 1.73: "√3"}
- return problem,solution
+ solution = result_fraction_map[round(eval(expression), 2)] if round(
+ eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition
-def sumOfAnglesOfPolygonFunc(maxSides = 12):
+ return problem, solution
+
+
+def sumOfAnglesOfPolygonFunc(maxSides=12):
side = random.randint(3, maxSides)
sum = (side - 2) * 180
problem = f"Sum of angles of polygon with {side} sides = "
solution = sum
return problem, solution
-def dataSummaryFunc(number_values=15,minval=5,maxval=50):
- random_list=[]
+
+def dataSummaryFunc(number_values=15, minval=5, maxval=50):
+ random_list = []
for i in range(number_values):
- n=random.randint(minval,maxval)
+ n = random.randint(minval, maxval)
random_list.append(n)
- a=sum(random_list)
- mean=a/number_values
- var=0
+ a = sum(random_list)
+ mean = a / number_values
+ var = 0
for i in range(number_values):
var+=(random_list[i]-mean)**2
- print(random_list)
- print(mean)
- print(var/number_values)
- print((var/number_values)**0.5)
problem="Find the mean,standard deviation and variance for the data"+str(random_list)
solution="The Mean is {} , Standard Deviation is {}, Variance is {}".format(mean,var/number_values,(var/number_values)**0.5)
return problem,solution
-def surfaceAreaSphere(maxSide = 20, unit = 'm'):
- r = random.randint(1, maxSide)
+def surfaceAreaSphere(maxSide=20, unit='m'):
+ r = random.randint(1, maxSide)
problem = f"Surface area of Sphere with radius = {r}{unit} is"
ans = 4 * math.pi * r * r
solution = f"{ans} {unit}^2"
return problem, solution
+
def volumeSphereFunc(maxRadius = 100):
r=random.randint(1,maxRadius)
problem=f"Volume of sphere with radius {r} m = "
ans=(4*math.pi/3)*r*r*r
solution = f"{ans} m^3"
return problem,solution
+
+
+def volumeSphereFunc(maxRadius=100):
+ r = random.randint(1, maxRadius)
+ problem = f"Volume of sphere with radius {r} m = "
+ ans = (4 * math.pi / 3) * r * r * r
+ solution = f"{ans} m^3"
+ return problem,solution
+
+def nthFibonacciNumber(maxN = 100):
+ golden_ratio = (1 + math.sqrt(5))/2
+ n = random.randint(1,maxN)
+ problem = f"What is the {n}th Fibonacci number?"
+ ans = round((math.pow(golden_ratio,n) - math.pow(-golden_ratio,-n))/(math.sqrt(5)))
+ solution = f"{ans}"
+ return problem, solution
+
+def profitLossPercentFunc(maxCP = 1000, maxSP = 1000):
+ cP = random.randint(1, maxCP)
+ sP = random.randint(1, maxSP)
+ diff = abs(sP-cP)
+ if (sP-cP >= 0):
+ profitOrLoss = "Profit"
+ else:
+ profitOrLoss = "Loss"
+ percent = diff/cP * 100
+ problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: "
+ solution = percent
+
+def BinaryToHexFunc(max_dig=10):
+ problem = ''
+ for i in range(random.randint(1, max_dig)):
+ temp = str(random.randint(0, 1))
+ problem += temp
+
+ solution = hex(int(problem, 2))
+ return problem, solution
+
+def multiplyComplexNumbersFunc(minRealImaginaryNum = -20, maxRealImaginaryNum = 20):
+ num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum))
+ num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum))
+ problem = f"{num1} * {num2} = "
+ solution = num1 * num2
+ return problem, solution
+
+def GeomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term=5):
+ r=random.randint(min_value,max_value)
+ a=random.randint(min_value,max_value)
+ n_term=random.randint(number_values,number_values+5)
+ sum_term=random.randint(number_values,number_values+5)
+ GP=[]
+ for i in range(number_values):
+ GP.append(a*(r**i))
+ problem="For the given GP "+str(GP)+" ,Find the value of a,common ratio,"+str(n_term)+"th term value, sum upto "+str(sum_term)+"th term"
+ value_nth_term=a*(r**(n_term-1))
+ sum_till_nth_term=a*((r**sum_term-1)/(r-1))
+ solution="The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format(a,r,n_term,value_nth_term,sum_term,sum_till_nth_term)
+ return problem,solution
+
+
+def geometricMeanFunc(maxValue=100, maxNum=4):
+ a=random.randint(1,maxValue)
+ b=random.randint(1,maxValue)
+ c=random.randint(1,maxValue)
+ d=random.randint(1,maxValue)
+ num=random.randint(2,4)
+ if num==2:
+ product=a*b
+ elif num==3:
+ product=a*b*c
+ elif num==4:
+ product=a*b*c*d
+
+ ans=product**(1/num)
+ if num==2:
+ problem=f"Geometric mean of {num} numbers {a} and {b} = "
+ solution = f"({a}*{b})^(1/{num}) = {ans}"
+ elif num==3:
+ problem=f"Geometric mean of {num} numbers {a} , {b} and {c} = "
+ solution = f"({a}*{b}*{c})^(1/{num}) = {ans}"
+ elif num==4:
+ problem=f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = "
+ solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}"
+ return problem,solution
+
def harmonicMeanFunc(maxValue=100, maxNum=4):
a=random.randint(1,maxValue)
@@ -945,71 +1059,133 @@ def harmonicMeanFunc(maxValue=100, maxNum=4):
problem=f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = "
solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}"
return problem,solution
-
+
# || Class Instances
+
# Format is:
# = Generator("", , , , )
addition = Generator("Addition", 0, "a+b=", "c", additionFunc)
subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc)
-multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc)
+multiplication = Generator(
+ "Multiplication", 2, "a*b=", "c", multiplicationFunc)
division = Generator("Division", 3, "a/b=", "c", divisionFunc)
-binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", binaryComplement1sFunc)
+binaryComplement1s = Generator(
+ "Binary Complement 1s", 4, "1010=", "0101", binaryComplement1sFunc)
moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc)
squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc)
-powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", "(n*m)x^(m-1)", powerRuleDifferentiationFunc)
+powerRuleDifferentiation = Generator(
+ "Power Rule Differentiation", 7, "nx^m=", "(n*m)x^(m-1)", powerRuleDifferentiationFunc)
square = Generator("Square", 8, "a^2", "b", squareFunc)
-lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", lcmFunc)
-gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", "c", gcdFunc)
-basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
+lcm = Generator("LCM (Least Common Multiple)", 9,
+ "LCM of a and b = ", "c", lcmFunc)
+gcd = Generator("GCD (Greatest Common Denominator)",
+ 10, "GCD of a and b = ", "c", gcdFunc)
+basicAlgebra = Generator(
+ "Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
log = Generator("Logarithm", 12, "log2(8)", "3", logFunc)
intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc)
-decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", DecimalToBinaryFunc)
-binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", BinaryToDecimalFunc)
-fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
-intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", 17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
-areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
-doesTriangleExist = Generator("Triangle exists check", 19, "Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
-midPointOfTwoPoint = Generator("Midpoint of the two point", 20, "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
-factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
-thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc)
-systemOfEquations = Generator("Solve a System of Equations in R^2", 23, "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3",systemOfEquationsFunc)
-distance2Point = Generator("Distance between 2 points", 24, "Find the distance between (x1,y1) and (x2,y2)", "sqrt(distanceSquared)", distanceTwoPointsFunc)
-pythagoreanTheorem = Generator("Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc)
-linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", "x=-20 & y=12", linearEquationsFunc) # This has multiple variables whereas #23 has only x and y
-primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", "[b, c, d, ...]", primeFactorsFunc)
-fractionMultiplication = Generator("Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc)
-angleRegularPolygon = Generator("Angle of a Regular Polygon", 29, "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc)
-combinations = Generator("Combinations of Objects", 30, "Combinations available for picking 4 objects at a time from 6 distinct objects =", " 15", combinationsFunc)
+decimalToBinary = Generator("Decimal to Binary", 14,
+ "Binary of a=", "b", DecimalToBinaryFunc)
+binaryToDecimal = Generator("Binary to Decimal", 15,
+ "Decimal of a=", "b", BinaryToDecimalFunc)
+fractionDivision = Generator(
+ "Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
+intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",
+ 17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
+areaOfTriangle = Generator(
+ "Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
+doesTriangleExist = Generator("Triangle exists check", 19,
+ "Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
+midPointOfTwoPoint = Generator("Midpoint of the two point", 20,
+ "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
+factoring = Generator("Factoring Quadratic", 21,
+ "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
+thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22,
+ "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc)
+systemOfEquations = Generator("Solve a System of Equations in R^2", 23,
+ "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", systemOfEquationsFunc)
+distance2Point = Generator("Distance between 2 points", 24,
+ "Find the distance between (x1,y1) and (x2,y2)", "sqrt(distanceSquared)", distanceTwoPointsFunc)
+pythagoreanTheorem = Generator(
+ "Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc)
+# This has multiple variables whereas #23 has only x and y
+linearEquations = Generator(
+ "Linear Equations", 26, "2x+5y=20 & 3x+6y=12", "x=-20 & y=12", linearEquationsFunc)
+primeFactors = Generator("Prime Factorisation", 27,
+ "Prime Factors of a =", "[b, c, d, ...]", primeFactorsFunc)
+fractionMultiplication = Generator(
+ "Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc)
+angleRegularPolygon = Generator("Angle of a Regular Polygon", 29,
+ "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc)
+combinations = Generator("Combinations of Objects", 30,
+ "Combinations available for picking 4 objects at a time from 6 distinct objects =", " 15", combinationsFunc)
factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc)
-surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
-surfaceAreaCuboidGen = Generator("Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
-surfaceAreaCylinderGen = Generator("Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
-volumeCubeGen = Generator("Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
-volumeCuboidGen = Generator("Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
-volumeCylinderGen = Generator("Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
-surfaceAreaConeGen = Generator("Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone)
-volumeConeGen = Generator("Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone)
-commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ", "[c, d, ...]", commonFactorsFunc)
-intersectionOfTwoLines = Generator("Intersection of Two Lines", 41, "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
-permutations = Generator("Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
-vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", vectorCrossFunc)
-compareFractions = Generator("Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/=", compareFractionsFunc)
-simpleInterest = Generator("Simple Interest", 45, "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", simpleInterestFunc)
-matrixMultiplication = Generator("Multiplication of two matrices", 46, "Multiply two matrices A and B", "C", matrixMultiplicationFunc)
-CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", "b", cubeRootFunc)
-powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
-fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral", 49, "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc)
-quadraticEquationSolve = Generator("Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)
-hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", hcfFunc)
-diceSumProbability=Generator("Probability of a certain sum appearing on faces of dice", 52,"If n dices are rolled then probabilty of getting sum of x is =","z", DiceSumProbFunc)
-exponentiation = Generator("Exponentiation", 53,"a^b = ","c",exponentiationFunc)
-confidenceInterval = Generator("Confidence interval For sample S", 54, "With X% confidence", "is (A,B)", confidenceIntervalFunc)
-surdsComparison = Generator("Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", ">/=", surdsComparisonFunc)
-fibonacciSeries = Generator("Fibonacci Series",56,"fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a",fibonacciSeriesFunc)
-basicTrigonometry=Generator("Trigonometric Values",57,"What is sin(X)?","ans",basicTrigonometryFunc)
-sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, "Sum of angles of polygon with n sides = ", "sum", sumOfAnglesOfPolygonFunc)
-dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", "Mean:a+b+c/3,Std,Var", dataSummaryFunc)
-surfaceAreaSphereGen = Generator("Surface Area of Sphere", 59, "Surface area of sphere with radius = a units is","d units^2", surfaceAreaSphere)
-volumeSphere=Generator("Volume of Sphere",60,"Volume of sphere with radius r m = ","(4*pi/3)*r*r*r",volumeSphereFunc)
-harmonicMean=Generator("Harmonic Mean of N Numbers",61,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)
\ No newline at end of file
+surfaceAreaCubeGen = Generator(
+ "Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
+surfaceAreaCuboidGen = Generator(
+ "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
+surfaceAreaCylinderGen = Generator(
+ "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
+volumeCubeGen = Generator(
+ "Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
+volumeCuboidGen = Generator(
+ "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
+volumeCylinderGen = Generator(
+ "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
+surfaceAreaConeGen = Generator(
+ "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone)
+volumeConeGen = Generator(
+ "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone)
+commonFactors = Generator(
+ "Common Factors", 40, "Common Factors of {a} and {b} = ", "[c, d, ...]", commonFactorsFunc)
+intersectionOfTwoLines = Generator("Intersection of Two Lines", 41,
+ "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
+permutations = Generator(
+ "Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
+vectorCross = Generator("Cross Product of 2 Vectors",
+ 43, "a X b = ", "c", vectorCrossFunc)
+compareFractions = Generator(
+ "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/=", compareFractionsFunc)
+simpleInterest = Generator(
+ "Simple Interest", 45, "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", simpleInterestFunc)
+matrixMultiplication = Generator("Multiplication of two matrices",
+ 46, "Multiply two matrices A and B", "C", matrixMultiplicationFunc)
+CubeRoot = Generator(
+ "Cube Root", 47, "Cuberoot of a upto 2 decimal places is", "b", cubeRootFunc)
+powerRuleIntegration = Generator(
+ "Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
+fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral", 49,
+ "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc)
+quadraticEquationSolve = Generator(
+ "Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)
+hcf = Generator("HCF (Highest Common Factor)", 51,
+ "HCF of a and b = ", "c", hcfFunc)
+diceSumProbability = Generator("Probability of a certain sum appearing on faces of dice",
+ 52, "If n dices are rolled then probabilty of getting sum of x is =", "z", DiceSumProbFunc)
+exponentiation = Generator(
+ "Exponentiation", 53, "a^b = ", "c", exponentiationFunc)
+confidenceInterval = Generator("Confidence interval For sample S",
+ 54, "With X% confidence", "is (A,B)", confidenceIntervalFunc)
+surdsComparison = Generator(
+ "Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", ">/=", surdsComparisonFunc)
+fibonacciSeries = Generator("Fibonacci Series", 56, "fibonacci series of first a numbers",
+ "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc)
+basicTrigonometry = Generator(
+ "Trigonometric Values", 57, "What is sin(X)?", "ans", basicTrigonometryFunc)
+sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58,
+ "Sum of angles of polygon with n sides = ", "sum", sumOfAnglesOfPolygonFunc)
+dataSummary = Generator("Mean,Standard Deviation,Variance",
+ 59, "a,b,c", "Mean:a+b+c/3,Std,Var", dataSummaryFunc)
+surfaceAreaSphereGen = Generator(
+ "Surface Area of Sphere", 59, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere)
+volumeSphere = Generator("Volume of Sphere", 60,
+ "Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc)
+nthFibonacciNumberGen = Generator("nth Fibonacci number", 61, "What is the nth Fibonacci number", "Fn", nthFibonacciNumber)
+
+profitLossPercent = Generator("Profit or Loss Percent", 62, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)
+binaryToHex = Generator("Binary to Hexidecimal", 63, "Hexidecimal of a=", "b", BinaryToHexFunc)
+ComplexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + j) (y + j) = ", "xy + xj + yj -1", multiplyComplexNumbersFunc)
+geometricprogression=Generator("Geometric Progression", 65, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", GeomProgrFunc)
+geometricMean=Generator("Geometric Mean of N Numbers",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)
+harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)