Update mathgen.py

This commit is contained in:
Luke Weiler
2020-10-16 13:17:01 -04:00
committed by GitHub
parent 4e80e00920
commit 5c79fef2fb

View File

@@ -386,7 +386,8 @@ def primeFactors(minVal=1, maxVal=200):
problem = f"Find prime factors of {a}" problem = f"Find prime factors of {a}"
solution = f"{factors}" solution = f"{factors}"
return problem, solution return problem, solution
def combination(maxlength=20):
def combinationsFunc(maxlength=20):
def factorial(a): def factorial(a):
d=1 d=1
for i in range(a): for i in range(a):
@@ -433,4 +434,4 @@ distance2Point = Generator("Distance between 2 points", 24, "Find the distance b
pythagoreanTheorem = Generator("Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc) 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 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, ...]", primeFactors) primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", "[b, c, d, ...]", primeFactors)
combinations=Generator("Combinations of Objects",28, "Combinations available for picking 4 objects at a time from 6 distinct objects ="," 15", combinations) combinations = Generator("Combinations of Objects",28, "Combinations available for picking 4 objects at a time from 6 distinct objects ="," 15", combinationsFunc)