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

Merge pull request #93 from adityapanchal10/master

Browse Source 
added factorial function
This commit is contained in:
Luke Weiler
2020-10-16 13:21:15 -04:00
committed by GitHub
parent 41388098f5 81602ca484
commit 99c18e919d
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

@@ -430,6 +430,23 @@ def combinationsFunc(maxlength=20):
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)
return problem, solution return problem, solution
def factorialFunc(maxInput = 6):
a = random.randint(0, maxInput)
n = a
problem = str(a) + "! = "
b = 1
if a == 1:
solution = str(b)
return problem, solution
else:
while n > 0:
b *= n
n = n - 1
solution = str(b)
return problem, solution
# || Class Instances # || Class Instances
#Format is: #Format is:
@@ -466,3 +483,4 @@ primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", "[b,
fractionMultiplication = Generator("Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc) fractionMultiplication = Generator("Fraction Multiplication", 28, "(a/b)*(c/d)=", "x/y", multiplyFractionsFunc)
angleRegularPolygon = Generator("Angle of a Regular Polygon",29,"Find the angle of a regular polygon with 6 sides","120",regularPolygonAngleFunc) angleRegularPolygon = Generator("Angle of a Regular Polygon",29,"Find the angle of a regular polygon with 6 sides","120",regularPolygonAngleFunc)
combinations = Generator("Combinations of Objects",30, "Combinations available for picking 4 objects at a time from 6 distinct objects ="," 15", combinationsFunc) combinations = Generator("Combinations of Objects",30, "Combinations available for picking 4 objects at a time from 6 distinct objects ="," 15", combinationsFunc)
factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc)