From 233f8bf180289199ce433ddd27fe59f227b33f7f Mon Sep 17 00:00:00 2001 From: lukew3 Date: Mon, 19 Oct 2020 14:00:28 -0400 Subject: [PATCH] some more lint fixes --- mathgenerator/funcs/absoluteDifferenceFunc.py | 6 +++--- mathgenerator/funcs/determinantToMatrix22.py | 2 +- mathgenerator/funcs/geomProgrFunc.py | 14 +++++++------- mathgenerator/funcs/matrixMultiplicationFunc.py | 4 ++-- mathgenerator/funcs/surdsComparisonFunc.py | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 075d1c2..138c8de 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -2,9 +2,9 @@ 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) + 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) + " = " diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index c54028d..33b4004 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -7,7 +7,7 @@ def determinantToMatrix22(maxMatrixVal=100): c = random.randint(0, maxMatrixVal) d = random.randint(0, maxMatrixVal) - determinant = a*d - b*c + determinant = a * d - b * c problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index d051f85..70d3dcc 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -4,15 +4,15 @@ from .__init__ import * 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) + 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/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index a85cca5..727112e 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -46,8 +46,8 @@ 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 += "]\n [" if i < m-1 else "" + string += ", "if j < n - 1 else "" + string += "]\n [" if i < m - 1 else "" string += "]]" return string diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index 3035265..e005d3f 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -6,8 +6,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): degree1, degree2 = tuple(random.sample(range(1, maxRoot), 2)) problem = f"Fill in the blanks {radicand1}^(1/{degree1}) _ {radicand2}^(1/{degree2})" - first = math.pow(radicand1, 1/degree1) - second = math.pow(radicand2, 1/degree2) + first = math.pow(radicand1, 1 / degree1) + second = math.pow(radicand2, 1 / degree2) solution = "=" if first > second: