Merge branch 'master' into master

This commit is contained in:
Luke Weiler
2020-10-19 14:19:37 -04:00
committed by GitHub
85 changed files with 636 additions and 405 deletions

View File

@@ -35,6 +35,7 @@ We currently just underwent a large reconstruction of the repository. Here is ho
* Place `.__init__ import *` at the top of your file and then write your function in the lines beneath it
* Add `from .<yourfunc> import *` at the bottom of the `__init__.py` file inside the funcs directory
If you have issues with checks you can try using yapf to fix linter errors or just go through them line by line.
### Provide Ideas
If you have an idea for a generator but don't have the time or know-how to create it, you can add it as an issue. If you have a lot of ideas, I would suggest adding them to the table in README.md so that they are easier for our team to manage.

View File

@@ -8,7 +8,8 @@ with open('mathgenerator/mathgen.py', 'r') as f:
lines = f.readlines()
allRows = []
line = lines.index('# Funcs_start - DO NOT REMOVE!\n')+1 # get the first line of the functions in mathgen.py
# get the first line of the functions in mathgen.py
line = lines.index('# Funcs_start - DO NOT REMOVE!\n') + 1
for item in wList:
myGen = item[2]
# NOTE: renamed 'sol' to 'solu' to make it look nicer
@@ -27,7 +28,8 @@ for item in wList:
print(prob)
instName = lines[line]
func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more
# NOTE: renamed 'def_name' to 'func_name' because it suits it more
func_name = instName[:instName.find('=')].strip()
row = [myGen.id, myGen.title, prob, solu, func_name]
# print(item[1], func_name)
line += 1
@@ -42,7 +44,8 @@ with open('README.md', "r") as g:
lines = lines[:line + 1]
for row in allRows:
tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str(row[2]) + " | " + str(row[3]) + " | " + str(row[4]) + " |\n"
tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str(
row[2]) + " | " + str(row[3]) + " | " + str(row[4]) + " |\n"
lines.append(tableLine)
with open('README.md', "w") as g:

View File

@@ -1,6 +1,6 @@
genList = []
class Generator:
def __init__(self, title, id, generalProb, generalSol, func):
self.title = title
@@ -11,10 +11,13 @@ class Generator:
genList.append([id, title, self])
def __str__(self):
return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol
return str(
self.id
) + " " + self.title + " " + self.generalProb + " " + self.generalSol
def __call__(self, **kwargs):
return self.func(**kwargs)
def getGenList():
return genList

View File

@@ -20,6 +20,7 @@ def DiceSumProbFunc(maxDice=3):
if i + j + k == b:
count = count + 1
problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(a,b)
problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(
a, b)
solution = "{}/{}".format(count, 6**a)
return problem, solution

View File

@@ -1,10 +1,12 @@
from .__init__ import *
def absoluteDifferenceFunc(maxA=100, maxB=100):
a = random.randint(-1 * maxA, maxA)
b = random.randint(-1 * maxB, maxB)
absDiff = abs(a - b)
problem = "Absolute difference between numbers " + str(a) + " and " + str(b) + " = "
problem = "Absolute difference between numbers " + \
str(a) + " and " + str(b) + " = "
solution = absDiff
return problem, solution

View File

@@ -1,12 +1,15 @@
from .__init__ import *
from ..__init__ import Generator
def additionFunc(maxSum=99, maxAddend=50):
a = random.randint(0, maxAddend)
b = random.randint(0, min((maxSum - a), maxAddend)) # The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
# The highest value of b will be no higher than the maxsum minus the first number and no higher than the maxAddend as well
b = random.randint(0, min((maxSum - a), maxAddend))
c = a + b
problem = str(a) + "+" + str(b) + "="
solution = str(c)
return problem, solution
addition = Generator("Addition", 0, "a+b=", "c", additionFunc)

View File

@@ -9,6 +9,7 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20):
s = (a + b + c) / 2
area = (s * (s - a) * (s - b) * (s - c))**0.5
problem = "Area of triangle with side lengths: " + str(a) + " " + str(b) + " " + str(c) + " = "
problem = "Area of triangle with side lengths: " + \
str(a) + " " + str(b) + " " + str(c) + " = "
solution = area
return problem, solution

View File

