mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 14:35:23 +01:00
Merge pull request #44 from ganesh003/patch-8
Added Fraction Division Function
This commit is contained in:
@@ -164,6 +164,31 @@ def decimalToBinary(max_dec=99):
|
|||||||
solution = str(b)
|
solution = str(b)
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
def divideFractionsFunc(maxVal=10):
|
||||||
|
a = random.randint(1, maxVal)
|
||||||
|
b = random.randint(1, maxVal)
|
||||||
|
while (a == b):
|
||||||
|
b = random.randint(1, maxVal)
|
||||||
|
c = random.randint(1, maxVal)
|
||||||
|
d = random.randint(1, maxVal)
|
||||||
|
while (c == d):
|
||||||
|
d = random.randint(1, maxVal)
|
||||||
|
def calculate_gcd(x, y):
|
||||||
|
while(y):
|
||||||
|
x, y = y, x % y
|
||||||
|
return x
|
||||||
|
tmp_n = a * d
|
||||||
|
tmp_d = b * c
|
||||||
|
gcd = calculate_gcd(tmp_n, tmp_d)
|
||||||
|
x = f"{tmp_n//gcd}/{tmp_d//gcd}"
|
||||||
|
if (tmp_d == 1 or tmp_d == gcd):
|
||||||
|
x = f"{tmp_n//gcd}"
|
||||||
|
# for equal numerator and denominators
|
||||||
|
problem = f"({a}/{b})/({c}/{d})"
|
||||||
|
solution = x
|
||||||
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
# || Class Instances
|
# || Class Instances
|
||||||
|
|
||||||
#Format is:
|
#Format is:
|
||||||
@@ -183,3 +208,4 @@ basicAlgebra = Generator("Basic_Algebra", 13, "ax + b = c", "d", basicAlgebraFun
|
|||||||
log = Generator("Logarithm", 13, "log2(8)", "3", logFunc)
|
log = Generator("Logarithm", 13, "log2(8)", "3", logFunc)
|
||||||
intdivision = Generator("Easy Divisio",14,"a/b=","c",divisionToIntFunc)
|
intdivision = Generator("Easy Divisio",14,"a/b=","c",divisionToIntFunc)
|
||||||
decimaltobinary = Generator("Decimal to Binary",15,"Binary of a=","b",decimalToBinary)
|
decimaltobinary = Generator("Decimal to Binary",15,"Binary of a=","b",decimalToBinary)
|
||||||
|
fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
|
||||||
|
|||||||
Reference in New Issue
Block a user