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

yapf fix

Browse Source
This commit is contained in:
lukew3
2020-10-21 14:34:42 -04:00
parent 55fb0a18f6
commit d647e9710f
31 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mathgenerator/funcs/base_conversion.py
View File

@@ -5,7 +5,9 @@ alpha = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
def fromBaseTenTo(n, toBase):
assert type(toBase) == int and toBase >= 2 and toBase <= 36, "toBase({}) must be >=2 and <=36"
assert type(
toBase
) == int and toBase >= 2 and toBase <= 36, "toBase({}) must be >=2 and <=36"
# trivial cases
if toBase == 2:
return bin(n)[2:]
@@ -16,12 +18,13 @@ def fromBaseTenTo(n, toBase):
elif toBase == 16:
return hex(n)[2:].upper()
res = alpha[n % toBase]
n = n//toBase
n = n // toBase
while n > 0:
res = alpha[n % toBase] + res
n = n//toBase
n = n // toBase
return res
# Useful to check answers, but not needed here
# def toBaseTen(n,fromBase):
# return int(n,fromBase)
@@ -29,12 +32,16 @@ def fromBaseTenTo(n, toBase):
def baseConversionFunc(maxNum=60000, maxBase=16):
assert type(
maxNum) == int and maxNum >= 100 and maxNum <= 65536, "maxNum({}) must be >=100 and <=65536".format(maxNum)
maxNum
) == int and maxNum >= 100 and maxNum <= 65536, "maxNum({}) must be >=100 and <=65536".format(
maxNum)
assert type(
maxBase) == int and maxBase >= 2 and maxBase <= 36, "maxBase({}) must be >= 2 and <=36".format(maxBase)
maxBase
) == int and maxBase >= 2 and maxBase <= 36, "maxBase({}) must be >= 2 and <=36".format(
maxBase)
n = random.randint(40, maxNum)
dist = [10]*10+[2]*5+[16]*5+[i for i in range(2, maxBase+1)]
dist = [10] * 10 + [2] * 5 + [16] * 5 + [i for i in range(2, maxBase + 1)]
# set this way since converting to/from bases 2,10,16 are more common -- can be changed if needed.
bases = random.choices(dist, k=2)
while bases[0] == bases[1]:
@@ -46,5 +53,6 @@ def baseConversionFunc(maxNum=60000, maxBase=16):
return problem, ans
base_conversion = Generator("Base Conversion", 94, "Convert 152346 from base 8 to base 10.", "54502",
base_conversion = Generator("Base Conversion", 94,
"Convert 152346 from base 8 to base 10.", "54502",
baseConversionFunc)