@@ -1,14 +1,25 @@
from .__init__ import *
def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one
# Handles degrees in quadrant one
def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90],
functions=["sin", "cos", "tan"]):
angle = random.choice(angles)
function = random.choice(functions)
problem = f"What is {function}({angle})?"
expression = 'math.' + function + '(math.radians(angle))'
result_fraction_map={0.0:"0",0.5:"1/2",0.71:"1/√2",0.87:"√3/2",1.0:"1",0.58:"1/√3",1.73:"√3"}
result_fraction_map = {
0.0: "0",
0.5: "1/2",
0.71: "1/√2",
0.87: "√3/2",
1.0: "1",
0.58: "1/√3",
1.73: "√3"
}
solution=result_fraction_map[round(eval(expression),2)] if round(eval(expression),2)<=99999 else "" #for handling the ∞ condition
solution = result_fraction_map[round(eval(expression), 2)] if round(
eval(expression), 2) <= 99999 else "" # for handling the ∞ condition
return problem, solution

View File

@@ -1,8 +1,10 @@
from .__init__ import *
def binary2sComplementFunc(maxDigits=10):
digits = random.randint(1, maxDigits)
question = ''.join([str(random.randint(0, 1)) for i in range(digits)]).lstrip('0')
question = ''.join([str(random.randint(0, 1))
for i in range(digits)]).lstrip('0')
answer = []
for i in question:
@@ -18,7 +20,7 @@ def binary2sComplementFunc(maxDigits=10):
answer[j] = '0'
j -= 1
if j == 0 and carry == True:
if j == 0 and carry is True:
answer.insert(0, '1')
problem = "2's complement of " + question + " ="

View File

@@ -2,7 +2,6 @@ from .__init__ import *
def combinationsFunc(maxlength=20):
def factorial(a):
d = 1
for i in range(a):
@@ -14,6 +13,7 @@ def combinationsFunc(maxlength=20):
b = random.randint(0, 9)
solution = int(factorial(a) / (factorial(b) * factorial(a - b)))
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

View File

@@ -1,11 +1,18 @@
from .__init__ import *
def compoundInterestFunc(maxPrinciple = 10000, maxRate = 10, maxTime = 10, maxPeriod = 10):
def compoundInterestFunc(maxPrinciple=10000,
maxRate=10,
maxTime=10,
maxPeriod=10):
p = random.randint(100, maxPrinciple)
r = random.randint(1, maxRate)
t = random.randint(1, maxTime)
n = random.randint(1, maxPeriod)
A = p * ((1 + (r / (100 * n))**(n * t)))
problem = "Compound Interest for a principle amount of " + str(p) + " dollars, " + str(r) + "% rate of interest and for a time period of " + str(t) + " compounded monthly is = "
problem = "Compound Interest for a principle amount of " + str(
p) + " dollars, " + str(
r) + "% rate of interest and for a time period of " + str(
t) + " compounded monthly is = "
solution = round(A, 2)
return problem, solution

View File

@@ -25,6 +25,7 @@ def confidenceIntervalFunc():
sd = sd / n
standard_error = lst_t[j] * math.sqrt(sd / n)
problem= 'The confidence interval for sample {} with {}% confidence is'.format([x for x in lst], lst_per[j])
problem = 'The confidence interval for sample {} with {}% confidence is'.format(
[x for x in lst], lst_per[j])
solution = '({}, {})'.format(mean + standard_error, mean - standard_error)
return problem, solution

View File

@@ -21,6 +21,8 @@ def dataSummaryFunc(number_values=15,minval=5,maxval=50):
print(var / number_values)
print((var / number_values)**0.5)
problem="Find the mean,standard deviation and variance for the data"+str(random_list)
solution="The Mean is {} , Standard Deviation is {}, Variance is {}".format(mean,var/number_values,(var/number_values)**0.5)
problem = "Find the mean,standard deviation and variance for the data" + \
str(random_list)
solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format(
mean, var / number_values, (var / number_values)**0.5)
return problem, solution

View File

@@ -1,5 +1,6 @@
from .__init__ import *
def determinantToMatrix22(maxMatrixVal=100):
a = random.randint(0, maxMatrixVal)
b = random.randint(0, maxMatrixVal)

View File

@@ -5,14 +5,14 @@ def fibonacciSeriesFunc(minNo=1):
n = random.randint(minNo, 20)
def createFibList(n):
l=[]
list = []
for i in range(n):
if i < 2:
l.append(i)
list.append(i)
else:
val = l[i-1]+l[i-2]
l.append(val)
return l
val = list[i - 1] + list[i - 2]
list.append(val)
return list
fibList = createFibList(n)

View File

