mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 14:35:23 +01:00
makeReadme.py added and generators with newloine chars fixed
This commit is contained in:
lukew3
69
README.md
69
README.md
@@ -30,21 +30,54 @@ problem, solution = mathgen.genById(0)
|
||||
|
||||
| Id | Skill | Example problem | Example Solution | Function Name |
|
||||
|------|-----------------------------------|--------------------|-----------------------|--------------------------|
|
||||
| 0 | Addition | 1+5= | 6 | addition |
|
||||
| 1 | Subtraction | 9-4= | 5 | subtraction |
|
||||
| 2 | Multiplication | 4*6= | 24 | multiplication |
|
||||
| 3 | Division | 4/3= | 1.33333333 | division |
|
||||
| 4 | Binary Complement 1s | 1010= | 0101 | binaryComplement1s |
|
||||
| 5 | Modulo Division | 10%3= | 1 | moduloDivision |
|
||||
| 6 | Square Root | sqrt(25)= | 5 | squareRootFunction |
|
||||
| 7 | Power Rule Differentiation | 4x^3 | 12x^2 | powerRuleDifferentiation |
|
||||
| 8 | Square | 4^2 | 16 | square |
|
||||
| 9 | LCM (Least Common Multiple) | LCM of 14 and 9 = | 126 | lcm |
|
||||
| 10 | GCD (Greatest Common Denominator) | GCD of 18 and 18 = | 18 | gcd |
|
||||
| 11 | Basic Algebra | 9x + 7 = 10 | 1/3 | basicAlgebra |
|
||||
| 12 | Logarithm | log3(3) | 1 | log |
|
||||
| 13 | Easy Division | 270/15 = | 18 | intDivision |
|
||||
| 14 | Decimal to Binary | Binary of a= | b | decimalToBinary |
|
||||
| 15 | Binary to Decimal | Decimal of a= | b | binaryToDecimal |
|
||||
| 16 | Fraction Division | (a/b)/(c/d)= | x/y | fractionDivision |
|
||||
| 17 | Int 2x2 Matrix Multiplication | k * [[a,b],[c,d]]= | [[k*a,k*b],[k*c,k*d]] | intMatrix22Multiplication|
|
||||
| 0 | Addition | 29+33= | 62 | addition |
|
||||
| 1 | Subtraction | 62-7= | 55 | subtraction |
|
||||
| 2 | Multiplication | 93*1= | 93 | multiplication |
|
||||
| 3 | Division | 59/47= | 1.2553191489361701 | division |
|
||||
| 4 | Binary Complement 1s | 001110000 | 110001111 | binaryComplement1s |
|
||||
| 5 | Modulo Division | 89%34= | 21 | moduloDivision |
|
||||
| 6 | Square Root | sqrt(16)= | 4 | squareRoot |
|
||||
| 7 | Power Rule Differentiation | 4x^3 | 12x^2 | powerRuleDifferentiation |
|
||||
| 8 | Square | 12^2= | 144 | square |
|
||||
| 9 | LCM (Least Common Multiple) | LCM of 10 and 1 = | 10 | lcm |
|
||||
| 10 | GCD (Greatest Common Denominator) | GCD of 12 and 5 = | 1 | gcd |
|
||||
| 11 | Basic Algebra | 8x + 7 = 10 | 3/8 | basicAlgebra |
|
||||
| 12 | Logarithm | log3(729) | 6 | log |
|
||||
| 13 | Easy Division | 378/21 = | 18 | intDivision |
|
||||
| 14 | Decimal to Binary | Binary of 4= | 100 | decimalToBinary |
|
||||
| 15 | Binary to Decimal | 10011 | 19 | binaryToDecimal |
|
||||
| 16 | Fraction Division | (1/2)/(4/3) | 3/8 | fractionDivision |
|
||||
| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[0, 7], [7, 7]] = | [[0,14],[14,14]] | intMatrix22Multiplication |
|
||||
| 18 | Area of Triangle | Area of triangle with side lengths: 9 14 15 = | 61.644140029689765 | areaOfTriangle |
|
||||
| 19 | Triangle exists check | Does triangle with sides 33, 6 and 43 exist? | No | doesTriangleExist |
|
||||
| 20 | Midpoint of the two point | (-15,-10),(-5,2)= | (-10.0,-4.0) | midPointOfTwoPoint |
|
||||
| 21 | Factoring Quadratic | x^2-17x+72 | (x-9)(x-8) | factoring |
|
||||
| 22 | Third Angle of Triangle | Third angle of triangle with angles 4 and 31 = | 145 | thirdAngleOfTriangle |
|
||||
| 23 | Solve a System of Equations in R^2 | 4x - 8y = 48, 3x - 8y = 40 | x = 8, y = -2 | systemOfEquations |
|
||||
| 24 | Distance between 2 points | Find the distance between (-9, -20) and (18, -19) | sqrt(730) | distance2Point |
|
||||
| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 13 = | 22.20 | pythagoreanTheorem |
|
||||
| 26 | Linear Equations | -11x + -16y = -302
|
||||
1x + 20y = 250 | x = 10, y = 12 | linearEquations |
|
||||
| 27 | Prime Factorisation | Find prime factors of 55 | [5, 11] | primeFactors |
|
||||
| 28 | Fraction Multiplication | (4/9)*(8/10) | 16/45 | fractionMultiplication |
|
||||
| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | angleRegularPolygon |
|
||||
| 30 | Combinations of Objects | Number of combinations from 13 objects picked 1 at a time | 13 | combinations |
|
||||
| 31 | Factorial | 2! = | 2 | factorial |
|
||||
| 32 | Surface Area of Cube | Surface area of cube with side = 13m is | 1014 m^2 | surfaceAreaCubeGen |
|
||||
| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 5m, 3m, 7m is | 142 m^2 | surfaceAreaCuboidGen |
|
||||
| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 15m and radius = 7m is | 967 m^2 | surfaceAreaCylinderGen |
|
||||
| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen |
|
||||
| 36 | Volume of Cuboid | Volume of cuboid with sides = 6m, 1m, 10m is | 60 m^3 | volumeCuboidGen |
|
||||
| 37 | Volume of cylinder | Volume of cylinder with height = 26m and radius = 15m is | 18378 m^3 | volumeCylinderGen |
|
||||
| 38 | Surface Area of cone | Surface area of cone with height = 46m and radius = 14m is | 2730 m^2 | surfaceAreaConeGen |
|
||||
| 39 | Volume of cone | Volume of cone with height = 7m and radius = 11m is | 886 m^3 | volumeConeGen |
|
||||
| 40 | Common Factors | Common Factors of 91 and 51 = | [1] | commonFactors |
|
||||
| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6/4x + 5 and y = -7/2x + 3 | (-2/5, 22/5) | intersectionOfTwoLines |
|
||||
| 42 | Permutations | Number of Permutations from 13 objects picked 4 at a time = | 17160 | permutations |
|
||||
| 43 | Cross Product of 2 Vectors | [-14, 13, 20] X [-5, -18, 19] = | [607, 166, 317] | vectorCross |
|
||||
| 44 | Compare Fractions | Which symbol represents the comparison between 8/3 and 6/7? | > | compareFractions |
|
||||
| 45 | Simple Interest | Simple interest for a principle amount of 6128 dollars, 5% rate of interest and for a time period of 5 years is = | 1532.0 | simpleInterest |
|
||||
| 46 | Multiplication of two matrices | Multiply [[-20, -14, -88, -62, 39, 94, 21, 75, 26], [89, -67, -80, -60, 32, -23, -79, 11, -69], [13, -75, -66, 3, 67, -79, -49, 6, 36], [-44, -84, 68, -27, -86, -95, -71, -77, -62], [45, 58, 89, 82, 30, -83, -23, 51, 95], [11, 46, 100, -15, 60, -34, 85, 50, -44], [93, -100, -62, 63, -73, -64, 90, -15, 23], [-8, 91, -22, 53, -42, 25, 32, -26, 31], [-60, 90, 75, -42, 19, 33, -30, 74, 13]] and [[-80, 54, -39, 37, -99], [31, -28, -31, 64, 73], [-21, -34, -28, -21, -76], [-94, 55, 66, 0, 17], [-28, 25, -65, -74, 100], [76, 74, -96, -98, -5], [-90, -70, -66, -71, -35], [65, 49, -100, 72, -23], [-95, -97, -31, -84, -86]] | [[15409, 6508, -21665, -10161, 5326], [9859, 17962, 3267, 12768, 3119], [-8761, 1272, 8611, 738, 3881], [4489, -5790, 29652, 11947, -5940], [-22167, -8208, -1142, 6747, -10714], [-4628, -5167, -15527, 1404, 243], [-29240, -2432, 11103, 615, -22487], [-5498, -5038, 1462, -100, 2495], [18214, -3238, -15548, 3691, 6061]] | matrixMultiplication |
|
||||
| 47 | Cube Root | cuberoot of 711 upto 2 decimal places is: | 8.93 | CubeRoot |
|
||||
| 48 | Power Rule Integration | 3x^1 | (3/1)x^2 + c | powerRuleIntegration |
|
||||
| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 94 , 101, 102 = | 63 | fourthAngleOfQuadrilateral |
|
||||
|
||||
25
makeReadme.py
Normal file
25
makeReadme.py
Normal file
@@ -0,0 +1,25 @@
|
||||
#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
|
||||
for item in wList:
|
||||
myGen = item[2]
|
||||
prob, sol = myGen()
|
||||
prob = str(prob).rstrip("\n")
|
||||
sol = str(sol).rstrip("\n")
|
||||
instName = lines[line]
|
||||
def_name = instName[:instName.find('=')].strip()
|
||||
row = [myGen.id, myGen.title, prob, sol, def_name]
|
||||
line+=1
|
||||
allRows.append(row)
|
||||
|
||||
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)
|
||||
g.close()
|
||||
|
||||
print("New README.md table generated")
|
||||
@@ -666,8 +666,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
|
||||
solution= matrixMultiplicationFuncHelper(res)
|
||||
problem= f"Multiply {a} and {b}" #consider using a, b instead of a_string, b_string if the problem doesn't look right
|
||||
solution= res#matrixMultiplicationFuncHelper(res)
|
||||
return problem, solution
|
||||
|
||||
def matrixMultiplicationFuncHelper(inp):
|
||||
@@ -741,8 +741,7 @@ doesTriangleExist = Generator("Triangle exists check", 19, "Does triangle with s
|
||||
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)
|
||||
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
|
||||
@@ -769,3 +768,29 @@ matrixMultiplication = Generator("Multiplication of two matrices", 46, "Multipl
|
||||
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)
|
||||
|
||||
wList = getGenList()
|
||||
#print(wList)
|
||||
allRows = []
|
||||
f=open('mathgen.py')
|
||||
lines=f.readlines()
|
||||
line = 720
|
||||
for item in wList:
|
||||
myGen = item[2]
|
||||
prob, sol = myGen()
|
||||
prob = str(prob).rstrip("\n")
|
||||
sol = str(sol).rstrip("\n")
|
||||
instName = lines[line]
|
||||
def_name = instName[:instName.find('=')].strip()
|
||||
print(def_name)
|
||||
row = [myGen.id, myGen.title, prob, sol, def_name]
|
||||
print(row)
|
||||
line+=1
|
||||
allRows.append(row)
|
||||
|
||||
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)
|
||||
#print(tableLine)
|
||||
g.close()
|
||||
|
||||
Reference in New Issue
Block a user