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 #2 from Ritu1611/Ritu1611-patch-3

Browse Source 
Update mathgen.py
This commit is contained in:
Ritu Raj
2020-10-16 23:28:58 +05:30
committed by GitHub
parent c0f2c9b281 7f66db8e3f
commit bfe8b7c1be
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mathgenerator/mathgen.py
View File

@@ -386,6 +386,18 @@ 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 permutationFunc(maxlength=20):
def factorial(a):
d=1
for i in range(a):
a=(i+1)*d
d=a
return d
a= random.randint(10,maxlength)
b=random.randint(0,9)
solution= int(factorial(a)/(factorial(a-b)))
problem= "Number of combinations from {} objects picked {} at a time = ".format(a,b)
return problem, solution
# || Class Instances # || Class Instances
@@ -419,4 +431,5 @@ systemOfEquations = Generator("Solve a System of Equations in R^2", 23, "2x + 5y
distance2Point = Generator("Distance between 2 points", 24, "Find the distance between (x1,y1) and (x2,y2)","sqrt(distanceSquared)", distanceTwoPointsFunc) 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) 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)
permutations= Generator("Permutations",28, "Total permutations of 4 objects at a time from 10 objects is","5040", permutationFunc)