@@ -1,6 +1,11 @@
from .__init__ import *
def geomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term=5):
def geomProgrFunc(number_values=6,
min_value=2,
max_value=12,
n_term=7,
sum_term=5):
r = random.randint(min_value, max_value)
a = random.randint(min_value, max_value)
n_term = random.randint(number_values, number_values + 5)
@@ -8,8 +13,11 @@ def geomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term
GP = []
for i in range(number_values):
GP.append(a * (r**i))
problem="For the given GP "+str(GP)+" ,Find the value of a,common ratio,"+str(n_term)+"th term value, sum upto "+str(sum_term)+"th term"
problem = "For the given GP " + str(
GP) + " ,Find the value of a,common ratio," + str(
n_term) + "th term value, sum upto " + str(sum_term) + "th term"
value_nth_term = a * (r**(n_term - 1))
sum_till_nth_term = a * ((r**sum_term - 1) / (r - 1))
solution="The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format(a,r,n_term,value_nth_term,sum_term,sum_till_nth_term)
solution = "The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format(
a, r, n_term, value_nth_term, sum_term, sum_till_nth_term)
return problem, solution

View File

@@ -1,5 +1,6 @@
from .__init__ import *
def hcfFunc(maxVal=20):
a = random.randint(1, maxVal)
b = random.randint(1, maxVal)

View File

