deadvey/mathgenerator
1
0
Fork 0
mirror of https://github.com/DeaDvey/mathgenerator.git synced 2025-11-28 14:35:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

linting improved

Browse Source
This commit is contained in:
Anshita
2020-10-20 00:51:54 +05:30
parent ddc42a5638
commit da48b28397
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mathgenerator/funcs/arithmeticProgressionSumFunc.py
View File

@@ -1,13 +1,14 @@
from .__init__ import * from .__init__ import *
def arithmeticProgressionSumFunc (maxd = 100, maxa = 100, maxn = 100): def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100):
d = random.randint (-1 * maxd, maxd) d = random.randint(-1 * maxd, maxd)
a1 = random.randint (-1 * maxa, maxa) a1 = random.randint(-1 * maxa, maxa)
a2 = a1 + d a2 = a1 + d
a3 = a2 + d a3 = a2 + d
n = random.randint (4, maxn) n = random.randint(4, maxn)
apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... '
problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString
solution = n * ((2*a1) + ((n-1)*d))/2 solution = n * ((2 * a1) + ((n-1) * d)) / 2
return problem, solution return problem, solution

12
mathgenerator/funcs/arithmeticProgressionTermFunc.py
View File

@@ -1,13 +1,13 @@
from .__init__ import * from .__init__ import *
def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100):
d = random.randint (-1 * maxd, maxd) d = random.randint(-1 * maxd, maxd)
a1 = random.randint (-1 * maxa, maxa) a1 = random.randint(-1 * maxa, maxa)
a2 = a1 + d a2 = a1 + d
a3 = a2 + d a3 = a2 + d
n = random.randint (4, maxn) n = random.randint(4, maxn)
apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... '
problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString
solution = a1 + ((n-1)*d) solution = a1 + ((n-1) * d)
return problem, solution return problem, solution

12
mathgenerator/mathgen.py
View File

@@ -269,10 +269,10 @@ percentage = Generator("Percentage of a number", 80, "What is a% of b?",
"percentage", percentageFunc) "percentage", percentageFunc)
celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc)
arithmeticProgressionTerm = Generator ("AP Term Calculation", 82, arithmeticProgressionTerm = Generator("AP Term Calculation", 82,
"Find the term number n of the AP series: a1, a2, a3 ..." , "Find the term number n of the AP series: a1, a2, a3 ...",
"a-n", arithmeticProgressionTermFunc) "a-n", arithmeticProgressionTermFunc)
arithmeticProgressionSum = Generator ("AP Sum Calculation", 83, arithmeticProgressionSum = Generator("AP Sum Calculation", 83,
"Find the sum of first n terms of the AP series: a1, a2, a3 ...", "Find the sum of first n terms of the AP series: a1, a2, a3 ...",
"Sum", arithmeticProgressionSumFunc) "Sum", arithmeticProgressionSumFunc)