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 #106 from Ritu1611/master

Browse Source 
For Permutations Generator
This commit is contained in:
Luke Weiler
2020-10-16 18:04:29 -04:00
committed by GitHub
parent 4ab68f60fe 3017f82551
commit cdd09abb0a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mathgenerator/mathgen.py
View File

@@ -420,6 +420,7 @@ def regularPolygonAngleFunc(minVal = 3,maxVal = 20):
return problem, solution return problem, solution
def combinationsFunc(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):
@@ -428,6 +429,9 @@ def combinationsFunc(maxlength=20):
return d return d
a= random.randint(10,maxlength) a= random.randint(10,maxlength)
b=random.randint(0,9) b=random.randint(0,9)
solution= int(factorial(a)/(factorial(b)*factorial(a-b))) solution= int(factorial(a)/(factorial(b)*factorial(a-b)))
problem= "Number of combinations from {} objects picked {} at a time ".format(a,b) problem= "Number of combinations from {} objects picked {} at a time ".format(a,b)
@@ -586,6 +590,13 @@ def intersectionOfTwoLinesFunc(
solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})"
return problem, solution return problem, solution
def permutationFunc(maxlength=20):
a = random.randint(10,maxlength)
b = random.randint(0,9)
solution= int(math.factorial(a)/(math.factorial(a-b)))
problem= "Number of Permutations from {} objects picked {} at a time = ".format(a,b)
return problem, solution
# || Class Instances # || Class Instances
#Format is: #Format is:
@@ -633,3 +644,4 @@ surfaceAreaConeGen = Generator("Surface Area of cone", 38, "Surface area of cone
volumeConeGen = Generator("Volume of cone", 39, "Volume of cone with height = a units and radius = b units is","c units^3", volumeCone) volumeConeGen = Generator("Volume of cone", 39, "Volume of cone with height = a units and radius = b units is","c units^3", volumeCone)
commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ","[c, d, ...]",commonFactorsFunc) commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ","[c, d, ...]",commonFactorsFunc)
intersectionOfTwoLines = Generator("Intersection of Two Lines", 41, "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc) intersectionOfTwoLines = Generator("Intersection of Two Lines", 41, "Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
permutations= Generator("Permutations",42, "Total permutations of 4 objects at a time from 10 objects is","5040", permutationFunc)