@@ -1,10 +1,12 @@
from .__init__ import *
def intersectionOfTwoLinesFunc(
minM=-10, maxM=10, minB=-10, maxB=10, minDenominator=1, maxDenominator=6
):
def intersectionOfTwoLinesFunc(minM=-10,
maxM=10,
minB=-10,
maxB=10,
minDenominator=1,
maxDenominator=6):
def generateEquationString(m, b):
"""
Generates an equation given the slope and intercept.
@@ -33,8 +35,10 @@ def intersectionOfTwoLinesFunc(
x = f"{x.numerator}/{x.denominator}"
return x
m1 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
m2 = (random.randint(minM, maxM), random.randint(minDenominator, maxDenominator))
m1 = (random.randint(minM,
maxM), random.randint(minDenominator, maxDenominator))
m2 = (random.randint(minM,
maxM), random.randint(minDenominator, maxDenominator))
b1 = random.randint(minB, maxB)
b2 = random.randint(minB, maxB)

View File

@@ -9,7 +9,8 @@ def isTriangleValidFunc(maxSideLength=50):
sideSums = [sideA + sideB, sideB + sideC, sideC + sideA]
sides = [sideC, sideA, sideB]
exists = True & (sides[0] < sideSums[0]) & (sides[1] < sideSums[1]) & (sides[2] < sideSums[2])
exists = True & (sides[0] < sideSums[0]) & (sides[1] < sideSums[1]) & (
sides[2] < sideSums[2])
problem = f"Does triangle with sides {sideA}, {sideB} and {sideC} exist?"
if exists:

View File

@@ -9,12 +9,16 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20):
vars = ['x', 'y', 'z', 'a', 'b', 'c', 'd', 'e', 'f', 'g'][:n]
soln = [random.randint(-varRange, varRange) for i in range(n)]
problem = list()
solution = ", ".join(["{} = {}".format(vars[i], soln[i]) for i in range(n)])
solution = ", ".join(
["{} = {}".format(vars[i], soln[i]) for i in range(n)])
for _ in range(n):
coeff = [random.randint(-coeffRange, coeffRange) for i in range(n)]
res = sum([coeff[i] * soln[i] for i in range(n)])
prob = ["{}{}".format(coeff[i], vars[i]) if coeff[i] != 0 else "" for i in range(n)]
prob = [
"{}{}".format(coeff[i], vars[i]) if coeff[i] != 0 else ""
for i in range(n)
]
while "" in prob:
prob.remove("")

View File

@@ -1,7 +1,10 @@
from .__init__ import *
import sympy
def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerElementsInInvertedMatrix=False):
def matrixInversion(SquareMatrixDimension=3,
MaxMatrixElement=99,
OnlyIntegerElementsInInvertedMatrix=False):
if OnlyIntegerElementsInInvertedMatrix is True:
isItOk = False
Mat = list()
@@ -15,20 +18,25 @@ def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerEle
Mat.append(z)
MaxAllowedMatrixElement = math.ceil(
pow(MaxMatrixElement, 1 / (SquareMatrixDimension)))
randomlist = random.sample(
range(0, MaxAllowedMatrixElement + 1), SquareMatrixDimension)
randomlist = random.sample(range(0, MaxAllowedMatrixElement + 1),
SquareMatrixDimension)
for i in range(0, SquareMatrixDimension):
if i == SquareMatrixDimension - 1:
Mat[0] = [j + (k * randomlist[i])
for j, k in zip(Mat[0], Mat[i])]
Mat[0] = [
j + (k * randomlist[i])
for j, k in zip(Mat[0], Mat[i])
]
else:
Mat[i + 1] = [j + (k * randomlist[i])
for j, k in zip(Mat[i + 1], Mat[i])]
Mat[i + 1] = [
j + (k * randomlist[i])
for j, k in zip(Mat[i + 1], Mat[i])
]
for i in range(1, SquareMatrixDimension - 1):
Mat[i] = [sum(i)
for i in zip(Mat[SquareMatrixDimension - 1], Mat[i])]
Mat[i] = [
sum(i) for i in zip(Mat[SquareMatrixDimension - 1], Mat[i])
]
isItOk = True
for i in Mat:
@@ -51,7 +59,8 @@ def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerEle
randomlist = list(sympy.primerange(0, MaxMatrixElement + 1))
plist = random.sample(randomlist, SquareMatrixDimension)
randomlist = random.sample(
range(0, MaxMatrixElement + 1), SquareMatrixDimension * SquareMatrixDimension)
range(0, MaxMatrixElement + 1),
SquareMatrixDimension * SquareMatrixDimension)
randomlist = list(set(randomlist) - set(plist))
n_list = random.sample(
randomlist, SquareMatrixDimension * (SquareMatrixDimension - 1))

View File

@@ -32,10 +32,12 @@ def matrixMultiplicationFunc(maxVal=100):
temp += a[r][t] * b[t][c]
res[r].append(temp)
problem = f"Multiply \n{a_string}\n and \n\n{b_string}" # consider using a, b instead of a_string, b_string if the problem doesn't look right
# consider using a, b instead of a_string, b_string if the problem doesn't look right
problem = f"Multiply \n{a_string}\n and \n\n{b_string}"
solution = matrixMultiplicationFuncHelper(res)
return problem, solution
def matrixMultiplicationFuncHelper(inp):
m = len(inp)
n = len(inp[0])

View File

@@ -1,5 +1,6 @@
from .__init__ import *
def meanMedianFunc(maxlen=10):
randomlist = random.sample(range(1, 99), maxlen)
total = 0

View File

@@ -1,9 +1,12 @@
from .__init__ import *
def multiplyComplexNumbersFunc(minRealImaginaryNum = -20, maxRealImaginaryNum = 20):
num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum))
num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum))
def multiplyComplexNumbersFunc(minRealImaginaryNum=-20,
maxRealImaginaryNum=20):
num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum),
random.randint(minRealImaginaryNum, maxRealImaginaryNum))
num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum),
random.randint(minRealImaginaryNum, maxRealImaginaryNum))
problem = f"{num1} * {num2} = "
solution = num1 * num2
return problem, solution

View File

@@ -1,5 +1,6 @@
from .__init__ import *
def percentageFunc(maxValue=99, maxpercentage=99):
a = random.randint(1, maxpercentage)
b = random.randint(1, maxValue)

View File

@@ -6,5 +6,6 @@ def permutationFunc(maxlength=20):
b = random.randint(0, 9)
solution = int(math.factorial(a) / (math.factorial(a - b)))
problem = "Number of Permutations from {} objects picked {} at a time = ".format(a, b)
problem = "Number of Permutations from {} objects picked {} at a time = ".format(
a, b)
return problem, solution

View File

@@ -14,7 +14,8 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5):
exponent = random.randint(1, maxExp)
problem += str(coefficient) + "x^" + str(exponent)
solution += "(" + str(coefficient) + "/" + str(exponent) + ")x^" + str(exponent + 1)
solution += "(" + str(coefficient) + "/" + \
str(exponent) + ")x^" + str(exponent + 1)
solution += " + c"
return problem, solution

View File

@@ -4,9 +4,12 @@ from .__init__ import *
def quadraticEquation(maxVal=100):
a = random.randint(1, maxVal)
c = random.randint(1, maxVal)
b = random.randint(round(math.sqrt(4 * a * c)) + 1, round(math.sqrt(4 * maxVal * maxVal)))
b = random.randint(
round(math.sqrt(4 * a * c)) + 1, round(math.sqrt(4 * maxVal * maxVal)))
problem = "Zeros of the Quadratic Equation {}x^2+{}x+{}=0".format(a, b, c)
D = math.sqrt(b * b - 4 * a * c)
solution = str([round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)])
solution = str(
[round((-b + D) / (2 * a), 2),
round((-b - D) / (2 * a), 2)])
return problem, solution

View File

@@ -1,5 +1,6 @@
from .__init__ import *
def sectorAreaFunc(maxRadius=49, maxAngle=359):
Radius = random.randint(1, maxRadius)
Angle = random.randint(1, maxAngle)

View File

@@ -7,6 +7,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10):
c = random.randint(1, maxTime)
d = (a * b * c) / 100
problem = "Simple interest for a principle amount of " + str(a) + " dollars, " + str(b) + "% rate of interest and for a time period of " + str(c) + " years is = "
problem = "Simple interest for a principle amount of " + str(
a) + " dollars, " + str(
b) + "% rate of interest and for a time period of " + str(
c) + " years is = "
solution = round(d, 2)
return problem, solution

View File

@@ -10,8 +10,9 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10):
c2 = [0, 1, y]
def randNonZero():
return random.choice([i for i in range(-coeff_mult_range, coeff_mult_range)
if i != 0])
return random.choice(
[i for i in range(-coeff_mult_range, coeff_mult_range) if i != 0])
# Add random (non-zero) multiple of equations (rows) to each other
c1_mult = randNonZero()
c2_mult = randNonZero()
@@ -36,7 +37,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10):
# No redundant 1s
y_coeff = abs(coeffs[1]) if abs(coeffs[1]) != 1 else ''
# Don't include if 0, unless x is also 0 (probably never happens)
y_str = f'{y_coeff}y' if coeffs[1] != 0 else ('' if x_str != '' else '0')
y_str = f'{y_coeff}y' if coeffs[1] != 0 else (
'' if x_str != '' else '0')
return f'{x_str}{op}{y_str} = {coeffs[2]}'
problem = f"{coeffToFuncString(new_c1)}, {coeffToFuncString(new_c2)}"

View File

@@ -4,9 +4,10 @@ from .__init__ import *
def vectorCrossFunc(minVal=-20, maxVal=20):
a = [random.randint(minVal, maxVal) for i in range(3)]
b = [random.randint(minVal, maxVal) for i in range(3)]
c = [a[1] * b[2] - a[2] * b[1],
a[2] * b[0] - a[0] * b[2],
a[0] * b[1] - a[1] * b[0]]
c = [
a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2],
a[0] * b[1] - a[1] * b[0]
]
problem = str(a) + " X " + str(b) + " = "
solution = str(c)

View File

@@ -7,6 +7,8 @@ from .__init__ import getGenList
genList = getGenList()
# || Generator class
class Generator:
def __init__(self, title, id, generalProb, generalSol, func):
self.title = title
@@ -17,7 +19,9 @@ class Generator:
genList.append([id, title, self])
def __str__(self):
return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol
return str(
self.id
) + " " + self.title + " " + self.generalProb + " " + self.generalSol
def __call__(self, **kwargs):
return self.func(**kwargs)
@@ -28,6 +32,7 @@ def genById(id):
generator = genList[id][2]
return (generator())
#
# def getGenList():
# return(genList)
@@ -37,83 +42,229 @@ def genById(id):
# Funcs_start - DO NOT REMOVE!
# addition = Generator("Addition", 0, "a+b=", "c", additionFunc)
subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc)
multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc)
multiplication = Generator("Multiplication", 2, "a*b=", "c",
multiplicationFunc)
division = Generator("Division", 3, "a/b=", "c", divisionFunc)
binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", binaryComplement1sFunc)
binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101",
binaryComplement1sFunc)
moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc)
squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc)
powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", "(n*m)x^(m-1)", powerRuleDifferentiationFunc)
powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=",
"(n*m)x^(m-1)",
powerRuleDifferentiationFunc)
square = Generator("Square", 8, "a^2", "b", squareFunc)
lcm = Generator("LCM (Least Common Multiple)", 9,"LCM of a and b = ", "c", lcmFunc)
gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", "c", gcdFunc)
basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", basicAlgebraFunc)
lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c",
lcmFunc)
gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ",
"c", gcdFunc)
basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d",
basicAlgebraFunc)
log = Generator("Logarithm", 12, "log2(8)", "3", logFunc)
intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc)
decimalToBinary = Generator("Decimal to Binary", 14,"Binary of a=", "b", DecimalToBinaryFunc)
binaryToDecimal = Generator("Binary to Decimal", 15,"Decimal of a=", "b", BinaryToDecimalFunc)
fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc)
intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22)
areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc)
doesTriangleExist = Generator("Triangle exists check", 19,"Does triangle with sides a, b and c exist?", "Yes/No", isTriangleValidFunc)
midPointOfTwoPoint = Generator("Midpoint of the two point", 20,"((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", MidPointOfTwoPointFunc)
factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc)
thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc)
systemOfEquations = Generator("Solve a System of Equations in R^2", 23, "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", systemOfEquationsFunc)
distance2Point = Generator("Distance between 2 points", 24, "Find the distance between (x1,y1) and (x2,y2)", "sqrt(distanceSquared)", distanceTwoPointsFunc)
pythagoreanTheorem = Generator("Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc)
linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", "x=-20 & y=12", linearEquationsFunc)# This has multiple variables whereas #23 has only x and y
primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", "[b, c, d, ...]", primeFactorsFunc)
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)
combinations = Generator("Combinations of Objects", 30, "Combinations available for picking 4 objects at a time from 6 distinct objects =", " 15", combinationsFunc)
decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b",
DecimalToBinaryFunc)
binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b",
BinaryToDecimalFunc)
fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y",
divideFractionsFunc)
intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix",
17, "k * [[a,b],[c,d]]=",
"[[k*a,k*b],[k*c,k*d]]",
multiplyIntToMatrix22)
areaOfTriangle = Generator("Area of Triangle", 18,
"Area of Triangle with side lengths a, b, c = ",
"area", areaOfTriangleFunc)
doesTriangleExist = Generator("Triangle exists check", 19,
"Does triangle with sides a, b and c exist?",
"Yes/No", isTriangleValidFunc)
midPointOfTwoPoint = Generator("Midpoint of the two point", 20,
"((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)",
MidPointOfTwoPointFunc)
factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2",
"(x-x1)(x-x2)", factoringFunc)
thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22,
"Third Angle of the triangle = ", "angle3",
thirdAngleOfTriangleFunc)
systemOfEquations = Generator("Solve a System of Equations in R^2", 23,
"2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3",
systemOfEquationsFunc)
distance2Point = Generator("Distance between 2 points", 24,
"Find the distance between (x1,y1) and (x2,y2)",
"sqrt(distanceSquared)", distanceTwoPointsFunc)
pythagoreanTheorem = Generator(
"Pythagorean Theorem", 25,
"The hypotenuse of a right triangle given the other two lengths a and b = ",
"hypotenuse", pythagoreanTheoremFunc)
# This has multiple variables whereas #23 has only x and y
linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12",
"x=-20 & y=12", linearEquationsFunc)
primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =",
"[b, c, d, ...]", primeFactorsFunc)
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)
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)
surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, "Surface area of cube with side a units is", "b units^2", surfaceAreaCube)
surfaceAreaCuboidGen = Generator("Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid)
surfaceAreaCylinderGen = Generator("Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder)
volumeCubeGen = Generator("Volum of Cube", 35, "Volume of cube with side a units is", "b units^3", volumeCube)
volumeCuboidGen = Generator("Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid)
volumeCylinderGen = Generator( "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder)
surfaceAreaConeGen = Generator( "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone)
volumeConeGen = Generator( "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone)
commonFactors = Generator("Common Factors", 40, "Common Factors of {a} and {b} = ", "[c, d, ...]", commonFactorsFunc)
intersectionOfTwoLines = Generator("Intersection of Two Lines", 41,"Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2", "(x, y)", intersectionOfTwoLinesFunc)
permutations = Generator("Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc)
vectorCross = Generator("Cross Product of 2 Vectors",43, "a X b = ", "c", vectorCrossFunc)
compareFractions = Generator("Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc)
simpleInterest = Generator("Simple Interest", 45, "Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", simpleInterestFunc)
matrixMultiplication = Generator("Multiplication of two matrices",46, "Multiply two matrices A and B", "C", matrixMultiplicationFunc)
CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", "b", cubeRootFunc)
powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", "(n/m)x^(m+1)", powerRuleIntegrationFunc)
fourthAngleOfQuadrilateral = Generator("Fourth Angle of Quadrilateral", 49,"Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc)
quadraticEquationSolve = Generator("Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation)
hcf = Generator("HCF (Highest Common Factor)", 51,"HCF of a and b = ", "c", hcfFunc)
diceSumProbability = Generator("Probability of a certain sum appearing on faces of dice",52, "If n dices are rolled then probabilty of getting sum of x is =", "z", DiceSumProbFunc)
exponentiation = Generator("Exponentiation", 53, "a^b = ", "c", exponentiationFunc)
confidenceInterval = Generator("Confidence interval For sample S",54, "With X% confidence", "is (A,B)", confidenceIntervalFunc)
surdsComparison = Generator("Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", surdsComparisonFunc)
fibonacciSeries = Generator("Fibonacci Series", 56, "fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc)
basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", "ans", basicTrigonometryFunc)
sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58,"Sum of angles of polygon with n sides = ", "sum", sumOfAnglesOfPolygonFunc)
dataSummary = Generator("Mean,Standard Deviation,Variance",59, "a,b,c", "Mean:a+b+c/3,Std,Var", dataSummaryFunc)
surfaceAreaSphereGen = Generator("Surface Area of Sphere", 60, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere)
volumeSphere = Generator("Volume of Sphere", 61, "Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc)
nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, "What is the nth Fibonacci number", "Fn", nthFibonacciNumberFunc)
profitLossPercent = Generator("Profit or Loss Percent", 63, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)
binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", binaryToHexFunc)
complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, "(x + j) (y + j) = ", "xy + xj + yj -1", multiplyComplexNumbersFunc)
geometricprogression=Generator("Geometric Progression", 66, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc)
geometricMean=Generator("Geometric Mean of N Numbers",67,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)
harmonicMean=Generator("Harmonic Mean of N Numbers",68,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)
eucldianNorm=Generator("Euclidian norm or L2 norm of a vector", 69, "Euclidian Norm of a vector V:[v1, v2, ......., vn]", "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc)
angleBtwVectors=Generator("Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc)
absoluteDifference=Generator("Absolute difference between two numbers", 71, "Absolute difference betweeen two numbers a and b =", "|a-b|", absoluteDifferenceFunc)
vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", vectorDotFunc)
binary2sComplement = Generator("Binary 2's Complement", 73, "2's complement of 11010110 =", "101010", binary2sComplementFunc)
invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", "A^(-1)", matrixInversion)
sectorArea=Generator("Area of a Sector", 75,"Area of a sector with radius, r and angle, a ","Area",sectorAreaFunc)
meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numbers","Mean, Median",meanMedianFunc)
intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22)
compoundInterest = Generator("Compound Interest", 78, "Compound interest for a principle amount of p dollars, r% rate of interest and for a time period of t years with n times compounded annually is = ", "A dollars", compoundInterestFunc)
decimalToHexadeci = Generator("Decimal to Hexadecimal", 79,"Binary of a=", "b", deciToHexaFunc)
percentage = Generator("Percentage of a number",80,"What is a% of b?","percentage",percentageFunc)
celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit)
surfaceAreaCubeGen = Generator("Surface Area of Cube", 32,
"Surface area of cube with side a units is",
"b units^2", surfaceAreaCube)
surfaceAreaCuboidGen = Generator(
"Surface Area of Cuboid", 33,
"Surface area of cuboid with sides = a units, b units, c units is",
"d units^2", surfaceAreaCuboid)
surfaceAreaCylinderGen = Generator(
"Surface Area of Cylinder", 34,
"Surface area of cylinder with height = a units and radius = b units is",
"c units^2", surfaceAreaCylinder)
volumeCubeGen = Generator("Volum of Cube", 35,
"Volume of cube with side a units is", "b units^3",
volumeCube)
volumeCuboidGen = Generator(
"Volume of Cuboid", 36,
"Volume of cuboid with sides = a units, b units, c units is", "d units^3",
volumeCuboid)
volumeCylinderGen = Generator(
"Volume of cylinder", 37,
"Volume of cylinder with height = a units and radius = b units is",
"c units^3", volumeCylinder)
surfaceAreaConeGen = Generator(
"Surface Area of cone", 38,
"Surface area of cone with height = a units and radius = b units is",
"c units^2", surfaceAreaCone)
volumeConeGen = Generator(
"Volume of cone", 39,
"Volume of cone with height = a units and radius = b units is",
"c units^3", volumeCone)
commonFactors = Generator("Common Factors", 40,
"Common Factors of {a} and {b} = ", "[c, d, ...]",
commonFactorsFunc)
intersectionOfTwoLines = Generator(
"Intersection of Two Lines", 41,
"Find the point of intersection of the two lines: y = m1*x + b1 and y = m2*x + b2",
"(x, y)", intersectionOfTwoLinesFunc)
permutations = Generator(
"Permutations", 42,
"Total permutations of 4 objects at a time from 10 objects is", "5040",
permutationFunc)
vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c",
vectorCrossFunc)
compareFractions = Generator(
"Compare Fractions", 44,
"Which symbol represents the comparison between a/b and c/d?", ">/</=",
compareFractionsFunc)
simpleInterest = Generator(
"Simple Interest", 45,
"Simple interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ",
"d dollars", simpleInterestFunc)
matrixMultiplication = Generator("Multiplication of two matrices", 46,
"Multiply two matrices A and B", "C",
matrixMultiplicationFunc)
CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is",
"b", cubeRootFunc)
powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=",
"(n/m)x^(m+1)", powerRuleIntegrationFunc)
fourthAngleOfQuadrilateral = Generator(
"Fourth Angle of Quadrilateral", 49,
"Fourth angle of Quadrilateral with angles a,b,c =", "angle4",
fourthAngleOfQuadriFunc)
quadraticEquationSolve = Generator(
"Quadratic Equation", 50,
"Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2",
quadraticEquation)
hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c",
hcfFunc)
diceSumProbability = Generator(
"Probability of a certain sum appearing on faces of dice", 52,
"If n dices are rolled then probabilty of getting sum of x is =", "z",
DiceSumProbFunc)
exponentiation = Generator("Exponentiation", 53, "a^b = ", "c",
exponentiationFunc)
confidenceInterval = Generator("Confidence interval For sample S", 54,
"With X% confidence", "is (A,B)",
confidenceIntervalFunc)
surdsComparison = Generator("Comparing surds", 55,
"Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=",
surdsComparisonFunc)
fibonacciSeries = Generator(
"Fibonacci Series", 56, "fibonacci series of first a numbers",
"prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc)
basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?",
"ans", basicTrigonometryFunc)
sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58,
"Sum of angles of polygon with n sides = ",
"sum", sumOfAnglesOfPolygonFunc)
dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c",
"Mean:a+b+c/3,Std,Var", dataSummaryFunc)
surfaceAreaSphereGen = Generator(
"Surface Area of Sphere", 60,
"Surface area of sphere with radius = a units is", "d units^2",
surfaceAreaSphere)
volumeSphere = Generator("Volume of Sphere", 61,
"Volume of sphere with radius r m = ",
"(4*pi/3)*r*r*r", volumeSphereFunc)
nthFibonacciNumberGen = Generator("nth Fibonacci number", 62,
"What is the nth Fibonacci number", "Fn",
nthFibonacciNumberFunc)
profitLossPercent = Generator(
"Profit or Loss Percent", 63,
"Profit/ Loss percent when CP = cp and SP = sp is: ", "percent",
profitLossPercentFunc)
binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b",
binaryToHexFunc)
complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65,
"(x + j) (y + j) = ", "xy + xj + yj -1",
multiplyComplexNumbersFunc)
geometricprogression = Generator(
"Geometric Progression", 66,
"Initial value,Common Ratio,nth Term,Sum till nth term =",
"a,r,ar^n-1,sum(ar^n-1", geomProgrFunc)
geometricMean = Generator("Geometric Mean of N Numbers", 67,
"Geometric mean of n numbers A1 , A2 , ... , An = ",
"(A1*A2*...An)^(1/n) = ans", geometricMeanFunc)
harmonicMean = Generator("Harmonic Mean of N Numbers", 68,
"Harmonic mean of n numbers A1 , A2 , ... , An = ",
" n/((1/A1) + (1/A2) + ... + (1/An)) = ans",
harmonicMeanFunc)
eucldianNorm = Generator("Euclidian norm or L2 norm of a vector", 69,
"Euclidian Norm of a vector V:[v1, v2, ......., vn]",
"sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc)
angleBtwVectors = Generator(
"Angle between 2 vectors", 70,
"Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]",
"V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc)
absoluteDifference = Generator(
"Absolute difference between two numbers", 71,
"Absolute difference betweeen two numbers a and b =", "|a-b|",
absoluteDifferenceFunc)
vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c",
vectorDotFunc)
binary2sComplement = Generator("Binary 2's Complement", 73,
"2's complement of 11010110 =", "101010",
binary2sComplementFunc)
invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is",
"A^(-1)", matrixInversion)
sectorArea = Generator("Area of a Sector", 75,
"Area of a sector with radius, r and angle, a ", "Area",
sectorAreaFunc)
meanMedian = Generator("Mean and Median", 76,
"Mean and median of given set of numbers",
"Mean, Median", meanMedianFunc)
intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77,
"Det([[a,b],[c,d]]) =", " a * d - b * c",
determinantToMatrix22)
compoundInterest = Generator(
"Compound Interest", 78,
"Compound interest for a principle amount of p dollars, r% rate of interest and for a time period of t years with n times compounded annually is = ",
"A dollars", compoundInterestFunc)
decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=",
"b", deciToHexaFunc)
percentage = Generator("Percentage of a number", 80, "What is a% of b?",
"percentage", percentageFunc)
celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc)

View File

@@ -1,7 +1,6 @@
from setuptools import setup, find_packages
setup(
name='mathgenerator',
setup(name='mathgenerator',
version='1.1.3',
description='An open source solution for generating math problems',
url='https://github.com/todarith/mathgenerator',
@@ -9,9 +8,5 @@ setup(
author_email='lukew25073@gmail.com',
license='MIT',
packages=find_packages(),
install_requires=[
],
entry_points={
}
)
install_requires=[],
entry_points={})

View File

@@ -39,7 +39,8 @@ def test_moduloDivision(maxRes, maxModulo):
assert eval(problem[:-1]) == int(solution)
@given(minNo=st.integers(min_value=1), maxNo=st.integers(min_value=1, max_value=2 ** 50))
@given(minNo=st.integers(min_value=1),
maxNo=st.integers(min_value=1, max_value=2**50))
def test_squareRoot(minNo, maxNo):
assume(maxNo > minNo)
problem, solution = squareRoot.func(minNo, maxNo)