deadvey/mathgenerator
1
0
Fork 0
mirror of https://github.com/DeaDvey/mathgenerator.git synced 2025-11-28 06:25:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Luke Weiler
2020-10-15 19:28:57 -04:00
committed by GitHub
parent d2830507cf 1790e31160
commit 4af32e9e12
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mathgenerator/mathgen.py
View File

@@ -206,6 +206,17 @@ def divideFractionsFunc(maxVal=10):
solution = x solution = x
return problem, solution return problem, solution
def multiplyIntToMatrix22(maxMatrixVal = 10, maxRes = 100):
a = random.randint(0, maxMatrixVal)
b = random.randint(0, maxMatrixVal)
c = random.randint(0, maxMatrixVal)
d = random.randint(0, maxMatrixVal)
constant = random.randint(0, int(maxRes/max(a,b,c,d)))
problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = "
solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]"
return problem, solution
def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20):
a = random.randint(1, maxA) a = random.randint(1, maxA)
b = random.randint(1, maxB) b = random.randint(1, maxB)
@@ -215,7 +226,6 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20):
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 solution = area
return problem, solution return problem, solution
# || Class Instances # || Class Instances
#Format is: #Format is:
@@ -237,4 +247,5 @@ intDivision = Generator("Easy Division", 13,"a/b=","c",divisionToIntFunc)
decimalToBinary = Generator("Decimal to Binary",14,"Binary of a=","b",DecimalToBinaryFunc) decimalToBinary = Generator("Decimal to Binary",14,"Binary of a=","b",DecimalToBinaryFunc)
binaryToDecimal = Generator("Binary to Decimal",15,"Decimal of a=","b",BinaryToDecimalFunc) binaryToDecimal = Generator("Binary to Decimal",15,"Decimal of a=","b",BinaryToDecimalFunc)
fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc) fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc) 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)