mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 14:35:23 +01:00
renamed main generator funcs to gen_func
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def BCDtoDecimalFunc(maxNumber=10000, format='string'):
|
||||
def gen_func(maxNumber=10000, format='string'):
|
||||
n = random.randint(1000, maxNumber)
|
||||
binstring = ''
|
||||
while True:
|
||||
@@ -26,4 +26,4 @@ def BCDtoDecimalFunc(maxNumber=10000, format='string'):
|
||||
|
||||
|
||||
bcd_to_decimal = Generator("Binary Coded Decimal to Integer", 91,
|
||||
BCDtoDecimalFunc, ["maxNumber=10000"])
|
||||
gen_func, ["maxNumber=10000"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def binary2sComplementFunc(maxDigits=10, format='string'):
|
||||
def gen_func(maxDigits=10, format='string'):
|
||||
digits = random.randint(1, maxDigits)
|
||||
question = ''.join([str(random.randint(0, 1))
|
||||
for i in range(digits)]).lstrip('0')
|
||||
@@ -34,4 +34,4 @@ def binary2sComplementFunc(maxDigits=10, format='string'):
|
||||
|
||||
|
||||
binary_2s_complement = Generator("Binary 2's Complement", 73,
|
||||
binary2sComplementFunc, ["maxDigits=10"])
|
||||
gen_func, ["maxDigits=10"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def binaryComplement1sFunc(maxDigits=10, format='string'):
|
||||
def gen_func(maxDigits=10, format='string'):
|
||||
question = ''
|
||||
answer = ''
|
||||
|
||||
@@ -20,4 +20,4 @@ def binaryComplement1sFunc(maxDigits=10, format='string'):
|
||||
|
||||
|
||||
binary_complement_1s = Generator("Binary Complement 1s", 4,
|
||||
binaryComplement1sFunc, ["maxDigits=10"])
|
||||
gen_func, ["maxDigits=10"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def binaryToDecimalFunc(max_dig=10, format='string'):
|
||||
def gen_func(max_dig=10, format='string'):
|
||||
problem = ''
|
||||
|
||||
for i in range(random.randint(1, max_dig)):
|
||||
@@ -17,5 +17,5 @@ def binaryToDecimalFunc(max_dig=10, format='string'):
|
||||
return problem, solution
|
||||
|
||||
|
||||
binary_to_decimal = Generator("Binary to Decimal", 15, binaryToDecimalFunc,
|
||||
binary_to_decimal = Generator("Binary to Decimal", 15, gen_func,
|
||||
["max_dig=10"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def binaryToHexFunc(max_dig=10, format='string'):
|
||||
def gen_func(max_dig=10, format='string'):
|
||||
problem = ''
|
||||
for i in range(random.randint(1, max_dig)):
|
||||
temp = str(random.randint(0, 1))
|
||||
@@ -16,5 +16,5 @@ def binaryToHexFunc(max_dig=10, format='string'):
|
||||
return problem, solution
|
||||
|
||||
|
||||
binary_to_hex = Generator("Binary to Hexidecimal", 64, binaryToHexFunc,
|
||||
binary_to_hex = Generator("Binary to Hexidecimal", 64, gen_func,
|
||||
["max_dig=10"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def DecimalToBCDFunc(maxNumber=10000, format='string'):
|
||||
def gen_func(maxNumber=10000, format='string'):
|
||||
n = random.randint(1000, maxNumber)
|
||||
x = n
|
||||
# binstring = ''
|
||||
@@ -22,4 +22,4 @@ def DecimalToBCDFunc(maxNumber=10000, format='string'):
|
||||
|
||||
|
||||
decimal_to_bcd = Generator("Decimal to Binary Coded Decimal", 103,
|
||||
DecimalToBCDFunc, ["maxNumber=10000"])
|
||||
gen_func, ["maxNumber=10000"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def DecimalToBinaryFunc(max_dec=99, format='string'):
|
||||
def gen_func(max_dec=99, format='string'):
|
||||
a = random.randint(1, max_dec)
|
||||
b = bin(a).replace("0b", "")
|
||||
|
||||
@@ -15,5 +15,5 @@ def DecimalToBinaryFunc(max_dec=99, format='string'):
|
||||
return a, str(b)
|
||||
|
||||
|
||||
decimal_to_binary = Generator("Decimal to Binary", 14, DecimalToBinaryFunc,
|
||||
decimal_to_binary = Generator("Decimal to Binary", 14, gen_func,
|
||||
["max_dec=99"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def deciToHexaFunc(max_dec=1000, format='string'):
|
||||
def gen_func(max_dec=1000, format='string'):
|
||||
a = random.randint(0, max_dec)
|
||||
b = hex(a)
|
||||
|
||||
@@ -15,5 +15,5 @@ def deciToHexaFunc(max_dec=1000, format='string'):
|
||||
return a, str(b)
|
||||
|
||||
|
||||
decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, deciToHexaFunc,
|
||||
decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, gen_func,
|
||||
["max_dec=1000"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def decimalToOctalFunc(maxDecimal=4096, format='string'):
|
||||
def gen_func(maxDecimal=4096, format='string'):
|
||||
x = random.randint(0, maxDecimal)
|
||||
problem = "The decimal number " + str(x) + " in Octal is: "
|
||||
solution = oct(x)
|
||||
@@ -15,4 +15,4 @@ def decimalToOctalFunc(maxDecimal=4096, format='string'):
|
||||
|
||||
|
||||
decimal_to_octal = Generator("Converts decimal to octal", 84,
|
||||
decimalToOctalFunc, ["maxDecimal=4096"])
|
||||
gen_func, ["maxDecimal=4096"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def fibonacciSeriesFunc(minNo=1, format='string'):
|
||||
def gen_func(minNo=1, format='string'):
|
||||
n = random.randint(minNo, 20)
|
||||
|
||||
def createFibList(n):
|
||||
@@ -26,5 +26,5 @@ def fibonacciSeriesFunc(minNo=1, format='string'):
|
||||
return n, fibList
|
||||
|
||||
|
||||
fibonacci_series = Generator("Fibonacci Series", 56, fibonacciSeriesFunc,
|
||||
fibonacci_series = Generator("Fibonacci Series", 56, gen_func,
|
||||
["minNo=1"])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def moduloFunc(maxRes=99, maxModulo=99, format='string'):
|
||||
def gen_func(maxRes=99, maxModulo=99, format='string'):
|
||||
a = random.randint(0, maxModulo)
|
||||
b = random.randint(0, min(maxRes, maxModulo))
|
||||
c = a % b if b != 0 else 0
|
||||
@@ -16,5 +16,5 @@ def moduloFunc(maxRes=99, maxModulo=99, format='string'):
|
||||
return a, b, c
|
||||
|
||||
|
||||
modulo_division = Generator("Modulo Division", 5, moduloFunc,
|
||||
modulo_division = Generator("Modulo Division", 5, gen_func,
|
||||
["maxRes=99", "maxModulo=99"])
|
||||
|
||||
@@ -3,7 +3,7 @@ from .__init__ import *
|
||||
import math
|
||||
|
||||
|
||||
def nthFibonacciNumberFunc(maxN=100, format='string'):
|
||||
def gen_func(maxN=100, format='string'):
|
||||
golden_ratio = (1 + math.sqrt(5)) / 2
|
||||
n = random.randint(1, maxN)
|
||||
problem = f"What is the {n}th Fibonacci number?"
|
||||
@@ -18,4 +18,4 @@ def nthFibonacciNumberFunc(maxN=100, format='string'):
|
||||
|
||||
|
||||
nth_fibonacci_number = Generator("nth Fibonacci number", 62,
|
||||
nthFibonacciNumberFunc, ["maxN=100"])
|
||||
gen_func, ["maxN=100"])
|
||||
|
||||
Reference in New Issue
Block a user