diff --git a/makeReadme.py b/makeReadme.py index 35c3b8a..7a7a66d 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -9,7 +9,7 @@ with open('mathgenerator/mathgen.py', 'r') as f: allRows = [] # get the first line of the functions in mathgen.py -line = lines.index('# Funcs_start - DO NOT REMOVE!\n')+1 +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 @@ -41,7 +41,7 @@ with open('README.md', "r") as g: lines = g.readlines() line = lines.index('[//]: # list start\n') - lines = lines[:line+1] + lines = lines[:line + 1] for row in allRows: tableLine = "| " + str(row[0]) + " | " + str(row[1]) + " | " + str( diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 01875a9..0a261d0 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,4 +1,3 @@ - genList = [] @@ -12,7 +11,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) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index f9be9aa..8f05a4f 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -3,22 +3,22 @@ from .__init__ import * def DiceSumProbFunc(maxDice=3): a = random.randint(1, maxDice) - b = random.randint(a, 6*a) + b = random.randint(a, 6 * a) count = 0 for i in [1, 2, 3, 4, 5, 6]: if a == 1: if i == b: - count = count+1 + count = count + 1 elif a == 2: for j in [1, 2, 3, 4, 5, 6]: - if i+j == b: - count = count+1 + if i + j == b: + count = count + 1 elif a == 3: for j in [1, 2, 3, 4, 5, 6]: for k in [1, 2, 3, 4, 5, 6]: - if i+j+k == b: - count = count+1 + 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) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index b0cc39e..7ef9c50 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -77,8 +77,8 @@ from .absoluteDifferenceFunc import * from .vectorDotFunc import * from .binary2sComplement import * from .matrixInversion import * -from .sectorAreaFunc import* -from .meanMedianFunc import* +from .sectorAreaFunc import * +from .meanMedianFunc import * from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index 8506b55..a795a99 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -7,7 +7,7 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): c = random.randint(1, maxC) s = (a + b + c) / 2 - area = (s * (s - a) * (s - b) * (s - c)) ** 0.5 + area = (s * (s - a) * (s - b) * (s - c))**0.5 problem = "Area of triangle with side lengths: " + \ str(a) + " " + str(b) + " " + str(c) + " = " diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index 1d927ef..d11000d 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -8,7 +8,7 @@ def basicAlgebraFunc(maxVariable=10): # calculate gcd def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 8ce32a4..520b8a3 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -2,15 +2,23 @@ from .__init__ import * # Handles degrees in quadrant one -def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], functions=["sin", "cos", "tan"]): +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"} + 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" + } solution = result_fraction_map[round(eval(expression), 2)] if round( eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 1dbb1b2..009feea 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -10,6 +10,6 @@ def binaryComplement1sFunc(maxDigits=10): question += temp answer += "0" if temp == "1" else "1" - problem = question+"=" + problem = question + "=" solution = answer return problem, solution diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index 6ea2e6d..f213222 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -2,7 +2,6 @@ from .__init__ import * def combinationsFunc(maxlength=20): - def factorial(a): d = 1 for i in range(a): diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index 56c4714..1c4072a 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -15,9 +15,9 @@ def compareFractionsFunc(maxVal=10): first = a / b second = c / d - if(first > second): + if (first > second): solution = ">" - elif(first < second): + elif (first < second): solution = "<" else: solution = "=" diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 59cac26..7914828 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,13 +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 = " + 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 = " solution = round(A, 2) return problem, solution diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index babdabe..b631caf 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -16,16 +16,16 @@ def confidenceIntervalFunc(): count = i + mean mean = count - mean = mean/n + mean = mean / n for i in lst: - x = (i-mean)**2+sd + x = (i - mean)**2 + sd sd = x - sd = sd/n - standard_error = lst_t[j]*math.sqrt(sd/n) + 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]) - solution = '({}, {})'.format(mean+standard_error, mean-standard_error) + solution = '({}, {})'.format(mean + standard_error, mean - standard_error) return problem, solution diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index e0e0bad..1059b1f 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -9,20 +9,20 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): random_list.append(n) a = sum(random_list) - mean = a/number_values + mean = a / number_values var = 0 for i in range(number_values): - var += (random_list[i]-mean)**2 + var += (random_list[i] - mean)**2 # we're printing stuff here? print(random_list) print(mean) - print(var/number_values) - print((var/number_values)**0.5) + 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) + mean, var / number_values, (var / number_values)**0.5) return problem, solution diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 7bd1ef2..9fa85c8 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -7,7 +7,7 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): point2X = random.randint(minValXY, maxValXY + 1) point2Y = random.randint(minValXY, maxValXY + 1) - distanceSq = (point1X - point2X) ** 2 + (point1Y - point2Y) ** 2 + distanceSq = (point1X - point2X)**2 + (point1Y - point2Y)**2 solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 0f6bf30..970b28f 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -14,7 +14,7 @@ def divideFractionsFunc(maxVal=10): d = random.randint(1, maxVal) def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index d58f00d..a74f378 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -6,5 +6,5 @@ def exponentiationFunc(maxBase=20, maxExpo=10): expo = random.randint(1, maxExpo) problem = f"{base}^{expo} =" - solution = str(base ** expo) + solution = str(base**expo) return problem, solution diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index c043567..a66e2f4 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -10,12 +10,12 @@ def fibonacciSeriesFunc(minNo=1): if i < 2: l.append(i) else: - val = l[i-1]+l[i-2] + val = l[i - 1] + l[i - 2] l.append(val) return l fibList = createFibList(n) - problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" + problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 70d3dcc..7c80a7e 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,18 +1,23 @@ 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) sum_term = random.randint(number_values, number_values + 5) 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" - value_nth_term = a * (r ** (n_term - 1)) - sum_till_nth_term = a * ((r ** sum_term - 1)/(r - 1)) + 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" + 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) return problem, solution diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 07dc4cd..0980979 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -8,13 +8,13 @@ def geometricMeanFunc(maxValue=100, maxNum=4): d = random.randint(1, maxValue) num = random.randint(2, 4) if num == 2: - product = a*b + product = a * b elif num == 3: - product = a*b*c + product = a * b * c elif num == 4: - product = a*b*c*d + product = a * b * c * d - ans = product**(1/num) + ans = product**(1 / num) if num == 2: problem = f"Geometric mean of {num} numbers {a} and {b} = " solution = f"({a}*{b})^(1/{num}) = {ans}" diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 1c9e397..8aefb41 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -9,13 +9,13 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): d = random.randint(1, maxValue) num = random.randint(2, 4) if num == 2: - sum = (1/a)+(1/b) + sum = (1 / a) + (1 / b) elif num == 3: - sum = (1/a)+(1/b)+(1/c) + sum = (1 / a) + (1 / b) + (1 / c) elif num == 4: - sum = (1/a)+(1/b)+(1/c)+(1/d) + sum = (1 / a) + (1 / b) + (1 / c) + (1 / d) - ans = num/sum + ans = num / sum if num == 2: problem = f"Harmonic mean of {num} numbers {a} and {b} = " solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index a9f4e96..047fb0c 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -5,7 +5,7 @@ def hcfFunc(maxVal=20): a = random.randint(1, maxVal) b = random.randint(1, maxVal) x, y = a, b - while(y): + while (y): x, y = y, x % y problem = f"HCF of {a} and {b} = " solution = str(x) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index 2e6fbb6..eda508e 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -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,10 +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) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index 304c549..13c7240 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -9,8 +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: diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index 14a65f1..e2eeb26 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -9,14 +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("") diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 28080e5..72c01ca 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -2,7 +2,9 @@ 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() @@ -16,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: @@ -52,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)) diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index 727112e..e2e382f 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -46,7 +46,7 @@ def matrixMultiplicationFuncHelper(inp): for i in range(m): for j in range(n): string += f"{inp[i][j]: 6d}" - string += ", "if j < n - 1 else "" + string += ", " if j < n - 1 else "" string += "]\n [" if i < m - 1 else "" string += "]]" diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 36fc986..4b17846 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -6,9 +6,9 @@ def meanMedianFunc(maxlen=10): total = 0 for n in randomlist: total = total + n - mean = total/10 + mean = total / 10 problem = f"Given the series of numbers {randomlist}. find the arithmatic mean and mdian of the series" randomlist.sort() - median = (randomlist[4]+randomlist[5])/2 + median = (randomlist[4] + randomlist[5]) / 2 solution = f"Arithmetic mean of the series is {mean} and Arithmetic median of this series is {median}" return problem, solution diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index 69ca238..f1842c2 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,7 +1,8 @@ from .__init__ import * -def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, maxRealImaginaryNum=20): +def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, + maxRealImaginaryNum=20): num1 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), random.randint(minRealImaginaryNum, maxRealImaginaryNum)) num2 = complex(random.randint(minRealImaginaryNum, maxRealImaginaryNum), diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 67c5017..1ec38bb 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -14,7 +14,7 @@ def multiplyFractionsFunc(maxVal=10): d = random.randint(1, maxVal) def calculate_gcd(x, y): - while(y): + while (y): x, y = y, x % y return x diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index d559f1f..a1a66fb 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -2,10 +2,10 @@ from .__init__ import * def nthFibonacciNumberFunc(maxN=100): - golden_ratio = (1 + math.sqrt(5))/2 + golden_ratio = (1 + math.sqrt(5)) / 2 n = random.randint(1, maxN) problem = f"What is the {n}th Fibonacci number?" - ans = round((math.pow(golden_ratio, n) - - math.pow(-golden_ratio, -n))/(math.sqrt(5))) + ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / + (math.sqrt(5))) solution = f"{ans}" return problem, solution diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index e69749d..f064f2a 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -5,7 +5,7 @@ def percentageFunc(maxValue=99, maxpercentage=99): a = random.randint(1, maxpercentage) b = random.randint(1, maxValue) problem = f"What is {a}% of {b}?" - percentage = a/100*b + percentage = a / 100 * b formatted_float = "{:.2f}".format(percentage) solution = f"Required percentage = {formatted_float}%" return problem, solution diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index 49d7f27..da99f94 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -4,12 +4,12 @@ from .__init__ import * def profitLossPercentFunc(maxCP=1000, maxSP=1000): cP = random.randint(1, maxCP) sP = random.randint(1, maxSP) - diff = abs(sP-cP) - if (sP-cP >= 0): + diff = abs(sP - cP) + if (sP - cP >= 0): profitOrLoss = "Profit" else: profitOrLoss = "Loss" - percent = diff/cP * 100 + percent = diff / cP * 100 problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: " solution = percent diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 73f0ea4..7f784fc 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -4,11 +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 diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index d7f9545..c2ab0bf 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -5,7 +5,7 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): Radius = random.randint(1, maxRadius) Angle = random.randint(1, maxAngle) problem = f"Given radius, {Radius} and angle, {Angle}. Find the area of the sector." - secArea = float((Angle / 360) * math.pi*Radius*Radius) + secArea = float((Angle / 360) * math.pi * Radius * Radius) formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index 08b0f3b..30ca938 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -7,7 +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 diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index 2e82f5f..ef63c73 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -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() diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 21bcb0e..7506283 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -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) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 137db4f..1f94c7f 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -5,6 +5,6 @@ def volumeSphereFunc(maxRadius=100): r = random.randint(1, maxRadius) problem = f"Volume of sphere with radius {r} m = " - ans = (4*math.pi/3)*r*r*r + ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index dc29a6e..a9b2a98 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -19,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,167 +30,240 @@ class Generator: # || Non-generator Functions def genById(id): generator = genList[id][2] - return(generator()) + return (generator()) + # # def getGenList(): # return(genList) - # Format is: # = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) # 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) +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) + 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) + "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) + "((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) + "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) + "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) + "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) + "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) +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) +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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) + "(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) + "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) + "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) + "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) + "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) + "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) + "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) + "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) diff --git a/setup.py b/setup.py index 981b662..4bfbcd0 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,12 @@ from setuptools import setup, find_packages -setup( - name='mathgenerator', - version='1.1.3', - description='An open source solution for generating math problems', - url='https://github.com/todarith/mathgenerator', - author='Luke Weiler', - author_email='lukew25073@gmail.com', - license='MIT', - packages=find_packages(), - install_requires=[ - - ], - entry_points={ - } -) +setup(name='mathgenerator', + version='1.1.3', + description='An open source solution for generating math problems', + url='https://github.com/todarith/mathgenerator', + author='Luke Weiler', + author_email='lukew25073@gmail.com', + license='MIT', + packages=find_packages(), + install_requires=[], + entry_points={}) diff --git a/tests/test_mathgen.py b/tests/test_mathgen.py index 7555131..ed9066b 100644 --- a/tests/test_mathgen.py +++ b/tests/test_mathgen.py @@ -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)