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 #45 from gokulp01/patch-1

Browse Source 
Added Binary to Decimal Generator
This commit is contained in:
Luke Weiler
2020-10-15 10:23:02 -04:00
committed by GitHub
parent d09953bd82 f220cd62cb
commit d93560dda5
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mathgenerator/mathgen.py
View File

@@ -157,13 +157,22 @@ def divisionToIntFunc(maxA=25, maxB=25):
solution=int(divisor/dividend) solution=int(divisor/dividend)
return problem,solution return problem,solution
def decimalToBinary(max_dec=99): def DecimalToBinary(max_dec=99):
a = random.randint(1, max_dec) a = random.randint(1, max_dec)
b = bin(a).replace("0b", "") b = bin(a).replace("0b", "")
problem = "Binary of "+str(a)+"=" problem = "Binary of "+str(a)+"="
solution = str(b) solution = str(b)
return problem, solution return problem, solution
def BinaryToDecimal(max_dig=10):
problem=''
for i in range(random.randint(1,max_dig)):
temp = str(random.randint(0, 1))
problem += temp
solution=int(problem, 2);
return problem, solution
def divideFractionsFunc(maxVal=10): def divideFractionsFunc(maxVal=10):
a = random.randint(1, maxVal) a = random.randint(1, maxVal)
b = random.randint(1, maxVal) b = random.randint(1, maxVal)
@@ -188,7 +197,6 @@ def divideFractionsFunc(maxVal=10):
solution = x solution = x
return problem, solution return problem, solution
# || Class Instances # || Class Instances
#Format is: #Format is:
@@ -207,5 +215,6 @@ gcd = Generator("Gcd_generator", 12, "GCD of a and b = ", "c", gcdFunc)
basicAlgebra = Generator("Basic_Algebra", 13, "ax + b = c", "d", basicAlgebraFunc) basicAlgebra = Generator("Basic_Algebra", 13, "ax + b = c", "d", basicAlgebraFunc)
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) binarytodecimal = Generator("Binary to Decimal",16,"Decimal of a=","b",BinaryToDecimal)
fractionDivision = Generator("Fraction Division", 17, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)