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 pull request #6 from samudoria/samu_b

Browse Source 
Added multiplication and division
This commit is contained in:
Luke Weiler
2020-10-14 13:18:02 -04:00
committed by GitHub
parent 8dda34f6b6 dc3e40bafe
commit ee0c6aaaeb
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mathgenerator/mathgen.py
View File

@@ -35,9 +35,27 @@ def subtractionFunc(maxMinuend = 99, maxDiff = 99):
solution = str(c) solution = str(c)
return problem, solution return problem, solution
def multiplicationFunc(maxRes = 99, maxMulti = 99):
a = random.randint(0, maxMulti)
b = random.randint(0, min(maxRes, maxMulti))
c = a*b
problem = str(a) + "*" + str(b) + "="
solution = str(c)
return problem, solution
def divisionFunc(maxRes = 99, maxDivid = 99):
a = random.randint(0, maxDivid)
b = random.randint(0, min(maxRes, maxDivid))
c = a/b
problem = str(a) + "/" + str(b) + "="
solution = str(c)
return problem, solution
# || Class Instances # || Class Instances
#Format is: #Format is:
#<title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) #<title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>)
addition = Generator("Addition", 2, "a+b=", "c", additionFunc) addition = Generator("Addition", 2, "a+b=", "c", additionFunc)
subtraction = Generator("Subtraction", 3, "a-b=", "c", subtractionFunc) subtraction = Generator("Subtraction", 3, "a-b=", "c", subtractionFunc)
multiplication = Generator("Multiplication", 4, "a*b=", "c", multiplicationFunc)
division = Generator("Division", 5, "a/b=", "c", divisionFunc)