From 131cf5badf29f4aafbadabf7254e147c89adda03 Mon Sep 17 00:00:00 2001 From: Anshita Date: Sat, 17 Oct 2020 18:56:41 +0530 Subject: [PATCH 01/99] AP series term/sum problem --- mathgenerator/mathgen.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 1041a55..cf87780 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -714,6 +714,24 @@ def fourthAngleOfQuadriFunc(maxAngle = 180): solution = angle4 return problem, solution +def arithmeticProgressionFunc (maxd = 100, maxa = 100, maxn = 100): + sumOrTerm = random.randint (0,1) + d = random.randint (-1 * maxd, maxd) + a1 = random.randint (-1 * maxa, maxa) + a2 = a1 + d + a3 = a2 + d + n = random.randint (4, maxn) + apString = str(a1) +'\t' + str(a2) +'\t' + str(a3) + '\t...' + if (sumOrTerm == 0) : #sum + problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString + solution = n * ((2*a1) + ((n-1)*d))/2 + else : #term + problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString + solution = a1 + ((n-1)*d) + return problem, solution + + + # || Class Instances #Format is: @@ -769,3 +787,4 @@ matrixMultiplication = Generator("Multiplication of two matrices", 46, "Multipl 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) +arithmeticProgression = Generator ("Arithmetic Progression", 50, "n-Sum or n-Term of an Arithmetic Progression", "Sum or term", arithmeticProgressionFunc) From 88bf96f4e6e26c8bed5549121da333aa035b89c3 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 10:51:33 +0530 Subject: [PATCH 02/99] Add files via upload adding solution for isprime number --- mathgen.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 mathgen.py diff --git a/mathgen.py b/mathgen.py new file mode 100644 index 0000000..60e5981 --- /dev/null +++ b/mathgen.py @@ -0,0 +1,32 @@ +import random +genList =[] +class Generator: + def __init__(self, title, id, generalProb, generalSol, func): + self.title = title + self.id = id + self.generalProb = generalProb + self.generalSol = generalSol + self.func = func + genList.append([id, title, self]) + def __str__(self): + return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + def __call__(self, **kwargs): + return self.func(**kwargs) + +def isprime(max_a =100): + a =random.randint(2,max_a) + problem =a + if a == 2: + solution = True + return problem,solution + if a % 2 == 0: + solution = False + return problem,solution + for i in range(3, a // 2 + 1, 2): + if a % i == 0: + solution = False + return problem, solution + solution = True + return problem, solution + +is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime) From a0fe001e60077779824b0ad25fc36a33c28d8f91 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:11:26 +0530 Subject: [PATCH 03/99] Update mathgen.py --- mathgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgen.py b/mathgen.py index 60e5981..6ee4b89 100644 --- a/mathgen.py +++ b/mathgen.py @@ -29,4 +29,4 @@ def isprime(max_a =100): solution = True return problem, solution -is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime) +is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime()) From d2d224425a3317588a93efea32eee63922277fd5 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:23:14 +0530 Subject: [PATCH 04/99] Create isprime.py Added solution for isprime --- mathgenerator/funcs/isprime.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 mathgenerator/funcs/isprime.py diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py new file mode 100644 index 0000000..c45138c --- /dev/null +++ b/mathgenerator/funcs/isprime.py @@ -0,0 +1,18 @@ +__init__ import * +def isprime(max_a =100): + a =random.randint(2,max_a) + problem =a + if a == 2: + solution = True + return problem,solution + if a % 2 == 0: + solution = False + return problem,solution + for i in range(3, a // 2 + 1, 2): + if a % i == 0: + solution = False + return problem, solution + solution = True + return problem, solution + +is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime()) From da33be5469d9104dc6e4e9abaa08cc802731cfc3 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:24:33 +0530 Subject: [PATCH 05/99] Update __init__.py --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index efb1ce7..457a4ae 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -71,3 +71,4 @@ from .multiplyComplexNumbersFunc import * from .geomProgrFunc import * from .geometricMeanFunc import * from .harmonicMeanFunc import * +from .isprime import * From dbccb4d38a470859ad23f302f2b41b679727666d Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:25:35 +0530 Subject: [PATCH 06/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index c45138c..fee046e 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -__init__ import * +.__init__ import * def isprime(max_a =100): a =random.randint(2,max_a) problem =a @@ -15,4 +15,4 @@ def isprime(max_a =100): solution = True return problem, solution -is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime()) +is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) From 9805f810910f4019f57b3c99d925641d8d386218 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:32:01 +0530 Subject: [PATCH 07/99] Update mathgen.py --- mathgen.py | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/mathgen.py b/mathgen.py index 6ee4b89..3eb6ea8 100644 --- a/mathgen.py +++ b/mathgen.py @@ -1,32 +1,32 @@ -import random -genList =[] -class Generator: - def __init__(self, title, id, generalProb, generalSol, func): - self.title = title - self.id = id - self.generalProb = generalProb - self.generalSol = generalSol - self.func = func - genList.append([id, title, self]) - def __str__(self): - return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) +# import random +# genList =[] +# class Generator: +# def __init__(self, title, id, generalProb, generalSol, func): +# self.title = title +# self.id = id +# self.generalProb = generalProb +# self.generalSol = generalSol +# self.func = func +# genList.append([id, title, self]) +# def __str__(self): +# return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol +# def __call__(self, **kwargs): +# return self.func(**kwargs) -def isprime(max_a =100): - a =random.randint(2,max_a) - problem =a - if a == 2: - solution = True - return problem,solution - if a % 2 == 0: - solution = False - return problem,solution - for i in range(3, a // 2 + 1, 2): - if a % i == 0: - solution = False - return problem, solution - solution = True - return problem, solution +# def isprime(max_a =100): +# a =random.randint(2,max_a) +# problem =a +# if a == 2: +# solution = True +# return problem,solution +# if a % 2 == 0: +# solution = False +# return problem,solution +# for i in range(3, a // 2 + 1, 2): +# if a % i == 0: +# solution = False +# return problem, solution +# solution = True +# return problem, solution is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime()) From 1023beeb9badece0869b3f3c3e94b46a97c939ed Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:33:25 +0530 Subject: [PATCH 08/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index fee046e..7851f9a 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -15,4 +15,4 @@ def isprime(max_a =100): solution = True return problem, solution -is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) +# is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) From 8e6388d661590880e1ccd00bbb9ec4b7855cc7a6 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:41:18 +0530 Subject: [PATCH 09/99] Update mathgen.py --- mathgen.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/mathgen.py b/mathgen.py index 3eb6ea8..71c2c7a 100644 --- a/mathgen.py +++ b/mathgen.py @@ -13,20 +13,20 @@ # def __call__(self, **kwargs): # return self.func(**kwargs) -# def isprime(max_a =100): -# a =random.randint(2,max_a) -# problem =a -# if a == 2: -# solution = True -# return problem,solution -# if a % 2 == 0: -# solution = False -# return problem,solution -# for i in range(3, a // 2 + 1, 2): -# if a % i == 0: -# solution = False -# return problem, solution -# solution = True -# return problem, solution +def isprime(max_a =100): + a =random.randint(2,max_a) + problem =a + if a == 2: + solution = True + return problem,solution + if a % 2 == 0: + solution = False + return problem,solution + for i in range(3, a // 2 + 1, 2): + if a % i == 0: + solution = False + return problem, solution + solution = True + return problem, solution -is_prime = Generator("isprime", 61, "a any positive integer", "True/False", isprime()) +is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) From 81cbc2123828c2cd358632bb7582a2df31227457 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:34:31 +0530 Subject: [PATCH 10/99] Update mathgen.py --- mathgen.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/mathgen.py b/mathgen.py index 71c2c7a..0496c70 100644 --- a/mathgen.py +++ b/mathgen.py @@ -1,32 +1,16 @@ -# import random -# genList =[] -# class Generator: -# def __init__(self, title, id, generalProb, generalSol, func): -# self.title = title -# self.id = id -# self.generalProb = generalProb -# self.generalSol = generalSol -# self.func = func -# genList.append([id, title, self]) -# def __str__(self): -# return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol -# def __call__(self, **kwargs): -# return self.func(**kwargs) - -def isprime(max_a =100): - a =random.randint(2,max_a) - problem =a +def isprime(max_a = 100): + a = random.randint(2, max_a) + problem = a if a == 2: solution = True - return problem,solution - if a % 2 == 0: + return problem, solution + if a%2 == 0: solution = False return problem,solution - for i in range(3, a // 2 + 1, 2): - if a % i == 0: + for i in range(3, (a//2)+1, 2): + if a%i == 0: solution = False return problem, solution solution = True return problem, solution - -is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) +is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime) From 900da1cb36707ad72dd0c56b2b70c71e7cea8e62 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 13:38:37 +0530 Subject: [PATCH 11/99] Update mathgen.py --- mathgen.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/mathgen.py b/mathgen.py index 0496c70..b0a426a 100644 --- a/mathgen.py +++ b/mathgen.py @@ -1,16 +1,23 @@ -def isprime(max_a = 100): +#!/usr/bin/python +# -*- coding: utf-8 -*- + + +def isprime(max_a=100): a = random.randint(2, max_a) problem = a if a == 2: solution = True - return problem, solution - if a%2 == 0: + return (problem, solution) + if a % 2 == 0: solution = False - return problem,solution - for i in range(3, (a//2)+1, 2): - if a%i == 0: + return (problem, solution) + for i in range(3, a // 2 + 1, 2): + if a % i == 0: solution = False - return problem, solution + return (problem, solution) solution = True - return problem, solution -is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime) + return (problem, solution) + + +is_prime = Generator('isprime', 74, 'a any positive integer', + 'True/False', isprime) From 2e55c7798a06e7b70139dadc67e9adafdaac7a38 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:19:54 +0530 Subject: [PATCH 12/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index 7851f9a..b24b2c1 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,18 +1,18 @@ .__init__ import * -def isprime(max_a =100): - a =random.randint(2,max_a) - problem =a + + +def isprime(max_a=100): + a = random.randint(2, max_a) + problem = a if a == 2: solution = True - return problem,solution + return (problem, solution) if a % 2 == 0: solution = False - return problem,solution + return (problem, solution) for i in range(3, a // 2 + 1, 2): if a % i == 0: solution = False - return problem, solution + return (problem, solution) solution = True - return problem, solution - -# is_prime = Generator("isprime", 74, "a any positive integer", "True/False", isprime()) + return (problem, solution) From eadc644e0da40a6975966794dd22f9b2b9b9425f Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:32:43 +0530 Subject: [PATCH 13/99] Update mathgen.py --- mathgen.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/mathgen.py b/mathgen.py index b0a426a..85a8f3d 100644 --- a/mathgen.py +++ b/mathgen.py @@ -1,5 +1,24 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- +import random + + +genList = [] + + +# || Generator class +class Generator: + def __init__(self, title, id, generalProb, generalSol, func): + self.title = title + self.id = id + self.generalProb = generalProb + self.generalSol = generalSol + self.func = func + genList.append([id, title, self]) + + def __str__(self): + return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + + def __call__(self, **kwargs): + return self.func(**kwargs) def isprime(max_a=100): From 653d043898992a69b2abf8ad97ddd2b9edf7eae4 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 15:16:08 +0530 Subject: [PATCH 14/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index b24b2c1..9f79464 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -.__init__ import * +__init__ import * def isprime(max_a=100): From e467f7ec7c641382fb0a7870fffa553a9da2f5a0 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Mon, 19 Oct 2020 15:35:25 +0530 Subject: [PATCH 15/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index 9f79464..ce5a58d 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -__init__ import * +from __init__ import * def isprime(max_a=100): From 53071a276d70e2c2a14184066f78646598cea426 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 18:08:20 +0400 Subject: [PATCH 16/99] =?UTF-8?q?=F0=9F=94=A7=20fixed=20some=20stuff=20wit?= =?UTF-8?q?h=20gen#69F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 154 +++++++++++---------- makeReadme.py | 5 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 19 ++- mathgenerator/funcs/euclidianNormFunc.py | 7 +- 4 files changed, 97 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 6c692b0..46f8a00 100644 --- a/README.md +++ b/README.md @@ -31,79 +31,85 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 33+23= | 56 | addition | -| 1 | Subtraction | 14-1= | 13 | subtraction | -| 2 | Multiplication | 52*1= | 52 | multiplication | -| 3 | Division | 14/26= | 0.5384615384615384 | division | -| 4 | Binary Complement 1s | 0110111= | 1001000 | binaryComplement1s | -| 5 | Modulo Division | 23%70= | 23 | moduloDivision | -| 6 | Square Root | sqrt(121)= | 11 | squareRoot | -| 7 | Power Rule Differentiation | 3x^2 + 3x^5 + 1x^2 + 6x^4 + 6x^3 | 6x^1 + 15x^4 + 2x^1 + 24x^3 + 18x^2 | powerRuleDifferentiation | -| 8 | Square | 18^2= | 324 | square | -| 9 | LCM (Least Common Multiple) | LCM of 17 and 11 = | 187 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 12 = | 3 | gcd | -| 11 | Basic Algebra | 2x + 3 = 10 | 7/2 | basicAlgebra | -| 12 | Logarithm | log2(32) | 5 | log | -| 13 | Easy Division | 196/14 = | 14 | intDivision | -| 14 | Decimal to Binary | Binary of 61= | 111101 | decimalToBinary | -| 15 | Binary to Decimal | 1 | 1 | binaryToDecimal | -| 16 | Fraction Division | (2/1)/(10/5) | 1 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 16 * [[4, 1], [1, 2]] = | [[64,16],[16,32]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 11 = | 69.62892717829278 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 35, 14 and 37 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (15,5),(9,10)= | (12.0,7.5) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 37 and 54 = | 89 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | -4x - 8y = 60, -9x + 10y = 51 | x = -9, y = -3 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (16, 7) and (19, 14) | sqrt(58) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 8 = | 19.70 | pythagoreanTheorem | -| 26 | Linear Equations | -8x + 15y = -109 -6x + -14y = 90 | x = 8, y = -3 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 130 | [2, 5, 13] | primeFactors | -| 28 | Fraction Multiplication | (8/9)*(3/2) | 4/3 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 8 sides | 135.0 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 11 objects picked 9 at a time | 55 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 8m, 4m, 17m is | 472 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 32m and radius = 18m is | 5654 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 19m, 1m is | 266 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 16m and radius = 18m is | 16286 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 48m and radius = 20m is | 4523 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 29m and radius = 6m is | 1093 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 59 and 57 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -1/4x - 2 and y = 4/5x + 3 | (-100/21, -17/21) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 13 objects picked 8 at a time = | 51891840 | permutations | -| 43 | Cross Product of 2 Vectors | [4, -11, 9] X [-8, -19, -5] = | [226, -52, -164] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/7 and 2/4? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2398 dollars, 9% rate of interest and for a time period of 5 years is = | 1079.1 | simpleInterest | +| 0 | Addition | 0+0= | 0 | addition | +| 1 | Subtraction | 46-14= | 32 | subtraction | +| 2 | Multiplication | 6*12= | 72 | multiplication | +| 3 | Division | 39/11= | 3.5454545454545454 | division | +| 4 | Binary Complement 1s | 0000= | 1111 | binaryComplement1s | +| 5 | Modulo Division | 98%34= | 30 | moduloDivision | +| 6 | Square Root | sqrt(9)= | 3 | squareRoot | +| 7 | Power Rule Differentiation | 5x^5 + 2x^9 + 4x^3 + 3x^3 | 25x^4 + 18x^8 + 12x^2 + 9x^2 | powerRuleDifferentiation | +| 8 | Square | 20^2= | 400 | square | +| 9 | LCM (Least Common Multiple) | LCM of 13 and 13 = | 13 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 13 = | 1 | gcd | +| 11 | Basic Algebra | 3x + 2 = 7 | 5/3 | basicAlgebra | +| 12 | Logarithm | log3(243) | 5 | log | +| 13 | Easy Division | 154/14 = | 11 | intDivision | +| 14 | Decimal to Binary | Binary of 86= | 1010110 | decimalToBinary | +| 15 | Binary to Decimal | 10 | 2 | binaryToDecimal | +| 16 | Fraction Division | (5/1)/(3/2) | 10/3 | fractionDivision | +| 17 | Integer Multiplication with 2x2 Matrix | 4 * [[2, 6], [8, 6]] = | [[8,24],[32,24]] | intMatrix22Multiplication | +| 18 | Area of Triangle | Area of triangle with side lengths: 9 15 6 = | 0.0 | areaOfTriangle | +| 19 | Triangle exists check | Does triangle with sides 23, 8 and 32 exist? | No | doesTriangleExist | +| 20 | Midpoint of the two point | (-19,9),(-9,8)= | (-14.0,8.5) | midPointOfTwoPoint | +| 21 | Factoring Quadratic | x^2-1x-42 | (x-7)(x+6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 41 and 80 = | 59 | thirdAngleOfTriangle | +| 23 | Solve a System of Equations in R^2 | -6x + 3y = -39, -10x + 5y = -65 | x = 6, y = -1 | systemOfEquations | +| 24 | Distance between 2 points | Find the distance between (20, 0) and (-18, 0) | sqrt(1444) | distance2Point | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 3 = | 16.28 | pythagoreanTheorem | +| 26 | Linear Equations | 8x + 11y = 91 +-10x + 17y = -83 | x = 10, y = 1 | linearEquations | +| 27 | Prime Factorisation | Find prime factors of 69 | [3, 23] | primeFactors | +| 28 | Fraction Multiplication | (1/2)*(2/1) | 1 | fractionMultiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | angleRegularPolygon | +| 30 | Combinations of Objects | Number of combinations from 10 objects picked 1 at a time | 10 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 20m is | 2400 m^2 | surfaceAreaCubeGen | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 19m, 6m, 13m is | 878 m^2 | surfaceAreaCuboidGen | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 8m and radius = 9m is | 961 m^2 | surfaceAreaCylinderGen | +| 35 | Volum of Cube | Volume of cube with side = 20m is | 8000 m^3 | volumeCubeGen | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 15m, 7m, 5m is | 525 m^3 | volumeCuboidGen | +| 37 | Volume of cylinder | Volume of cylinder with height = 15m and radius = 15m is | 10602 m^3 | volumeCylinderGen | +| 38 | Surface Area of cone | Surface area of cone with height = 29m and radius = 15m is | 2245 m^2 | surfaceAreaConeGen | +| 39 | Volume of cone | Volume of cone with height = 5m and radius = 7m is | 256 m^3 | volumeConeGen | +| 40 | Common Factors | Common Factors of 84 and 58 = | [1, 2] | commonFactors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -6/3x and y = 3/5x - 1 | (5/13, -10/13) | intersectionOfTwoLines | +| 42 | Permutations | Number of Permutations from 11 objects picked 9 at a time = | 19958400 | permutations | +| 43 | Cross Product of 2 Vectors | [-11, -12, -17] X [-12, -20, 13] = | [-496, 347, 76] | vectorCross | +| 44 | Compare Fractions | Which symbol represents the comparison between 3/5 and 6/9? | < | compareFractions | +| 45 | Simple Interest | Simple interest for a principle amount of 6089 dollars, 3% rate of interest and for a time period of 8 years is = | 1461.36 | simpleInterest | | 46 | Multiplication of two matrices | Multiply -
-83 6 91 4 -58 91 -91 47 -87
4 -2 24 66 -58 -58 -46 -96 52
-5 5 -53 74 31 -67 65 -31 56
77 -16 -73 50 54 -46 -11 91 64
and +
35 -82 -90 -70 -68
11 15 -23 94 -93
-85 -30 -79 2 -71
40 -33 -24 87 70
94 -86 -62 -40 58
and -") + prob = prob.replace(" ", "") + prob = prob.replace("\n", "") instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 5f06a1c..f1d2596 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,4 +1,4 @@ -.__init__ import * +from .__init__ import * def meanMedianFunc(maxlen = 10): randomlist = random.sample(range(1, 99), maxlen) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index aaf4573..6130ad0 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,4 +1,4 @@ -.__init__ import * +from .__init__ import * def sectorAreaFunc(maxRadius = 49,maxAngle = 359): Radius = random.randint(1, maxRadius) From 6f7be5fef9093467a56def4b7488257100e7bb58 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:07:46 +0530 Subject: [PATCH 18/99] Create degreeToRadFunc.py --- mathgenerator/funcs/degreeToRadFunc.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 mathgenerator/funcs/degreeToRadFunc.py diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py new file mode 100644 index 0000000..3d1cb43 --- /dev/null +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -0,0 +1,11 @@ +from .__init__ import * +from numpy import pi + +def degreeToRadFunc(max_deg=360): + a = random.randint(0, max_deg) + b = (pi*a)/180 + + problem = "Angle " + str(a) + " in radians is = " + solution = str(b) + + return problem, solution From 57c731ad2540229829b55de99857abea257c8790 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:08:56 +0530 Subject: [PATCH 19/99] Update __init__.py --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index fb8def9..9b46c3a 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -81,3 +81,4 @@ from .sectorAreaFunc import* from .meanMedianFunc import* from .determinantToMatrix22 import * from .deciToHexaFunc import * +from .degreeToRadFunc import * From b2e7baa3431e324582e6f4ada237dd7bc0112111 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:09:49 +0530 Subject: [PATCH 20/99] Update mathgen.py added generator --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 9f570cc..b380459 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -114,3 +114,4 @@ meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numb 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) +degreeToRad = Generator("Degrees to Radians", 85, "Angle a in radians is = ", "b", degreeToRadFunc) From 6a0aff765280e1f9772b1d92e13f8b39cd95053a Mon Sep 17 00:00:00 2001 From: lukew3 Date: Mon, 19 Oct 2020 12:16:03 -0400 Subject: [PATCH 21/99] Improved module format --- mathgenerator/__init__.py | 20 +++++++++++++++++++ mathgenerator/funcs/__init__.py | 2 +- .../funcs/{additionFunc.py => addition.py} | 4 +++- mathgenerator/mathgen.py | 11 +++++----- test.py | 2 +- 5 files changed, 31 insertions(+), 8 deletions(-) rename mathgenerator/funcs/{additionFunc.py => addition.py} (80%) diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index e69de29..9a5f3ea 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -0,0 +1,20 @@ + +genList = [] + +class Generator: + def __init__(self, title, id, generalProb, generalSol, func): + self.title = title + self.id = id + self.generalProb = generalProb + self.generalSol = generalSol + self.func = func + genList.append([id, title, self]) + + def __str__(self): + return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol + + def __call__(self, **kwargs): + return self.func(**kwargs) + +def getGenList(): + return genList diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 4bfd99e..0cca17b 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,7 +2,7 @@ import random import math import fractions -from .additionFunc import * +from .addition import * from .subtractionFunc import * from .multiplicationFunc import * from .divisionFunc import * diff --git a/mathgenerator/funcs/additionFunc.py b/mathgenerator/funcs/addition.py similarity index 80% rename from mathgenerator/funcs/additionFunc.py rename to mathgenerator/funcs/addition.py index 30dfefe..b1cc1d6 100644 --- a/mathgenerator/funcs/additionFunc.py +++ b/mathgenerator/funcs/addition.py @@ -1,5 +1,5 @@ from .__init__ import * - +from ..__init__ import Generator def additionFunc(maxSum=99, maxAddend=50): a = random.randint(0, maxAddend) @@ -8,3 +8,5 @@ def additionFunc(maxSum=99, maxAddend=50): problem = str(a) + "+" + str(b) + "=" solution = str(c) return problem, solution + +addition = Generator("Addition", 0, "a+b=", "c", additionFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 89bf086..064c69a 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -2,8 +2,9 @@ import random import math import fractions from .funcs import * +from .__init__ import getGenList -genList = [] +genList = getGenList() # || Generator class class Generator: @@ -28,13 +29,13 @@ def genById(id): return(generator()) # -def getGenList(): - return(genList) +#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) +#addition = Generator("Addition", 0, "a+b=", "c", additionFunc) subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc) division = Generator("Division", 3, "a/b=", "c", divisionFunc) @@ -111,4 +112,4 @@ binary2sComplement = Generator("Binary 2's Complement", 73, "2's complement of 1 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) +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) diff --git a/test.py b/test.py index e5bb2c1..a1fb4dd 100644 --- a/test.py +++ b/test.py @@ -3,4 +3,4 @@ from mathgenerator import mathgen #test your generators here print(mathgen.addition()) -print(mathgen.genById(74)) +print(mathgen.genById(10)) From 74aaec3fc60c450fe2409ba6769f14efcdcb5baa Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:51:14 +0530 Subject: [PATCH 22/99] Create percentageFunc.py --- mathgenerator/funcs/percentageFunc.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mathgenerator/funcs/percentageFunc.py diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py new file mode 100644 index 0000000..19a4203 --- /dev/null +++ b/mathgenerator/funcs/percentageFunc.py @@ -0,0 +1,10 @@ +from .__init__ import * + +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 + formatted_float = "{:.2f}".format(percentage) + solution = f"Required percentage = {formatted_float}%" + return problem, solution From 848454787fa9627863e98951c5e880c676ff55b1 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:51:42 +0530 Subject: [PATCH 23/99] Update __init__.py --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 73849f0..b0cc39e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -82,3 +82,4 @@ from .meanMedianFunc import* from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * +from .percentageFunc import * From 290e6852694641ff5cc73ef85fd6be88ffd3284f Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 21:53:51 +0530 Subject: [PATCH 24/99] Update mathgen.py --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 997b8e2..ae84143 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -115,3 +115,4 @@ meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numb 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) From 91358f5b1bd1099857f6efa411d5550beb3fadd9 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 13:54:31 -0400 Subject: [PATCH 25/99] pep8 fixes --- makeReadme.py | 11 +- mathgenerator/__init__.py | 2 + mathgenerator/funcs/BinaryToDecimalFunc.py | 6 +- mathgenerator/funcs/DecimalToBinaryFunc.py | 2 +- mathgenerator/funcs/DiceSumProbFunc.py | 39 +-- mathgenerator/funcs/MidPointOfTwoPointFunc.py | 2 +- mathgenerator/funcs/absoluteDifferenceFunc.py | 18 +- mathgenerator/funcs/addition.py | 7 +- mathgenerator/funcs/areaOfTriangleFunc.py | 5 +- mathgenerator/funcs/basicAlgebraFunc.py | 4 +- mathgenerator/funcs/basicTrigonometryFunc.py | 23 +- mathgenerator/funcs/binary2sComplement.py | 8 +- mathgenerator/funcs/binaryComplement1sFunc.py | 4 +- mathgenerator/funcs/binaryToHexFunc.py | 2 +- mathgenerator/funcs/combinationsFunc.py | 7 +- mathgenerator/funcs/commonFactorsFunc.py | 4 +- mathgenerator/funcs/compareFractionsFunc.py | 2 +- mathgenerator/funcs/compoundInterestFunc.py | 6 +- mathgenerator/funcs/confidenceIntervalFunc.py | 29 +-- mathgenerator/funcs/cubeRootFunc.py | 2 +- mathgenerator/funcs/dataSummaryFunc.py | 22 +- mathgenerator/funcs/deciToHexaFunc.py | 2 +- mathgenerator/funcs/determinantToMatrix22.py | 5 +- mathgenerator/funcs/distanceTwoPointsFunc.py | 2 +- mathgenerator/funcs/divideFractionsFunc.py | 2 +- mathgenerator/funcs/divisionFunc.py | 2 +- mathgenerator/funcs/divisionToIntFunc.py | 2 +- mathgenerator/funcs/exponentiationFunc.py | 4 +- mathgenerator/funcs/factorialFunc.py | 6 +- mathgenerator/funcs/factoringFunc.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 12 +- .../funcs/fourthAngleOfQuadriFunc.py | 2 +- mathgenerator/funcs/geomProgrFunc.py | 25 +- mathgenerator/funcs/geometricMeanFunc.py | 46 ++-- mathgenerator/funcs/harmonicMeanFunc.py | 46 ++-- mathgenerator/funcs/hcfFunc.py | 3 +- .../funcs/intersectionOfTwoLinesFunc.py | 8 +- mathgenerator/funcs/isTriangleValidFunc.py | 3 +- mathgenerator/funcs/lcmFunc.py | 2 +- mathgenerator/funcs/linearEquationsFunc.py | 8 +- mathgenerator/funcs/logFunc.py | 2 +- mathgenerator/funcs/matrixInversion.py | 1 + .../funcs/matrixMultiplicationFunc.py | 8 +- mathgenerator/funcs/meanMedianFunc.py | 3 +- mathgenerator/funcs/moduloFunc.py | 2 +- mathgenerator/funcs/multiplicationFunc.py | 2 +- .../funcs/multiplyComplexNumbersFunc.py | 10 +- mathgenerator/funcs/multiplyFractionsFunc.py | 2 +- mathgenerator/funcs/multiplyIntToMatrix22.py | 2 +- mathgenerator/funcs/nthFibonacciNumberFunc.py | 9 +- mathgenerator/funcs/percentageFunc.py | 3 +- mathgenerator/funcs/permutationFunc.py | 3 +- .../funcs/powerRuleDifferentiationFunc.py | 2 +- .../funcs/powerRuleIntegrationFunc.py | 3 +- mathgenerator/funcs/primeFactorsFunc.py | 2 +- mathgenerator/funcs/profitLossPercentFunc.py | 8 +- mathgenerator/funcs/pythagoreanTheoremFunc.py | 2 +- mathgenerator/funcs/quadraticEquation.py | 8 +- .../funcs/regularPolygonAngleFunc.py | 2 +- mathgenerator/funcs/sectorAreaFunc.py | 5 +- mathgenerator/funcs/simpleInterestFunc.py | 5 +- mathgenerator/funcs/squareFunc.py | 2 +- mathgenerator/funcs/squareRootFunc.py | 2 +- mathgenerator/funcs/subtractionFunc.py | 2 +- .../funcs/sumOfAnglesOfPolygonFunc.py | 4 +- mathgenerator/funcs/surdsComparisonFunc.py | 8 +- mathgenerator/funcs/surfaceAreaCone.py | 2 +- mathgenerator/funcs/surfaceAreaCuboid.py | 2 +- mathgenerator/funcs/surfaceAreaCylinder.py | 2 +- mathgenerator/funcs/surfaceAreaSphere.py | 4 +- mathgenerator/funcs/systemOfEquationsFunc.py | 5 +- .../funcs/thirdAngleOfTriangleFunc.py | 2 +- mathgenerator/funcs/vectorCrossFunc.py | 12 +- mathgenerator/funcs/vectorDotFunc.py | 12 +- mathgenerator/funcs/volumeCone.py | 2 +- mathgenerator/funcs/volumeCube.py | 2 +- mathgenerator/funcs/volumeCuboid.py | 2 +- mathgenerator/funcs/volumeCylinder.py | 2 +- mathgenerator/funcs/volumeSphereFunc.py | 12 +- mathgenerator/mathgen.py | 222 ++++++++++++------ setup.py | 2 +- test.py | 2 +- 82 files changed, 450 insertions(+), 326 deletions(-) diff --git a/makeReadme.py b/makeReadme.py index 796dc00..35c3b8a 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -5,10 +5,11 @@ from mathgenerator.mathgen import * wList = getGenList() lines = [] with open('mathgenerator/mathgen.py', 'r') as f: - lines=f.readlines() + 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: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 9a5f3ea..01875a9 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,6 +1,7 @@ genList = [] + class Generator: def __init__(self, title, id, generalProb, generalSol, func): self.title = title @@ -16,5 +17,6 @@ class Generator: def __call__(self, **kwargs): return self.func(**kwargs) + def getGenList(): return genList diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index 27b165d..9d2b25d 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -1,12 +1,12 @@ -from .__init__ import * +from .__init__ import * def BinaryToDecimalFunc(max_dig=10): problem = '' - + for i in range(random.randint(1, max_dig)): temp = str(random.randint(0, 1)) problem += temp - + solution = int(problem, 2) return problem, solution diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 8df2d8a..872e105 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -7,5 +7,5 @@ def DecimalToBinaryFunc(max_dec=99): problem = "Binary of " + str(a) + "=" solution = str(b) - + return problem, solution diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 2180ee4..f9be9aa 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -2,24 +2,25 @@ from .__init__ import * def DiceSumProbFunc(maxDice=3): - a = random.randint(1,maxDice) - b = random.randint(a,6*a) + a = random.randint(1, maxDice) + 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 - elif a==2: - for j in [1,2,3,4,5,6]: - 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 - - problem = "If {} dice are rolled at the same time, the probability of getting a sum of {} =".format(a,b) - solution="{}/{}".format(count, 6**a) + count = 0 + for i in [1, 2, 3, 4, 5, 6]: + if a == 1: + if i == b: + count = count+1 + elif a == 2: + for j in [1, 2, 3, 4, 5, 6]: + 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 + + 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 diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index 3c9202a..f8cd8a1 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -6,7 +6,7 @@ def MidPointOfTwoPointFunc(maxValue=20): y1 = random.randint(-20, maxValue) x2 = random.randint(-20, maxValue) y2 = random.randint(-20, maxValue) - + problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index d578d19..075d1c2 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -1,10 +1,12 @@ -from .__init__ import * +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) + " = " - solution = absDiff - return problem, solution \ No newline at end of file +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) + " = " + solution = absDiff + return problem, solution diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/addition.py index b1cc1d6..df74496 100644 --- a/mathgenerator/funcs/addition.py +++ b/mathgenerator/funcs/addition.py @@ -1,12 +1,15 @@ -from .__init__ import * +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) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index a5e1250..8506b55 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -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 diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index 939ac5e..1d927ef 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def basicAlgebraFunc(maxVariable=10): @@ -19,7 +19,7 @@ def basicAlgebraFunc(maxVariable=10): x = "0" elif a == 1 or a == i: x = f"{c - b}" - + problem = f"{a}x + {b} = {c}" solution = x return problem, solution diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index dd4fe5d..8ce32a4 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -1,14 +1,17 @@ -from .__init__ import * +from .__init__ import * -def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one - angle=random.choice(angles) - function=random.choice(functions) +# 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"} + problem = f"What is {function}({angle})?" - solution=result_fraction_map[round(eval(expression),2)] if round(eval(expression),2)<=99999 else "∞" #for handling the ∞ condition - return problem,solution + 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 + return problem, solution diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index f51b797..478b2c9 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -1,8 +1,10 @@ -from .__init__ import * +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: @@ -23,4 +25,4 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') - return problem, solution \ No newline at end of file + return problem, solution diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 2568303..1dbb1b2 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def binaryComplement1sFunc(maxDigits=10): @@ -9,7 +9,7 @@ def binaryComplement1sFunc(maxDigits=10): temp = str(random.randint(0, 1)) question += temp answer += "0" if temp == "1" else "1" - + problem = question+"=" solution = answer return problem, solution diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index 0f3e962..f06fcfc 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def binaryToHexFunc(max_dig=10): diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index 79390a6..6ea2e6d 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def combinationsFunc(maxlength=20): @@ -14,6 +14,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 diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index 633abb3..82a0e3b 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -1,4 +1,4 @@ -from .__init__ import * +from .__init__ import * def commonFactorsFunc(maxVal=100): @@ -18,7 +18,7 @@ def commonFactorsFunc(maxVal=100): if (y % i == 0): count = count + 1 arr.append(i) - + problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index d0d08a4..56c4714 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -21,6 +21,6 @@ def compareFractionsFunc(maxVal=10): solution = "<" else: solution = "=" - + problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 6f4fba3..59cac26 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,11 +1,13 @@ 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 diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index 32bd26a..babdabe 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -2,29 +2,30 @@ from .__init__ import * def confidenceIntervalFunc(): - n=random.randint(20,40) - j=random.randint(0,3) + n = random.randint(20, 40) + j = random.randint(0, 3) - lst=random.sample(range(200,300),n) - lst_per=[80 ,90, 95, 99] + lst = random.sample(range(200, 300), n) + lst_per = [80, 90, 95, 99] lst_t = [1.282, 1.645, 1.960, 2.576] - mean=0 - sd=0 + mean = 0 + sd = 0 for i in lst: - count= i + mean - mean=count + count = i + mean + mean = count mean = mean/n for i in lst: - x=(i-mean)**2+sd - sd=x + x = (i-mean)**2+sd + sd = x - sd=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) + + 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 diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cubeRootFunc.py index c9de53c..97b978d 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cubeRootFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def cubeRootFunc(minNo=1, maxNo=1000): b = random.randint(minNo, maxNo) a = b**(1 / 3) - + problem = "cuberoot of " + str(b) + " upto 2 decimal places is:" solution = str(round(a, 2)) return problem, solution diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index 016737c..e0e0bad 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -1,19 +1,19 @@ from .__init__ import * -def dataSummaryFunc(number_values=15,minval=5,maxval=50): - random_list=[] +def dataSummaryFunc(number_values=15, minval=5, maxval=50): + random_list = [] for i in range(number_values): - n=random.randint(minval,maxval) + n = random.randint(minval, maxval) random_list.append(n) - a=sum(random_list) - mean=a/number_values + a = sum(random_list) + mean = a/number_values - var=0 + 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) @@ -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) - return problem,solution + 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 diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/deciToHexaFunc.py index a815e34..5958dfa 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/deciToHexaFunc.py @@ -5,6 +5,6 @@ def deciToHexaFunc(max_dec=1000): a = random.randint(0, max_dec) b = hex(a) problem = "Binary of " + str(a) + "=" - solution = str(b) + solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index a92ac76..c54028d 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -1,6 +1,7 @@ -from .__init__ import * +from .__init__ import * -def determinantToMatrix22(maxMatrixVal = 100): + +def determinantToMatrix22(maxMatrixVal=100): a = random.randint(0, maxMatrixVal) b = random.randint(0, maxMatrixVal) c = random.randint(0, maxMatrixVal) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 1f48f90..7bd1ef2 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -8,7 +8,7 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): point2Y = random.randint(minValXY, maxValXY + 1) distanceSq = (point1X - point2X) ** 2 + (point1Y - point2Y) ** 2 - + solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" return problem, solution diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index abfbec6..0f6bf30 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -20,7 +20,7 @@ def divideFractionsFunc(maxVal=10): tmp_n = a * d tmp_d = b * c - + gcd = calculate_gcd(tmp_n, tmp_d) x = f"{tmp_n//gcd}/{tmp_d//gcd}" diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index 60af33d..930e34b 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -5,7 +5,7 @@ def divisionFunc(maxRes=99, maxDivid=99): a = random.randint(0, maxDivid) b = random.randint(0, min(maxRes, maxDivid)) c = a / b - + problem = str(a) + "/" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index d5f3cfd..fcc62f5 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -7,7 +7,7 @@ def divisionToIntFunc(maxA=25, maxB=25): divisor = a * b dividend = random.choice([a, b]) - + problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index 4ff1ba1..d58f00d 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def exponentiationFunc(maxBase = 20,maxExpo = 10): +def exponentiationFunc(maxBase=20, maxExpo=10): base = random.randint(1, maxBase) expo = random.randint(1, maxExpo) - + problem = f"{base}^{expo} =" solution = str(base ** expo) return problem, solution diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index ac4536c..71dc3a2 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -4,12 +4,12 @@ from .__init__ import * def factorialFunc(maxInput=6): a = random.randint(0, maxInput) n = a - + problem = str(a) + "! = " b = 1 while a != 1 and n > 0: - b *= n - n -= 1 + b *= n + n -= 1 solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index c52482f..1cb43c0 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -26,4 +26,4 @@ def factoringFunc(range_x1=10, range_x2=10): x1 = intParser(x1) x2 = intParser(x2) solution = f"(x{x1})(x{x2})" - return problem, solution \ No newline at end of file + return problem, solution diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index 42de00d..c043567 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -2,20 +2,20 @@ from .__init__ import * def fibonacciSeriesFunc(minNo=1): - n = random.randint(minNo,20) + n = random.randint(minNo, 20) def createFibList(n): - l=[] + l = [] for i in range(n): - if i<2: + if i < 2: l.append(i) else: val = l[i-1]+l[i-2] l.append(val) return l - fibList=createFibList(n) - + fibList = createFibList(n) + problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" solution = fibList - return problem,solution + return problem, solution diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index d183e17..59a05c4 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -8,7 +8,7 @@ def fourthAngleOfQuadriFunc(maxAngle=180): sum_ = angle1 + angle2 + angle3 angle4 = 360 - sum_ - + problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 3e3ad5c..d051f85 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,15 +1,18 @@ -from .__init__ import * +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) - GP=[] + 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)) - 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 + 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 05ded2b..07dc4cd 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -1,27 +1,27 @@ -from .__init__ import * +from .__init__ import * def geometricMeanFunc(maxValue=100, maxNum=4): - a=random.randint(1,maxValue) - b=random.randint(1,maxValue) - c=random.randint(1,maxValue) - d=random.randint(1,maxValue) - num=random.randint(2,4) - if num==2: - product=a*b - elif num==3: - product=a*b*c - elif num==4: - product=a*b*c*d + a = random.randint(1, maxValue) + b = random.randint(1, maxValue) + c = random.randint(1, maxValue) + d = random.randint(1, maxValue) + num = random.randint(2, 4) + if num == 2: + product = a*b + elif num == 3: + product = a*b*c + elif num == 4: + product = a*b*c*d - ans=product**(1/num) - if num==2: - problem=f"Geometric mean of {num} numbers {a} and {b} = " - solution = f"({a}*{b})^(1/{num}) = {ans}" - elif num==3: - problem=f"Geometric mean of {num} numbers {a} , {b} and {c} = " - solution = f"({a}*{b}*{c})^(1/{num}) = {ans}" - elif num==4: - problem=f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " - solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" - return problem,solution + ans = product**(1/num) + if num == 2: + problem = f"Geometric mean of {num} numbers {a} and {b} = " + solution = f"({a}*{b})^(1/{num}) = {ans}" + elif num == 3: + problem = f"Geometric mean of {num} numbers {a} , {b} and {c} = " + solution = f"({a}*{b}*{c})^(1/{num}) = {ans}" + elif num == 4: + problem = f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " + solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" + return problem, solution diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 035273f..1c9e397 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -1,28 +1,28 @@ -from .__init__ import * +from .__init__ import * def harmonicMeanFunc(maxValue=100, maxNum=4): - a=random.randint(1,maxValue) - b=random.randint(1,maxValue) - c=random.randint(1,maxValue) - d=random.randint(1,maxValue) - num=random.randint(2,4) - if num==2: - sum=(1/a)+(1/b) - elif num==3: - sum=(1/a)+(1/b)+(1/c) - elif num==4: - sum=(1/a)+(1/b)+(1/c)+(1/d) + a = random.randint(1, maxValue) + b = random.randint(1, maxValue) + c = random.randint(1, maxValue) + d = random.randint(1, maxValue) + num = random.randint(2, 4) + if num == 2: + sum = (1/a)+(1/b) + elif num == 3: + sum = (1/a)+(1/b)+(1/c) + elif num == 4: + sum = (1/a)+(1/b)+(1/c)+(1/d) - ans=num/sum - if num==2: - problem=f"Harmonic mean of {num} numbers {a} and {b} = " - solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" - elif num==3: - problem=f"Harmonic mean of {num} numbers {a} , {b} and {c} = " - solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c})) = {ans}" - elif num==4: - problem=f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = " - solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}" - return problem,solution + ans = num/sum + if num == 2: + problem = f"Harmonic mean of {num} numbers {a} and {b} = " + solution = f" {num}/((1/{a}) + (1/{b})) = {ans}" + elif num == 3: + problem = f"Harmonic mean of {num} numbers {a} , {b} and {c} = " + solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c})) = {ans}" + elif num == 4: + problem = f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = " + solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}" + return problem, solution diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 40be783..a9f4e96 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -1,4 +1,5 @@ -from .__init__ import * +from .__init__ import * + def hcfFunc(maxVal=20): a = random.randint(1, maxVal) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index 96f681d..2e6fbb6 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -33,8 +33,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) @@ -58,5 +60,5 @@ def intersectionOfTwoLinesFunc( intersection_x = (b1 - b2) / (m2 - m1) intersection_y = ((m2 * b1) - (m1 * b2)) / (m2 - m1) solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" - + return problem, solution diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index a80a05d..304c549 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -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: diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index af2ee41..32e1868 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -13,5 +13,5 @@ def lcmFunc(maxVal=20): problem = f"LCM of {a} and {b} =" solution = str(d) - + return problem, solution diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index 4aa1fba..14a65f1 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -9,13 +9,15 @@ 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("") prob = " + ".join(prob) + " = " + str(res) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 8d16214..6fc651b 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -8,5 +8,5 @@ def logFunc(maxBase=3, maxVal=8): problem = "log" + str(b) + "(" + str(c) + ")" solution = str(a) - + return problem, solution diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 822cb83..28080e5 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -1,6 +1,7 @@ from .__init__ import * import sympy + def matrixInversion(SquareMatrixDimension=3, MaxMatrixElement=99, OnlyIntegerElementsInInvertedMatrix=False): if OnlyIntegerElementsInInvertedMatrix is True: isItOk = False diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index eeaa265..a85cca5 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -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]) @@ -47,5 +49,5 @@ def matrixMultiplicationFuncHelper(inp): string += ", "if j < n-1 else "" string += "]\n [" if i < m-1 else "" string += "]]" - - return string \ No newline at end of file + + return string diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index f1d2596..36fc986 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,6 +1,7 @@ from .__init__ import * -def meanMedianFunc(maxlen = 10): + +def meanMedianFunc(maxlen=10): randomlist = random.sample(range(1, 99), maxlen) total = 0 for n in randomlist: diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 71f1421..2a447c4 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -5,7 +5,7 @@ def moduloFunc(maxRes=99, maxModulo=99): a = random.randint(0, maxModulo) b = random.randint(0, min(maxRes, maxModulo)) c = a % b if b != 0 else 0 - + problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 00ebb26..8ad25f6 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -5,7 +5,7 @@ def multiplicationFunc(maxRes=99, maxMulti=99): a = random.randint(0, maxMulti) b = random.randint(0, min(int(maxMulti / a), maxRes)) c = a * b - + problem = str(a) + "*" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index f959d4d..69ca238 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,9 +1,11 @@ -from .__init__ import * +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 diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 14614d6..67c5017 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -20,7 +20,7 @@ def multiplyFractionsFunc(maxVal=10): tmp_n = a * c tmp_d = b * d - + gcd = calculate_gcd(tmp_n, tmp_d) x = f"{tmp_n//gcd}/{tmp_d//gcd}" diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index 120c202..7808afe 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -6,7 +6,7 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): b = random.randint(0, maxMatrixVal) c = random.randint(0, maxMatrixVal) d = random.randint(0, maxMatrixVal) - + constant = random.randint(0, int(maxRes / max(a, b, c, d))) problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = " solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]" diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index 023a007..d559f1f 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -1,10 +1,11 @@ -from .__init__ import * +from .__init__ import * -def nthFibonacciNumberFunc(maxN = 100): +def nthFibonacciNumberFunc(maxN=100): golden_ratio = (1 + math.sqrt(5))/2 - n = random.randint(1,maxN) + 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 19a4203..e69749d 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -1,6 +1,7 @@ from .__init__ import * -def percentageFunc(maxValue = 99, maxpercentage=99): + +def percentageFunc(maxValue=99, maxpercentage=99): a = random.randint(1, maxpercentage) b = random.randint(1, maxValue) problem = f"What is {a}% of {b}?" diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index ffae44e..c62841f 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -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 diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index 9dac2db..a14bd90 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -12,7 +12,7 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + " coefficient = random.randint(1, maxCoef) exponent = random.randint(1, maxExp) - + problem += str(coefficient) + "x^" + str(exponent) solution += str(coefficient * exponent) + "x^" + str(exponent - 1) return problem, solution diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index 112f5b5..fb1f62d 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -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 diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 5e645d2..852821c 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -16,7 +16,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): if n > 1: factors.append(n) - + problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index 05a3653..49d7f27 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -1,7 +1,7 @@ -from .__init__ import * +from .__init__ import * -def profitLossPercentFunc(maxCP = 1000, maxSP = 1000): +def profitLossPercentFunc(maxCP=1000, maxSP=1000): cP = random.randint(1, maxCP) sP = random.randint(1, maxSP) diff = abs(sP-cP) @@ -12,5 +12,5 @@ def profitLossPercentFunc(maxCP = 1000, maxSP = 1000): percent = diff/cP * 100 problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: " solution = percent - - return problem, solution \ No newline at end of file + + return problem, solution diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 2776592..17bcd82 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -5,7 +5,7 @@ def pythagoreanTheoremFunc(maxLength=20): a = random.randint(1, maxLength) b = random.randint(1, maxLength) c = (a**2 + b**2)**0.5 - + problem = f"The hypotenuse of a right triangle given the other two lengths {a} and {b} = " solution = f"{c:.0f}" if c.is_integer() else f"{c:.2f}" return problem, solution diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 98f895e..73f0ea4 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -4,9 +4,11 @@ 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/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index 569d2d5..5275bef 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def regularPolygonAngleFunc(minVal=3, maxVal=20): sideNum = random.randint(minVal, maxVal) problem = f"Find the angle of a regular polygon with {sideNum} sides" - + exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index 6130ad0..d7f9545 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,10 +1,11 @@ from .__init__ import * -def sectorAreaFunc(maxRadius = 49,maxAngle = 359): + +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) formatted_float = "{:.5f}".format(secArea) - solution = f"Area of sector = {formatted_float}" + solution = f"Area of sector = {formatted_float}" return problem, solution diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index de997d0..08b0f3b 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -6,7 +6,8 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): b = random.randint(1, maxRate) 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/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 6384197..1d159dc 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def squareFunc(maxSquareNum=20): a = random.randint(1, maxSquareNum) b = a * a - + problem = str(a) + "^2" + "=" solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index 87152c8..e5d2418 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -4,7 +4,7 @@ from .__init__ import * def squareRootFunc(minNo=1, maxNo=12): b = random.randint(minNo, maxNo) a = b * b - + problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index 91c8e74..a50537e 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -5,7 +5,7 @@ def subtractionFunc(maxMinuend=99, maxDiff=99): a = random.randint(0, maxMinuend) b = random.randint(max(0, (a - maxDiff)), a) c = a - b - + problem = str(a) + "-" + str(b) + "=" solution = str(c) return problem, solution diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 6181e96..8338698 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def sumOfAnglesOfPolygonFunc(maxSides = 12): +def sumOfAnglesOfPolygonFunc(maxSides=12): side = random.randint(3, maxSides) sum = (side - 2) * 180 - + problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index 161aac3..3035265 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def surdsComparisonFunc(maxValue = 100, maxRoot = 10): - radicand1,radicand2 = tuple(random.sample(range(1,maxValue),2)) - degree1, degree2 = tuple(random.sample(range(1,maxRoot),2)) - +def surdsComparisonFunc(maxValue=100, maxRoot=10): + radicand1, radicand2 = tuple(random.sample(range(1, maxValue), 2)) + 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) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index 8132e7d..53799aa 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -8,6 +8,6 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): slopingHeight = math.sqrt(a**2 + b**2) problem = f"Surface area of cone with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * slopingHeight + math.pi * b * b) - + solution = f"{ans} {unit}^2" return problem, solution diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index 3630abc..95fee71 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -5,7 +5,7 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): a = random.randint(1, maxSide) b = random.randint(1, maxSide) c = random.randint(1, maxSide) - + problem = f"Surface area of cuboid with sides = {a}{unit}, {b}{unit}, {c}{unit} is" ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index 92035ba..eacc0be 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -4,7 +4,7 @@ from .__init__ import * def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Surface area of cylinder with height = {a}{unit} and radius = {b}{unit} is" ans = int(2 * math.pi * a * b + 2 * math.pi * b * b) solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 84ce3e1..6b9110d 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -1,9 +1,9 @@ from .__init__ import * -def surfaceAreaSphere(maxSide = 20, unit = 'm'): +def surfaceAreaSphere(maxSide=20, unit='m'): r = random.randint(1, maxSide) - + problem = f"Surface area of Sphere with radius = {r}{unit} is" ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index fd28eaf..2e82f5f 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -36,9 +36,10 @@ 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)}" solution = f"x = {x}, y = {y}" return problem, solution diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 688b209..5268ceb 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -5,7 +5,7 @@ def thirdAngleOfTriangleFunc(maxAngle=89): angle1 = random.randint(1, maxAngle) angle2 = random.randint(1, maxAngle) angle3 = 180 - (angle1 + angle2) - + problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 07ff0b2..21bcb0e 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -2,12 +2,12 @@ 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 = [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]] - problem = str(a) + " X " + str(b) + " = " - solution = str(c) - return problem, solution + problem = str(a) + " X " + str(b) + " = " + solution = str(c) + return problem, solution diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 0364c65..011beb3 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -2,10 +2,10 @@ from .__init__ import * def vectorDotFunc(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[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a = [random.randint(minVal, maxVal) for i in range(3)] + b = [random.randint(minVal, maxVal) for i in range(3)] + c = a[0] * b[0] + a[1] * b[1] + a[2] * b[2] - problem = str(a) + " . " + str(b) + " = " - solution = str(c) - return problem, solution + problem = str(a) + " . " + str(b) + " = " + solution = str(c) + return problem, solution diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index 4cd5512..c237bca 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -4,7 +4,7 @@ from .__init__ import * def volumeCone(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Volume of cone with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * b * a * (1 / 3)) solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index e487173..6a52da4 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -3,7 +3,7 @@ from .__init__ import * def volumeCube(maxSide=20, unit='m'): a = random.randint(1, maxSide) - + problem = f"Volume of cube with side = {a}{unit} is" ans = a * a * a solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index a435784..b0a2490 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -5,7 +5,7 @@ def volumeCuboid(maxSide=20, unit='m'): a = random.randint(1, maxSide) b = random.randint(1, maxSide) c = random.randint(1, maxSide) - + problem = f"Volume of cuboid with sides = {a}{unit}, {b}{unit}, {c}{unit} is" ans = a * b * c solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index ecd78da..38dfd64 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -4,7 +4,7 @@ from .__init__ import * def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): a = random.randint(1, maxHeight) b = random.randint(1, maxRadius) - + problem = f"Volume of cylinder with height = {a}{unit} and radius = {b}{unit} is" ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 618dbd3..137db4f 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -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 +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 solution = f"{ans} m^3" - return problem,solution + return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index ae84143..dc29a6e 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -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 @@ -29,90 +31,164 @@ def genById(id): return(generator()) # -#def getGenList(): +# def getGenList(): # return(genList) + # Format is: # <title> = 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) -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) +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) diff --git a/setup.py b/setup.py index 8a88d21..981b662 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( license='MIT', packages=find_packages(), install_requires=[ - + ], entry_points={ } diff --git a/test.py b/test.py index 0de128e..1302ce5 100644 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ from mathgenerator import mathgen -#test your generators here +# test your generators here print(mathgen.addition()) print(mathgen.genById(79)) From 233f8bf180289199ce433ddd27fe59f227b33f7f Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:00:28 -0400 Subject: [PATCH 26/99] 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: From 40f2ce1af3d3c7e9489a10cd355b668e9a8bbc05 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:04:35 -0400 Subject: [PATCH 27/99] Added Celsius to Fahrenheit Conversion formula --- mathgenerator/funcs/celsiustofahrenheit.py | 11 +++++++++++ mathgenerator/mathgen.py | 1 + 2 files changed, 12 insertions(+) create mode 100644 mathgenerator/funcs/celsiustofahrenheit.py diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py new file mode 100644 index 0000000..ec981db --- /dev/null +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -0,0 +1,11 @@ +from .__init__ import * +from ..__init__ import Generator + +def celsiustofahrenheit(maxTemp=100): + celsius = random.randint(-50, maxTemp) + fahrenheit = (celsius * (9/5)) +32 + problem = "Convert", str(celsius), "deg Celsius to degrees Fahrenheit =" + solution = str(fahrenheit) + return problem, solution + +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index ae84143..00bde03 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -116,3 +116,4 @@ intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b], 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) From 2f7af1dfd8af78d2fe6e6be67a3eada2543c0d41 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:05:22 -0400 Subject: [PATCH 28/99] Changed deg to degrees --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index ec981db..fd2ca82 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -4,7 +4,7 @@ from ..__init__ import Generator def celsiustofahrenheit(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 - problem = "Convert", str(celsius), "deg Celsius to degrees Fahrenheit =" + problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution From 90a794cc05d898e9bac6052aa08e45b58e80e2c3 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:08:13 -0400 Subject: [PATCH 29/99] yapf edits --- makeReadme.py | 4 +- mathgenerator/__init__.py | 5 +- mathgenerator/funcs/DiceSumProbFunc.py | 12 +- mathgenerator/funcs/__init__.py | 4 +- mathgenerator/funcs/areaOfTriangleFunc.py | 2 +- mathgenerator/funcs/basicAlgebraFunc.py | 2 +- mathgenerator/funcs/basicTrigonometryFunc.py | 16 +- mathgenerator/funcs/binaryComplement1sFunc.py | 2 +- mathgenerator/funcs/combinationsFunc.py | 1 - mathgenerator/funcs/compareFractionsFunc.py | 4 +- mathgenerator/funcs/compoundInterestFunc.py | 13 +- mathgenerator/funcs/confidenceIntervalFunc.py | 10 +- mathgenerator/funcs/dataSummaryFunc.py | 10 +- mathgenerator/funcs/distanceTwoPointsFunc.py | 2 +- mathgenerator/funcs/divideFractionsFunc.py | 2 +- mathgenerator/funcs/exponentiationFunc.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 4 +- mathgenerator/funcs/geomProgrFunc.py | 17 +- mathgenerator/funcs/geometricMeanFunc.py | 8 +- mathgenerator/funcs/harmonicMeanFunc.py | 8 +- mathgenerator/funcs/hcfFunc.py | 2 +- .../funcs/intersectionOfTwoLinesFunc.py | 18 +- mathgenerator/funcs/isTriangleValidFunc.py | 4 +- mathgenerator/funcs/linearEquationsFunc.py | 10 +- mathgenerator/funcs/matrixInversion.py | 28 +- .../funcs/matrixMultiplicationFunc.py | 2 +- mathgenerator/funcs/meanMedianFunc.py | 4 +- .../funcs/multiplyComplexNumbersFunc.py | 3 +- mathgenerator/funcs/multiplyFractionsFunc.py | 2 +- mathgenerator/funcs/nthFibonacciNumberFunc.py | 6 +- mathgenerator/funcs/percentageFunc.py | 2 +- mathgenerator/funcs/profitLossPercentFunc.py | 6 +- mathgenerator/funcs/quadraticEquation.py | 9 +- mathgenerator/funcs/sectorAreaFunc.py | 2 +- mathgenerator/funcs/simpleInterestFunc.py | 6 +- mathgenerator/funcs/systemOfEquationsFunc.py | 5 +- mathgenerator/funcs/vectorCrossFunc.py | 7 +- mathgenerator/funcs/volumeSphereFunc.py | 2 +- mathgenerator/mathgen.py | 313 +++++++++++------- setup.py | 25 +- tests/test_mathgen.py | 3 +- 41 files changed, 347 insertions(+), 240 deletions(-) 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: # <title> = 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) From 4f03d1b035350372789e76c41aa2f0e4e46a0b4f Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:14:08 -0400 Subject: [PATCH 30/99] linter fix --- mathgenerator/funcs/binary2sComplement.py | 2 +- mathgenerator/funcs/fibonacciSeriesFunc.py | 10 +++++----- mathgenerator/funcs/nthFibonacciNumberFunc.py | 3 +-- mathgenerator/mathgen.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 478b2c9..01af731 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -20,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 + " =" diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index a66e2f4..60391cb 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -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) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index a1a66fb..b7475ee 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -5,7 +5,6 @@ def nthFibonacciNumberFunc(maxN=100): 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/mathgen.py b/mathgenerator/mathgen.py index a9b2a98..faa6cac 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -40,7 +40,7 @@ def genById(id): # Format is: # <title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) # Funcs_start - DO NOT REMOVE! -#addition = Generator("Addition", 0, "a+b=", "c", additionFunc) +# addition = Generator("Addition", 0, "a+b=", "c", additionFunc) subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) multiplication = Generator("Multiplication", 2, "a*b=", "c", multiplicationFunc) From d628e2fb206dfa400a342ead802fa7fb398faa04 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:17:56 -0400 Subject: [PATCH 31/99] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7cf0eb..016ce41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. From 9866c772f965557268aff073a9d7752a0cc03c55 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:19:09 -0400 Subject: [PATCH 32/99] Fixed string formatting... my bad --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index fd2ca82..1e2b8f5 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -4,7 +4,7 @@ from ..__init__ import Generator def celsiustofahrenheit(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 - problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" + problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit = " solution = str(fahrenheit) return problem, solution From c81d89bf25c5b554fed355f9641e77c1d62e4b7a Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:20:06 -0400 Subject: [PATCH 33/99] Update celsiustofahrenheit.py --- mathgenerator/funcs/celsiustofahrenheit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index fd2ca82..641663f 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -1,11 +1,11 @@ from .__init__ import * from ..__init__ import Generator -def celsiustofahrenheit(maxTemp=100): +def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9/5)) +32 problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheit) +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) From 464478676a3b4388a9cbac14e191c76d72b3cb44 Mon Sep 17 00:00:00 2001 From: Nitsujed <jed9340@gmail.com> Date: Mon, 19 Oct 2020 14:21:25 -0400 Subject: [PATCH 34/99] Fixed string formatting... my bad --- mathgenerator/funcs/celsiustofahrenheit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index 57a9f69..0e66be8 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -5,7 +5,7 @@ from ..__init__ import Generator def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) fahrenheit = (celsius * (9 / 5)) + 32 - problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" + problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution From f204de60f6a3d445e612890eb0ba1179efd596fb Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 14:24:24 -0400 Subject: [PATCH 35/99] linter fix --- mathgenerator/funcs/__init__.py | 1 + mathgenerator/funcs/celsiustofahrenheit.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 7ef9c50..83702eb 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -83,3 +83,4 @@ from .determinantToMatrix22 import * from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * +from .celsiustofahrenheit import * diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsiustofahrenheit.py index 641663f..57a9f69 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsiustofahrenheit.py @@ -1,11 +1,14 @@ -from .__init__ import * +from .__init__ import * from ..__init__ import Generator + def celsiustofahrenheitFunc(maxTemp=100): celsius = random.randint(-50, maxTemp) - fahrenheit = (celsius * (9/5)) +32 + fahrenheit = (celsius * (9 / 5)) + 32 problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit =" solution = str(fahrenheit) return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) + +celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) From a0076134241f0de25a4ab9cfc18ac913a9eb9599 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 00:32:02 +0530 Subject: [PATCH 36/99] Create radianToDegFunc.py Radian to Degree Conversion function created --- mathgenerator/funcs/radianToDegFunc.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mathgenerator/funcs/radianToDegFunc.py diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py new file mode 100644 index 0000000..ce08cf3 --- /dev/null +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -0,0 +1,12 @@ +from .__init__ import * +from numpy import pi + +def degreeToRadFunc(max_rad=pi): + a = random.randint(0, max_rad) + b = (180*a)/pi + b = round(b, 2) + + problem = "Angle " + str(a) + " in degrees is = " + solution = str(b) + + return problem, solution From 339e279d0a929925d9ddef5283bd852cc6deab2e Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:02:18 +0400 Subject: [PATCH 37/99] =?UTF-8?q?=F0=9F=9B=A0=20some=20readme=20fixup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- makeReadme.py | 23 +++++++++++++------ .../funcs/matrixMultiplicationFunc.py | 8 +++---- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/makeReadme.py b/makeReadme.py index 7692e35..9a4b762 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -2,6 +2,17 @@ # NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * +def array2markdown_table(string): + string = string.replace("[[", "<table><tr><td>") + string = string.replace("[", "<tr><td>") + string = string.replace(", ", "</td><td>") + string = string.replace("]]", "</td></tr></table>") + string = string.replace("]", "</td></tr>") + string = string.replace(" ", "") + string = string.replace("\n", "") + return string + + wList = getGenList() lines = [] with open('mathgenerator/mathgen.py', 'r') as f: @@ -17,13 +28,11 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - prob = prob.replace("[[", "<table><tr><td>") - prob = prob.replace("[", "<tr><td>") - prob = prob.replace(", ", "</td><td>") - prob = prob.replace("]]\n", "</td></tr></table>") - prob = prob.replace("]\n", "</td></tr>") - prob = prob.replace(" ", "") - prob = prob.replace("\n", "") + prob, solu = myGen(10, 4) + prob = str(prob).rstrip("\n") + solu = str(solu).rstrip("\n") + prob = array2markdown_table(prob) + solu = array2markdown_table(solu) instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index eeaa265..ffddb57 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -1,10 +1,10 @@ from .__init__ import * -def matrixMultiplicationFunc(maxVal=100): - m = random.randint(2, 10) - n = random.randint(2, 10) - k = random.randint(2, 10) +def matrixMultiplicationFunc(maxVal=100, max_dim=10): + m = random.randint(2, max_dim) + n = random.randint(2, max_dim) + k = random.randint(2, max_dim) # generate matrices a and b a = [] From e9a498be4fc0e756897ca3b8456d24e4b5642c6a Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 00:32:46 +0530 Subject: [PATCH 38/99] Update __init__.py Updated init --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 9b46c3a..5a14293 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -82,3 +82,4 @@ from .meanMedianFunc import* from .determinantToMatrix22 import * from .deciToHexaFunc import * from .degreeToRadFunc import * +from .radianToDegFunc import * From f9f902e0fd5123a74a5ca1ec5b6188225a3db2c7 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 00:34:41 +0530 Subject: [PATCH 39/99] Update mathgen.py update mathgen with generator class --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index b380459..2fdc3be 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -115,3 +115,4 @@ intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, "Det([[a,b], 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) degreeToRad = Generator("Degrees to Radians", 85, "Angle a in radians is = ", "b", degreeToRadFunc) +radianToDeg = Generator("Radians to Degrees", 100, "Angle a in degrees is = ", "b", radianToDegFunc) From 974695388f0e79555b43e2ef19f008c768fba96b Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 00:35:48 +0530 Subject: [PATCH 40/99] Update degreeToRadFunc.py Added 2 decimal point round off in solution --- mathgenerator/funcs/degreeToRadFunc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py index 3d1cb43..0f4da2e 100644 --- a/mathgenerator/funcs/degreeToRadFunc.py +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -4,6 +4,7 @@ from numpy import pi def degreeToRadFunc(max_deg=360): a = random.randint(0, max_deg) b = (pi*a)/180 + b = round(b, 2) problem = "Angle " + str(a) + " in radians is = " solution = str(b) From 47b9c594fa10d9caf10d8e0cb28dfec19ccdf5d8 Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:06:34 +0400 Subject: [PATCH 41/99] =?UTF-8?q?=E2=AC=86=20updated=20readme=20and=20?= =?UTF-8?q?=E2=9E=95=20added=20*args=20to=20Generator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 169 +++++++++++++++++++-------------------- mathgenerator/mathgen.py | 4 +- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index dbf463c..56c81cf 100644 --- a/README.md +++ b/README.md @@ -31,88 +31,87 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 23+50= | 73 | addition | -| 1 | Subtraction | 68-41= | 27 | subtraction | -| 2 | Multiplication | 51*1= | 51 | multiplication | -| 3 | Division | 37/44= | 0.8409090909090909 | division | -| 4 | Binary Complement 1s | 01= | 10 | binaryComplement1s | -| 5 | Modulo Division | 49%54= | 49 | moduloDivision | -| 6 | Square Root | sqrt(16)= | 4 | squareRoot | -| 7 | Power Rule Differentiation | 1x^6 + 8x^4 + 5x^5 | 6x^5 + 32x^3 + 25x^4 | powerRuleDifferentiation | -| 8 | Square | 2^2= | 4 | square | -| 9 | LCM (Least Common Multiple) | LCM of 13 and 1 = | 13 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 8 = | 2 | gcd | -| 11 | Basic Algebra | 1x + 6 = 8 | 2 | basicAlgebra | -| 12 | Logarithm | log2(256) | 8 | log | -| 13 | Easy Division | 96/4 = | 24 | intDivision | -| 14 | Decimal to Binary | Binary of 12= | 1100 | decimalToBinary | -| 15 | Binary to Decimal | 010010100 | 148 | binaryToDecimal | -| 16 | Fraction Division | (5/10)/(5/2) | 1/5 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[2, 6], [6, 6]] = | [[2,6],[6,6]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 20 = | 97.48846085563153 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 30, 30 and 47 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (-8,11),(2,3)= | (-3.0,7.0) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-3x-28 | (x+4)(x-7) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 59 and 50 = | 71 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | 3x + 7y = -61, 6x + 7y = -52 | x = 3, y = -10 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (-10, -6) and (-2, 14) | sqrt(464) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 13 = | 21.40 | pythagoreanTheorem | -| 26 | Linear Equations | -2x + 9y = 16 --15x + 3y = -267 | x = 19, y = 6 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 94 | [2, 47] | primeFactors | -| 28 | Fraction Multiplication | (8/10)*(10/7) | 8/7 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 19 sides | 161.05 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 14 objects picked 8 at a time | 3003 | combinations | -| 31 | Factorial | 5! = | 120 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 9m, 16m, 12m is | 888 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 41m and radius = 11m is | 3593 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 2m, 8m, 14m is | 224 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 43m and radius = 15m is | 30394 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 49m and radius = 2m is | 320 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 31m and radius = 17m is | 9381 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 55 and 82 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 0/4x + 1 and y = 3/5x - 9 | (50/3, 1) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 11 objects picked 0 at a time = | 1 | permutations | -| 43 | Cross Product of 2 Vectors | [16, -20, -19] X [-16, -13, -11] = | [-27, 480, -528] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 6/7 and 8/5? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 7762 dollars, 2% rate of interest and for a time period of 2 years is = | 310.48 | simpleInterest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>18</td><td>-56</td><td>97</td><td>-66</td><td>-25</td><td>55</td><td>-99</td><td>86</td></tr><tr><td>2</td><td>-45</td><td>27</td><td>-87</td><td>-30</td><td>-15</td><td>93</td><td>-62</td></tr><tr><td>83</td><td>-25</td><td>55</td><td>-8</td><td>75</td><td>-34</td><td>-71</td><td>-22</td></tr><tr><td>-75</td><td>94</td><td>-6</td><td>84</td><td>-88</td><td>-38</td><td>60</td><td>98</td></tr><tr><td>20</td><td>-48</td><td>74</td><td>-73</td><td>-81</td><td>-25</td><td>60</td><td>-93</td></tr><tr><td>-23</td><td>-89</td><td>-63</td><td>90</td><td>36</td><td>30</td><td>18</td><td>19</td></tr><tr><td>-21</td><td>15</td><td>89</td><td>35</td><td>-60</td><td>-53</td><td>-85</td><td>22</td></tr><tr><td>-70</td><td>-76</td><td>-37</td><td>-98</td><td>-73</td><td>77</td><td>81</td><td>72</td></tr></table>and<table><tr><td>-14</td><td>13</td></tr><tr><td>-78</td><td>96</td></tr><tr><td>-17</td><td>95</td></tr><tr><td>72</td><td>69</td></tr><tr><td>67</td><td>41</td></tr><tr><td>85</td><td>49</td></tr><tr><td>-64</td><td>38</td></tr><tr><td>36</td><td>-44]] | [[ 10147, -6357] - [-14710, -3435] - [ 5164, 3031] - [ -9570, 5773] - [-17790, -529] - [ 19309, -5824] - [ -2162, 2782] - [ -457, -17793]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 402 upto 2 decimal places is: | 7.38 | CubeRoot | -| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 171 , 62, 4 = | 123 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+159x+79=0 | [-0.89, -1.12] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 18 and 16 = | 2 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 10 = | 27/216 | diceSumProbability | -| 53 | Exponentiation | 5^9 = | 1953125 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [259, 228, 251, 245, 222, 216, 209, 288, 229, 249, 278, 226, 256, 263, 248, 211, 210, 270, 260, 269] with 99% confidence is | (257.86513442744837, 230.83486557255162) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 70^(1/7) _ 61^(1/6) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 16 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610] | fibonacciSeries | -| 57 | Trigonometric Values | What is sin(45)? | 1/√2 | basicTrigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[48, 46, 29, 28, 17, 48, 24, 23, 5, 9, 27, 33, 46, 7, 36] | The Mean is 28.4 , Standard Deviation is 201.97333333333336, Variance is 14.211732242528823 | dataSummary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 19m is | 4536.459791783661 m^2 | surfaceAreaSphereGen | -| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphere | -| 62 | nth Fibonacci number | What is the 85th Fibonacci number? | 259695496911123328 | nthFibonacciNumberGen | -| 63 | Profit or Loss Percent | Loss percent when CP = 937 and SP = 72 is: | 92.31590181430096 | profitLossPercent | -| 64 | Binary to Hexidecimal | 1001111 | 0x4f | binaryToHex | -| 65 | Multiplication of 2 complex numbers | (-3+2j) * (-6+7j) = | (4-33j) | complexNumMultiply | -| 66 | Geometric Progression | For the given GP [6, 24, 96, 384, 1536, 6144] ,Find the value of a,common ratio,9th term value, sum upto 9th term | The value of a is 6, common ratio is 4 , 9th term is 393216 , sum upto 9th term is 524286.0 | geometricprogression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 54 , 80 , 35 , 39 = | (54*80*35*39)^(1/4) = 49.27811645529654 | geometricMean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 2 , 84 , 93 , 16 = | 4/((1/2) + (1/84) + (1/93) + (1/16)) = 6.835767022149303 | harmonicMean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[784.3594765936149, 831.2509235672187, 16.078601582030892, 985.0579481288806, 734.7344412338676, 998.0941258783216, 354.94078353536895, 413.5643355103187, 581.4239813447576, 903.949312712381, 806.494025130463] is: | 2432.1700989717465 | eucldianNorm | -| 70 | Angle between 2 vectors | angle between the vectors [689.0197023764115, 694.8793500248185] and [927.4787145023294, 343.6872076155678] is: | NaN | angleBtwVectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers -23 and 44 = | 67 | absoluteDifference | -| 72 | Dot Product of 2 Vectors | [17, 9, 8] . [18, 9, 4] = | 419 | vectorDot | -| 73 | Binary 2's Complement | 2's complement of 101 = | 11 | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[13, 88, 85], [65, 37, 52], [89, 45, 2]]) is: | Matrix([[-1133/167543, 3649/335086, 1431/335086], [2249/167543, -7539/335086, 4849/335086], [-184/167543, 7247/335086, -5239/335086]]) | invertmatrix | -| 75 | Area of a Sector | Given radius, 6 and angle, 328. Find the area of the sector. | Area of sector = 103.04424 | sectorArea | -| 76 | Mean and Median | Given the series of numbers [55, 61, 83, 85, 52, 78, 30, 58, 76, 37]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 61.5 and Arithmetic median of this series is 59.5 | meanMedian | +| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | # addition | +| 0 | Addition | 16+3= | 19 | subtraction | +| 1 | Subtraction | 96-17= | 79 | multiplication | +| 2 | Multiplication | 48*1= | 48 | multiplicationFunc) | +| 3 | Division | 83/97= | 0.8556701030927835 | division | +| 4 | Binary Complement 1s | 1110110111= | 0001001000 | binaryComplement1s | +| 5 | Modulo Division | 91%53= | 38 | binaryComplement1sFunc) | +| 6 | Square Root | sqrt(64)= | 8 | moduloDivision | +| 7 | Power Rule Differentiation | 6x^7 | 42x^6 | squareRoot | +| 8 | Square | 5^2= | 25 | powerRuleDifferentiation | +| 9 | LCM (Least Common Multiple) | LCM of 20 and 10 = | 20 | "(n*m)x^(m-1)", | +| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 20 = | 4 | powerRuleDifferentiationFunc) | +| 11 | Basic Algebra | 9x + 10 = 10 | 0 | square | +| 12 | Logarithm | log3(3) | 1 | lcm | +| 13 | Easy Division | 399/19 = | 21 | lcmFunc) | +| 14 | Decimal to Binary | Binary of 99= | 1100011 | gcd | +| 15 | Binary to Decimal | 011100 | 28 | "c", gcdFunc) | +| 16 | Fraction Division | (6/8)/(4/7) | 21/16 | basicAlgebra | +| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[3, 3], [6, 3]] = | [[6,6],[12,6]] | basicAlgebraFunc) | +| 18 | Area of Triangle | Area of triangle with side lengths: 11 11 17 = | 59.348020186018 | log | +| 19 | Triangle exists check | Does triangle with sides 23, 29 and 34 exist? | Yes | intDivision | +| 20 | Midpoint of the two point | (0,-20),(14,-16)= | (7.0,-18.0) | decimalToBinary | +| 21 | Factoring Quadratic | x^2-5x-36 | (x-9)(x+4) | DecimalToBinaryFunc) | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 32 and 60 = | 88 | binaryToDecimal | +| 23 | Solve a System of Equations in R^2 | 4x - 6y = 14, -7x - 2y = 88 | x = -10, y = -9 | BinaryToDecimalFunc) | +| 24 | Distance between 2 points | Find the distance between (14, -9) and (12, 13) | sqrt(488) | fractionDivision | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 1 = | 13.04 | divideFractionsFunc) | +| 26 | Linear Equations | -12x + 13y = -22 +-1x + -7y = -18 | x = 4, y = 2 | intMatrix22Multiplication | +| 27 | Prime Factorisation | Find prime factors of 2 | [2] | 17, "k * [[a,b],[c,d]] | +| 28 | Fraction Multiplication | (8/6)*(4/10) | 8/15 | "[[k*a,k*b],[k*c,k*d]]", | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | multiplyIntToMatrix22) | +| 30 | Combinations of Objects | Number of combinations from 15 objects picked 7 at a time | 6435 | areaOfTriangle | +| 31 | Factorial | 3! = | 6 | "Area of Triangle with side lengths a, b, c | +| 32 | Surface Area of Cube | Surface area of cube with side = 14m is | 1176 m^2 | "area", areaOfTriangleFunc) | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 17m, 7m, 10m is | 718 m^2 | doesTriangleExist | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 36m and radius = 7m is | 1891 m^2 | "Does triangle with sides a, b and c exist?", | +| 35 | Volum of Cube | Volume of cube with side = 10m is | 1000 m^3 | "Yes/No", isTriangleValidFunc) | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 20m, 17m, 4m is | 1360 m^3 | midPointOfTwoPoint | +| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 1m is | 40 m^3 | "((X1,Y1),(X2,Y2)) | +| 38 | Surface Area of cone | Surface area of cone with height = 17m and radius = 9m is | 798 m^2 | MidPointOfTwoPointFunc) | +| 39 | Volume of cone | Volume of cone with height = 15m and radius = 5m is | 392 m^3 | factoring | +| 40 | Common Factors | Common Factors of 69 and 51 = | [1, 3] | "(x-x1)(x-x2)", factoringFunc) | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6/3x + 9 and y = 6x + 2 | (7/4, 25/2) | thirdAngleOfTriangle | +| 42 | Permutations | Number of Permutations from 14 objects picked 1 at a time = | 14 | "Third Angle of the triangle | +| 43 | Cross Product of 2 Vectors | [19, 17, -9] X [10, -10, -2] = | [-124, -52, -360] | thirdAngleOfTriangleFunc) | +| 44 | Compare Fractions | Which symbol represents the comparison between 10/6 and 10/8? | > | systemOfEquations | +| 45 | Simple Interest | Simple interest for a principle amount of 7091 dollars, 10% rate of interest and for a time period of 4 years is = | 2836.4 | "2x + 5y | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>2</td><td>8</td><td>-4</td><td>5</td></tr><tr><td>6</td><td>-5</td><td>-6</td><td>4</td></tr></table>and<table><tr><td>-5</td><td>1</td><td>-3</td><td>2</td></tr><tr><td>5</td><td>8</td><td>5</td><td>-5</td></tr><tr><td>-6</td><td>-8</td><td>-6</td><td>-7</td></tr><tr><td>-1</td><td>-5</td><td>3</td><td>-7</td></tr></table> | <table><tr><td>49</td><td>73</td><td>73</td><td>-43</td></tr><tr><td>-23</td><td>-6</td><td>5</td><td>51</td></tr></table> | systemOfEquationsFunc) | +| 47 | Cube Root | cuberoot of 951 upto 2 decimal places is: | 9.83 | distance2Point | +| 48 | Power Rule Integration | 10x^1 + 10x^6 + 1x^4 + 1x^6 | (10/1)x^2 + (10/6)x^7 + (1/4)x^5 + (1/6)x^7 + c | "Find the distance between (x1,y1) and (x2,y2)", | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 15 , 191, 94 = | 60 | "sqrt(distanceSquared)", distanceTwoPointsFunc) | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 48x^2+119x+57=0 | [-0.65, -1.83] | pythagoreanTheorem | +| 51 | HCF (Highest Common Factor) | HCF of 5 and 18 = | 1 | "Pythagorean Theorem", 25, | +| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/6 | "The hypotenuse of a right triangle given the other two lengths a and b | +| 53 | Exponentiation | 17^7 = | 410338673 | "hypotenuse", pythagoreanTheoremFunc) | +| 54 | Confidence interval For sample S | The confidence interval for sample [247, 230, 236, 207, 226, 278, 221, 297, 280, 267, 240, 259, 291, 284, 242, 252, 257, 220, 260, 213, 294] with 90% confidence is | (262.13973862175516, 242.71740423538768) | # This has multiple variables whereas #23 has only x and y | +| 55 | Comparing surds | Fill in the blanks 17^(1/2) _ 3^(1/6) | > | linearEquations | +| 56 | Fibonacci Series | The Fibonacci Series of the first 14 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] | "x | +| 57 | Trigonometric Values | What is sin(90)? | 1 | primeFactors | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 7 sides = | 900 | "[b, c, d, ...]", primeFactorsFunc) | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[10, 47, 7, 37, 22, 44, 9, 30, 37, 8, 50, 29, 19, 12, 37] | The Mean is 26.533333333333335 , Standard Deviation is 214.38222222222217, Variance is 14.641797096744039 | fractionMultiplication | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 6m is | 452.3893421169302 m^2 | "(a/b)*(c/d) | +| 61 | Volume of Sphere | Volume of sphere with radius 54 m = | 659583.6608064842 m^3 | multiplyFractionsFunc) | +| 62 | nth Fibonacci number | What is the 5th Fibonacci number? | 5 | angleRegularPolygon | +| 63 | Profit or Loss Percent | Loss percent when CP = 801 and SP = 230 is: | 71.28589263420724 | "Angle of a Regular Polygon", 29, | +| 64 | Binary to Hexidecimal | 101111 | 0x2f | "Find the angle of a regular polygon with 6 sides", "120", | +| 65 | Multiplication of 2 complex numbers | (1+19j) * (-5+10j) = | (-195-85j) | regularPolygonAngleFunc) | +| 66 | Geometric Progression | For the given GP [8, 88, 968, 10648, 117128, 1288408] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 8, common ratio is 11 , 11th term is 207499396808 , sum upto 8th term is 171487104.0 | combinations | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 9 and 18 = | (9*18)^(1/2) = 12.727922061357855 | "Combinations of Objects", 30, | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 59 and 8 = | 2/((1/59) + (1/8)) = 14.08955223880597 | "Combinations available for picking 4 objects at a time from 6 distinct objects | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[868.2223524505417, 443.64852085459694, 828.1090462421802] is: | 1279.217986044348 | " 15", combinationsFunc) | +| 70 | Angle between 2 vectors | angle between the vectors [47.34750277983446, 802.0548522330859, 163.10760759590525, 544.7736923139344, 595.2668887448631, 781.8577226989729, 505.92984665962115, 212.21898772758718, 417.09503653850567, 498.8451357914803, 216.11050052884383, 316.85172611004697, 531.4467890864679] and [551.4845648456056, 524.0267675199452, 252.30514761182056, 256.4954536977715, 423.09002486817883, 861.6683390714214, 210.90265341510906, 918.3205871874211, 539.9315722140092, 988.4812675617247, 885.1803007416202, 566.6430154592439, 851.2210274645834] is: | NaN | factorial | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 51 and 3 = | 48 | surfaceAreaCubeGen | +| 72 | Dot Product of 2 Vectors | [4, 20, 12] . [15, 11, 9] = | 388 | "Surface area of cube with side a units is", | +| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | "b units^2", surfaceAreaCube) | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[2, 25, 60], [29, 30, 28], [23, 73, 95]]) is: | Matrix([[806/34457, 2005/34457, -1100/34457], [-2111/34457, -1190/34457, 1684/34457], [1427/34457, 429/34457, -665/34457]]) | surfaceAreaCuboidGen | +| 75 | Area of a Sector | Given radius, 28 and angle, 317. Find the area of the sector. | Area of sector = 2168.81594 | "Surface Area of Cuboid", 33, | +| 76 | Mean and Median | Given the series of numbers [67, 33, 40, 90, 81, 12, 91, 80, 5, 66]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 56.5 and Arithmetic median of this series is 66.5 | "Surface area of cuboid with sides | +| 77 | Determinant to 2x2 Matrix | Det([[10, 0], [95, 32]]) = | 320 | "d units^2", surfaceAreaCuboid) | +| 78 | Compound Interest | Compound Interest for a principle amount of 4156 dollars, 8% rate of interest and for a time period of 7 compounded monthly is = | 4156.0 | surfaceAreaCylinderGen | +| 79 | Decimal to Hexadecimal | Binary of 143= | 0x8f | "Surface Area of Cylinder", 34, | +| 80 | Percentage of a number | What is 49% of 13? | Required percentage = 6.37% | "Surface area of cylinder with height | +| 81 | Celsius To Fahrenheit | Convert 39 degrees Celsius to degrees Fahrenheit = | 102.2 | "c units^2", surfaceAreaCylinder) | diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index f679b0c..c5937db 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -23,8 +23,8 @@ class Generator: self.id ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) # || Non-generator Functions From ddc42a5638cce8d1df020a0909ff6a45d88c6b2c Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:44:41 +0530 Subject: [PATCH 42/99] Split AP into 2 funcs and reorganized --- mathgenerator/funcs/__init__.py | 2 ++ mathgenerator/funcs/arithmeticProgressionSumFunc.py | 1 + mathgenerator/funcs/arithmeticProgressionTermFunc.py | 3 ++- mathgenerator/mathgen.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 83702eb..bf9803e 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -84,3 +84,5 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * +from .arithmeticProgressionSumFunc import * +from .arithmeticProgressionTermFunc import * diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index ca2ada3..d7e5589 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,5 +1,6 @@ from .__init__ import * + def arithmeticProgressionSumFunc (maxd = 100, maxa = 100, maxn = 100): d = random.randint (-1 * maxd, maxd) a1 = random.randint (-1 * maxa, maxa) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index f6662d5..9905b2b 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,5 +1,6 @@ from .__init__ import * + def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): d = random.randint (-1 * maxd, maxd) a1 = random.randint (-1 * maxa, maxa) @@ -9,4 +10,4 @@ def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString solution = a1 + ((n-1)*d) - return problen, solution + return problem, solution diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index f9ef504..1e9b4d7 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -275,4 +275,4 @@ arithmeticProgressionTerm = Generator ("AP Term Calculation", 82, arithmeticProgressionSum = Generator ("AP Sum Calculation", 83, "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) \ No newline at end of file + "Sum", arithmeticProgressionSumFunc) From a9c4249273eb72122add03fc04a7aff47366e1d0 Mon Sep 17 00:00:00 2001 From: D-T-666 <tabatadzedima20@gamil.com> Date: Mon, 19 Oct 2020 23:19:11 +0400 Subject: [PATCH 43/99] =?UTF-8?q?=E2=AC=9C=E2=AC=9C=20whitespace=20?= =?UTF-8?q?=E2=AC=9C=E2=AC=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 6 +++--- mathgenerator/funcs/euclidianNormFunc.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9414a0b..e5dca74 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IGNORE_ERRORS = E501,F401,F403,F405 PKG = mathgenerator format: - python -m autopep8 --ignore=$(IGNORE_ERRORS) -i $(PKG)/* + python -m autopep8 --ignore=$(IGNORE_ERRORS) -ir $(PKG)/* lint: python -m flake8 --ignore=$(IGNORE_ERRORS) $(PKG) diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index b02b496..927ca38 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -3,18 +3,18 @@ from .__init__ import * def angleBtwVectorsFunc(maxEltAmt=20): s = 0 - v1 = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + v1 = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] v2 = [random.uniform(0, 1000) for i in v1] for i in v1: for j in v2: s += i * j - mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) problem = f"angle between the vectors {v1} and {v2} is:" solution = '' try: solution = str(math.acos(s / mags)) - except: + except MathDomainError: print('angleBtwVectorsFunc has some issues with math module, line 16') solution = 'NaN' # would return the answer in radians diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index 6a414a9..28c85c5 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -2,7 +2,7 @@ from .__init__ import * def euclidianNormFunc(maxEltAmt=20): - vec = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + vec = [random.uniform(0, 1000) for i in range(random.randint(2, maxEltAmt))] problem = f"Euclidian norm or L2 norm of the vector{vec} is:" solution = math.sqrt(sum([i**2 for i in vec])) return problem, solution From da48b28397f8e5cb23536db66c9a67264b8574b1 Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:51:54 +0530 Subject: [PATCH 44/99] linting improved --- .../funcs/arithmeticProgressionSumFunc.py | 15 ++++++++------- .../funcs/arithmeticProgressionTermFunc.py | 12 ++++++------ mathgenerator/mathgen.py | 12 ++++++------ 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index d7e5589..950f7c1 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,13 +1,14 @@ from .__init__ import * -def arithmeticProgressionSumFunc (maxd = 100, maxa = 100, maxn = 100): - d = random.randint (-1 * maxd, maxd) - a1 = random.randint (-1 * maxa, maxa) +def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) a2 = a1 + d a3 = a2 + d - n = random.randint (4, maxn) - apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString - solution = n * ((2*a1) + ((n-1)*d))/2 - return problem, solution \ No newline at end of file + solution = n * ((2 * a1) + ((n-1) * d)) / 2 + return problem, solution + \ No newline at end of file diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index 9905b2b..cba850d 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,13 +1,13 @@ from .__init__ import * -def arithmeticProgressionTermFunc (maxd = 100, maxa = 100, maxn = 100): - d = random.randint (-1 * maxd, maxd) - a1 = random.randint (-1 * maxa, maxa) +def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): + d = random.randint(-1 * maxd, maxd) + a1 = random.randint(-1 * maxa, maxa) a2 = a1 + d a3 = a2 + d - n = random.randint (4, maxn) - apString = str(a1) +', ' + str(a2) +', ' + str(a3) + ' ... ' + n = random.randint(4, maxn) + apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' 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 diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 1e9b4d7..7df376f 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -269,10 +269,10 @@ 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) -arithmeticProgressionTerm = Generator ("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ..." , - "a-n", arithmeticProgressionTermFunc) +arithmeticProgressionTerm = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) -arithmeticProgressionSum = Generator ("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) +arithmeticProgressionSum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) From d95dd5e29c76561b35d5d18ab249d237d7a927e2 Mon Sep 17 00:00:00 2001 From: Anshita <anshita_b@yahoo.co.in> Date: Tue, 20 Oct 2020 00:55:15 +0530 Subject: [PATCH 45/99] linting improved v2 --- mathgenerator/funcs/arithmeticProgressionSumFunc.py | 3 +-- mathgenerator/funcs/arithmeticProgressionTermFunc.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index 950f7c1..517d713 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -9,6 +9,5 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): n = random.randint(4, maxn) apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' 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 - \ No newline at end of file diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index cba850d..63cca09 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -9,5 +9,5 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): n = random.randint(4, maxn) apString = str(a1) + ', ' + str(a2) + ', ' + str(a3) + ' ... ' 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 From 630032fcddc117f9f02ab9a4b302dbf69207577c Mon Sep 17 00:00:00 2001 From: Metropass <moho472@gmail.com> Date: Mon, 19 Oct 2020 15:49:11 -0400 Subject: [PATCH 46/99] Added DecimalToOctal, and DecimalToRomanNumerals --- README.md | 2 ++ mathgenerator/funcs/__init__.py | 1 + mathgenerator/mathgen.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/README.md b/README.md index f2d81dc..5b9bcff 100644 --- a/README.md +++ b/README.md @@ -104,3 +104,5 @@ problem, solution = mathgen.genById(0) | 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | | 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | | 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +| 82 | Decimal to Octal Conversion | What's the octal representation of 98? | 0o142 | decimalToOctalFunc | +| 83 | Decimal to Roman Numerals | What's the Roman Numeral representation of 3805? | MMMDCCCV | decimalToRomanNumeralsFunc diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 83702eb..25e3968 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -84,3 +84,4 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * +from .decimaltoOctalFunc import * diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index f679b0c..8a26906 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -268,3 +268,5 @@ decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", 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) +decimalToOctal = Generator("Converts decimal to octal", 82, "What's the octal representation of 98?", "0o142", decimalToOctalFunc) +decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", 83, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) From a37d49e877cedb1fe01caab01f282701ce3460ba Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 01:20:08 +0530 Subject: [PATCH 47/99] Update __init__.py resolved conflicts --- mathgenerator/funcs/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 5a14293..31ad609 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -81,5 +81,7 @@ from .sectorAreaFunc import* from .meanMedianFunc import* from .determinantToMatrix22 import * from .deciToHexaFunc import * +from .percentageFunc import * +from .celsiustofahrenheit import * from .degreeToRadFunc import * from .radianToDegFunc import * From 4be7251a45abf531c6fe02747618681bea05a719 Mon Sep 17 00:00:00 2001 From: Metropass <moho472@gmail.com> Date: Mon, 19 Oct 2020 15:54:37 -0400 Subject: [PATCH 48/99] Fixed spelling on __init__.py --- mathgenerator/funcs/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 25e3968..8600076 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -84,4 +84,5 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * -from .decimaltoOctalFunc import * +from .decimalToOctalFunc import * +from .decimalToRomanNumeralsFunc import * From 429ea62518f611bbe0c60c1bd479b4c0d9b08602 Mon Sep 17 00:00:00 2001 From: Metropass <moho472@gmail.com> Date: Mon, 19 Oct 2020 16:00:46 -0400 Subject: [PATCH 49/99] Added untracked files into repo --- mathgenerator/funcs/decimalToOctalFunc.py | 9 +++++++ .../funcs/decimalToRomanNumeralsFunc.py | 26 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 mathgenerator/funcs/decimalToOctalFunc.py create mode 100644 mathgenerator/funcs/decimalToRomanNumeralsFunc.py diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py new file mode 100644 index 0000000..3981cc4 --- /dev/null +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -0,0 +1,9 @@ +from .__init__ import * + + +#converts decimal into octal +def decimalToOctalFunc(maxDecimal = 4096): + x = random.randint(0, maxDecimal) + problem = "The decimal number " + str(x) + " in Octal is: " + solution = oct(x) + return problem, solution diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py new file mode 100644 index 0000000..57d3898 --- /dev/null +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -0,0 +1,26 @@ +from .__init__ import * + + +#converts decimal to roman numerals +def decimalToRomanNumeralsFunc(maxDecimal = 4000): + x = random.randint(0, maxDecimal) + problem = "The number " + str(x) + " in Roman Numerals is: " + roman_dict = {1:"I", 5:"V", 10: "X", 50:"L", 100:"C", 500:"D", 1000: "M"} + divisor = 1 + while x >= divisor: + divisor *= 10 + divisor /= 10 + solution = "" + while x: + last_value = int(x/divisor) + if last_value <= 3: + solution += (roman_dict[divisor] * last_value) + elif last_value == 4: + solution += (roman_dict[divisor] * roman_dict[divisor*5]) + elif 5 <= last_value <= 8: + solution += (roman_dict[divisor * 5] + (roman_dict[divisor] * (last_value - 5))) + elif last_value == 9: + solution += (roman_dict[divisor] + roman_dict[divisor * 10]) + x = math.floor(x % divisor) + divisor /= 10 + return problem, solution From d19d1de443f3e5db178e867d7061b144a6c16f85 Mon Sep 17 00:00:00 2001 From: Metropass <moho472@gmail.com> Date: Mon, 19 Oct 2020 16:04:53 -0400 Subject: [PATCH 50/99] Fixed Lint Formatting --- mathgenerator/funcs/decimalToOctalFunc.py | 4 ++-- mathgenerator/funcs/decimalToRomanNumeralsFunc.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py index 3981cc4..e24b796 100644 --- a/mathgenerator/funcs/decimalToOctalFunc.py +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -1,8 +1,8 @@ from .__init__ import * -#converts decimal into octal -def decimalToOctalFunc(maxDecimal = 4096): + +def decimalToOctalFunc(maxDecimal=4096): x = random.randint(0, maxDecimal) problem = "The decimal number " + str(x) + " in Octal is: " solution = oct(x) diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py index 57d3898..3d2904e 100644 --- a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -1,22 +1,22 @@ from .__init__ import * -#converts decimal to roman numerals -def decimalToRomanNumeralsFunc(maxDecimal = 4000): + +def decimalToRomanNumeralsFunc(maxDecimal=4000): x = random.randint(0, maxDecimal) problem = "The number " + str(x) + " in Roman Numerals is: " - roman_dict = {1:"I", 5:"V", 10: "X", 50:"L", 100:"C", 500:"D", 1000: "M"} + roman_dict = {1: "I", 5: "V", 10: "X", 50: "L", 100: "C", 500: "D", 1000: "M"} divisor = 1 while x >= divisor: divisor *= 10 divisor /= 10 solution = "" while x: - last_value = int(x/divisor) + last_value = int(x / divisor) if last_value <= 3: solution += (roman_dict[divisor] * last_value) elif last_value == 4: - solution += (roman_dict[divisor] * roman_dict[divisor*5]) + solution += (roman_dict[divisor] * roman_dict[divisor * 5]) elif 5 <= last_value <= 8: solution += (roman_dict[divisor * 5] + (roman_dict[divisor] * (last_value - 5))) elif last_value == 9: From d0734fc7e9b74fc5da1b9cc734a0fe81179454b9 Mon Sep 17 00:00:00 2001 From: Metropass <moho472@gmail.com> Date: Mon, 19 Oct 2020 16:06:44 -0400 Subject: [PATCH 51/99] Fixed Extra Lines for Lint --- mathgenerator/funcs/decimalToOctalFunc.py | 1 - mathgenerator/funcs/decimalToRomanNumeralsFunc.py | 1 - 2 files changed, 2 deletions(-) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py index e24b796..64bbae4 100644 --- a/mathgenerator/funcs/decimalToOctalFunc.py +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -1,7 +1,6 @@ from .__init__ import * - def decimalToOctalFunc(maxDecimal=4096): x = random.randint(0, maxDecimal) problem = "The decimal number " + str(x) + " in Octal is: " diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py index 3d2904e..c7183c3 100644 --- a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -1,7 +1,6 @@ from .__init__ import * - def decimalToRomanNumeralsFunc(maxDecimal=4000): x = random.randint(0, maxDecimal) problem = "The number " + str(x) + " in Roman Numerals is: " From 5f2a5ab2366f655d77d9e8e0321e4f2edd34f325 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 19:22:51 -0400 Subject: [PATCH 52/99] import generator in each module --- mathgenerator/funcs/BinaryToDecimalFunc.py | 1 + mathgenerator/funcs/DecimalToBinaryFunc.py | 1 + mathgenerator/funcs/DiceSumProbFunc.py | 1 + mathgenerator/funcs/MidPointOfTwoPointFunc.py | 1 + mathgenerator/funcs/absoluteDifferenceFunc.py | 1 + mathgenerator/funcs/angleBtwVectorsFunc.py | 1 + mathgenerator/funcs/areaOfTriangleFunc.py | 1 + mathgenerator/funcs/arithmeticProgressionSumFunc.py | 1 + mathgenerator/funcs/arithmeticProgressionTermFunc.py | 1 + mathgenerator/funcs/basicAlgebraFunc.py | 1 + mathgenerator/funcs/basicTrigonometryFunc.py | 1 + mathgenerator/funcs/binary2sComplement.py | 1 + mathgenerator/funcs/binaryComplement1sFunc.py | 1 + mathgenerator/funcs/binaryToHexFunc.py | 1 + mathgenerator/funcs/combinationsFunc.py | 1 + mathgenerator/funcs/commonFactorsFunc.py | 1 + mathgenerator/funcs/compareFractionsFunc.py | 1 + mathgenerator/funcs/compoundInterestFunc.py | 1 + mathgenerator/funcs/confidenceIntervalFunc.py | 1 + mathgenerator/funcs/cubeRootFunc.py | 1 + mathgenerator/funcs/dataSummaryFunc.py | 1 + mathgenerator/funcs/deciToHexaFunc.py | 1 + mathgenerator/funcs/determinantToMatrix22.py | 1 + mathgenerator/funcs/distanceTwoPointsFunc.py | 1 + mathgenerator/funcs/divideFractionsFunc.py | 1 + mathgenerator/funcs/divisionFunc.py | 1 + mathgenerator/funcs/divisionToIntFunc.py | 1 + mathgenerator/funcs/euclidianNormFunc.py | 1 + mathgenerator/funcs/exponentiationFunc.py | 1 + mathgenerator/funcs/factorialFunc.py | 1 + mathgenerator/funcs/factoringFunc.py | 1 + mathgenerator/funcs/fibonacciSeriesFunc.py | 1 + mathgenerator/funcs/fourthAngleOfQuadriFunc.py | 1 + mathgenerator/funcs/gcdFunc.py | 1 + mathgenerator/funcs/geomProgrFunc.py | 1 + mathgenerator/funcs/geometricMeanFunc.py | 1 + mathgenerator/funcs/harmonicMeanFunc.py | 1 + mathgenerator/funcs/hcfFunc.py | 1 + mathgenerator/funcs/intersectionOfTwoLinesFunc.py | 1 + mathgenerator/funcs/isTriangleValidFunc.py | 1 + mathgenerator/funcs/lcmFunc.py | 1 + mathgenerator/funcs/linearEquationsFunc.py | 1 + mathgenerator/funcs/logFunc.py | 1 + mathgenerator/funcs/matrixInversion.py | 1 + mathgenerator/funcs/matrixMultiplicationFunc.py | 1 + mathgenerator/funcs/meanMedianFunc.py | 1 + mathgenerator/funcs/moduloFunc.py | 1 + mathgenerator/funcs/multiplicationFunc.py | 1 + mathgenerator/funcs/multiplyComplexNumbersFunc.py | 1 + mathgenerator/funcs/multiplyFractionsFunc.py | 1 + mathgenerator/funcs/multiplyIntToMatrix22.py | 1 + mathgenerator/funcs/nthFibonacciNumberFunc.py | 1 + mathgenerator/funcs/percentageFunc.py | 1 + mathgenerator/funcs/permutationFunc.py | 1 + mathgenerator/funcs/powerRuleDifferentiationFunc.py | 1 + mathgenerator/funcs/powerRuleIntegrationFunc.py | 1 + mathgenerator/funcs/primeFactorsFunc.py | 1 + mathgenerator/funcs/profitLossPercentFunc.py | 1 + mathgenerator/funcs/pythagoreanTheoremFunc.py | 1 + mathgenerator/funcs/quadraticEquation.py | 1 + mathgenerator/funcs/regularPolygonAngleFunc.py | 1 + mathgenerator/funcs/sectorAreaFunc.py | 1 + mathgenerator/funcs/simpleInterestFunc.py | 1 + mathgenerator/funcs/squareFunc.py | 1 + mathgenerator/funcs/squareRootFunc.py | 1 + mathgenerator/funcs/subtractionFunc.py | 1 + mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py | 1 + mathgenerator/funcs/surdsComparisonFunc.py | 1 + mathgenerator/funcs/surfaceAreaCone.py | 1 + mathgenerator/funcs/surfaceAreaCube.py | 1 + mathgenerator/funcs/surfaceAreaCuboid.py | 1 + mathgenerator/funcs/surfaceAreaCylinder.py | 1 + mathgenerator/funcs/surfaceAreaSphere.py | 1 + mathgenerator/funcs/systemOfEquationsFunc.py | 1 + mathgenerator/funcs/thirdAngleOfTriangleFunc.py | 1 + mathgenerator/funcs/vectorCrossFunc.py | 1 + mathgenerator/funcs/vectorDotFunc.py | 1 + mathgenerator/funcs/volumeCone.py | 1 + mathgenerator/funcs/volumeCube.py | 1 + mathgenerator/funcs/volumeCuboid.py | 1 + mathgenerator/funcs/volumeCylinder.py | 1 + mathgenerator/funcs/volumeSphereFunc.py | 1 + 82 files changed, 82 insertions(+) diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index 9d2b25d..f975ded 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def BinaryToDecimalFunc(max_dig=10): diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 872e105..2baaeeb 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DecimalToBinaryFunc(max_dec=99): diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 8f05a4f..0bb00c9 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def DiceSumProbFunc(maxDice=3): diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index f8cd8a1..98d91b0 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def MidPointOfTwoPointFunc(maxValue=20): diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 138c8de..065e6a6 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index 927ca38..6e45eeb 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def angleBtwVectorsFunc(maxEltAmt=20): diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index a795a99..6d4ee66 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index 517d713..b441d16 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index 63cca09..ff67f60 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index d11000d..0060883 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 520b8a3..2a6f5ce 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator # Handles degrees in quadrant one diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 01af731..6fe00f8 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index 009feea..dcc9796 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index f06fcfc..0523f8d 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def binaryToHexFunc(max_dig=10): diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index f213222..e0c7078 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def combinationsFunc(maxlength=20): diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index 82a0e3b..eab088f 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def commonFactorsFunc(maxVal=100): diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index 1c4072a..c681d49 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def compareFractionsFunc(maxVal=10): diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 7914828..964bfb1 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def compoundInterestFunc(maxPrinciple=10000, diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index b631caf..8f7abc5 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def confidenceIntervalFunc(): diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cubeRootFunc.py index 97b978d..a2e7ebf 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cubeRootFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def cubeRootFunc(minNo=1, maxNo=1000): diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index 1059b1f..275d372 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def dataSummaryFunc(number_values=15, minval=5, maxval=50): diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/deciToHexaFunc.py index 5958dfa..3b76371 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/deciToHexaFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def deciToHexaFunc(max_dec=1000): diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index 33b4004..2d9c40e 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def determinantToMatrix22(maxMatrixVal=100): diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 9fa85c8..6e447e3 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 970b28f..19432f7 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divideFractionsFunc(maxVal=10): diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index 930e34b..da1fa47 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionFunc(maxRes=99, maxDivid=99): diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index fcc62f5..959d322 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def divisionToIntFunc(maxA=25, maxB=25): diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index 28c85c5..7e14f26 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def euclidianNormFunc(maxEltAmt=20): diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index a74f378..6201b4f 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def exponentiationFunc(maxBase=20, maxExpo=10): diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index 71dc3a2..e242159 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factorialFunc(maxInput=6): diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index 1cb43c0..3858ef0 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def factoringFunc(range_x1=10, range_x2=10): diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index 60391cb..e668f46 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fibonacciSeriesFunc(minNo=1): diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index 59a05c4..5307746 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def fourthAngleOfQuadriFunc(maxAngle=180): diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcdFunc.py index 505c7fb..c087db6 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcdFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def gcdFunc(maxVal=20): diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index 7c80a7e..f638c8a 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geomProgrFunc(number_values=6, diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 0980979..11085fa 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def geometricMeanFunc(maxValue=100, maxNum=4): diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 8aefb41..22e6a86 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def harmonicMeanFunc(maxValue=100, maxNum=4): diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 047fb0c..8faa555 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def hcfFunc(maxVal=20): diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index eda508e..829f8e3 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def intersectionOfTwoLinesFunc(minM=-10, diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index 13c7240..d662e4e 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index 32e1868..bf3b93f 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def lcmFunc(maxVal=20): diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index e2eeb26..b7fed0e 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def linearEquationsFunc(n=2, varRange=20, coeffRange=20): diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 6fc651b..96c611a 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def logFunc(maxBase=3, maxVal=8): diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 72c01ca..366207f 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator import sympy diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index 3b1f20b..7190265 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def matrixMultiplicationFunc(maxVal=100, max_dim=10): diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 4b17846..5eb954a 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def meanMedianFunc(maxlen=10): diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 2a447c4..9cf3a3b 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def moduloFunc(maxRes=99, maxModulo=99): diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 8ad25f6..017b5cd 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index f1842c2..63f0280 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index 1ec38bb..a71c5c9 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyFractionsFunc(maxVal=10): diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index 7808afe..e96d595 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index b7475ee..bcbc784 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def nthFibonacciNumberFunc(maxN=100): diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index f064f2a..eeba61f 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def percentageFunc(maxValue=99, maxpercentage=99): diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index c62841f..6ef5670 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def permutationFunc(maxlength=20): diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index a14bd90..774a80d 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index fb1f62d..25a3861 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 852821c..71fa1d0 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def primeFactorsFunc(minVal=1, maxVal=200): diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index da99f94..7a6fd9e 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def profitLossPercentFunc(maxCP=1000, maxSP=1000): diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 17bcd82..2e9c2e3 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def pythagoreanTheoremFunc(maxLength=20): diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index 7f784fc..c862ae0 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def quadraticEquation(maxVal=100): diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index 5275bef..d8d308a 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index c2ab0bf..4785557 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sectorAreaFunc(maxRadius=49, maxAngle=359): diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index 30ca938..aa5aae2 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 1d159dc..78c55e0 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareFunc(maxSquareNum=20): diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index e5d2418..2c09168 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def squareRootFunc(minNo=1, maxNo=12): diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index a50537e..ecac4e5 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def subtractionFunc(maxMinuend=99, maxDiff=99): diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 8338698..9e7ff89 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def sumOfAnglesOfPolygonFunc(maxSides=12): diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index e005d3f..4ee3e30 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surdsComparisonFunc(maxValue=100, maxRoot=10): diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index 53799aa..d8cb21c 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surfaceAreaCube.py index 9f9d07f..2452a05 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surfaceAreaCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index 95fee71..f1b8205 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index eacc0be..8a218dc 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 6b9110d..664e9f8 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index ef63c73..84bf2c7 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 5268ceb..9a8cbc6 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 7506283..78cb99b 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 011beb3..871011a 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index c237bca..f965024 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index 6a52da4..1efb25f 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index b0a2490..ea55e42 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index 38dfd64..39ab091 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 1f94c7f..0a33b82 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -1,4 +1,5 @@ from .__init__ import * +from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): From 84cb84a21cd915eb36ef57af323516628c38dbde Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 20:33:18 -0400 Subject: [PATCH 53/99] Out of order but localized --- mathgenerator/funcs/BinaryToDecimalFunc.py | 4 + mathgenerator/funcs/DecimalToBinaryFunc.py | 4 + mathgenerator/funcs/DiceSumProbFunc.py | 6 + mathgenerator/funcs/MidPointOfTwoPointFunc.py | 5 + mathgenerator/funcs/absoluteDifferenceFunc.py | 6 + mathgenerator/funcs/angleBtwVectorsFunc.py | 6 + mathgenerator/funcs/areaOfTriangleFunc.py | 5 + .../funcs/arithmeticProgressionSumFunc.py | 5 + .../funcs/arithmeticProgressionTermFunc.py | 5 + mathgenerator/funcs/basicAlgebraFunc.py | 4 + mathgenerator/funcs/basicTrigonometryFunc.py | 4 + mathgenerator/funcs/binary2sComplement.py | 5 + mathgenerator/funcs/binaryComplement1sFunc.py | 4 + mathgenerator/funcs/binaryToHexFunc.py | 4 + mathgenerator/funcs/combinationsFunc.py | 6 + mathgenerator/funcs/commonFactorsFunc.py | 5 + mathgenerator/funcs/compareFractionsFunc.py | 6 + mathgenerator/funcs/compoundInterestFunc.py | 6 + mathgenerator/funcs/confidenceIntervalFunc.py | 5 + mathgenerator/funcs/cubeRootFunc.py | 4 + mathgenerator/funcs/dataSummaryFunc.py | 4 + mathgenerator/funcs/deciToHexaFunc.py | 4 + mathgenerator/funcs/determinantToMatrix22.py | 5 + mathgenerator/funcs/distanceTwoPointsFunc.py | 5 + mathgenerator/funcs/divideFractionsFunc.py | 4 + mathgenerator/funcs/divisionFunc.py | 3 + mathgenerator/funcs/divisionToIntFunc.py | 3 + mathgenerator/funcs/euclidianNormFunc.py | 5 + mathgenerator/funcs/exponentiationFunc.py | 4 + mathgenerator/funcs/factorialFunc.py | 3 + mathgenerator/funcs/factoringFunc.py | 4 + mathgenerator/funcs/fibonacciSeriesFunc.py | 5 + .../funcs/fourthAngleOfQuadriFunc.py | 6 + mathgenerator/funcs/gcdFunc.py | 4 + mathgenerator/funcs/geomProgrFunc.py | 6 + mathgenerator/funcs/geometricMeanFunc.py | 5 + mathgenerator/funcs/harmonicMeanFunc.py | 6 + mathgenerator/funcs/hcfFunc.py | 4 + .../funcs/intersectionOfTwoLinesFunc.py | 6 + mathgenerator/funcs/isTriangleValidFunc.py | 5 + mathgenerator/funcs/lcmFunc.py | 4 + mathgenerator/funcs/linearEquationsFunc.py | 4 + mathgenerator/funcs/logFunc.py | 3 + mathgenerator/funcs/matrixInversion.py | 4 + .../funcs/matrixMultiplicationFunc.py | 5 + mathgenerator/funcs/meanMedianFunc.py | 5 + mathgenerator/funcs/moduloFunc.py | 3 + mathgenerator/funcs/multiplicationFunc.py | 4 + .../funcs/multiplyComplexNumbersFunc.py | 5 + mathgenerator/funcs/multiplyFractionsFunc.py | 5 + mathgenerator/funcs/multiplyIntToMatrix22.py | 6 + mathgenerator/funcs/nthFibonacciNumberFunc.py | 5 + mathgenerator/funcs/percentageFunc.py | 4 + mathgenerator/funcs/permutationFunc.py | 6 + .../funcs/powerRuleDifferentiationFunc.py | 5 + .../funcs/powerRuleIntegrationFunc.py | 4 + mathgenerator/funcs/primeFactorsFunc.py | 4 + mathgenerator/funcs/profitLossPercentFunc.py | 6 + mathgenerator/funcs/pythagoreanTheoremFunc.py | 6 + mathgenerator/funcs/quadraticEquation.py | 6 + .../funcs/regularPolygonAngleFunc.py | 6 + mathgenerator/funcs/sectorAreaFunc.py | 5 + mathgenerator/funcs/simpleInterestFunc.py | 6 + mathgenerator/funcs/squareFunc.py | 3 + mathgenerator/funcs/squareRootFunc.py | 3 + mathgenerator/funcs/subtractionFunc.py | 3 + .../funcs/sumOfAnglesOfPolygonFunc.py | 5 + mathgenerator/funcs/surdsComparisonFunc.py | 5 + mathgenerator/funcs/surfaceAreaCone.py | 6 + mathgenerator/funcs/surfaceAreaCube.py | 5 + mathgenerator/funcs/surfaceAreaCuboid.py | 6 + mathgenerator/funcs/surfaceAreaCylinder.py | 6 + mathgenerator/funcs/surfaceAreaSphere.py | 6 + mathgenerator/funcs/systemOfEquationsFunc.py | 5 + .../funcs/thirdAngleOfTriangleFunc.py | 5 + mathgenerator/funcs/vectorCrossFunc.py | 4 + mathgenerator/funcs/vectorDotFunc.py | 4 + mathgenerator/funcs/volumeCone.py | 6 + mathgenerator/funcs/volumeCube.py | 5 + mathgenerator/funcs/volumeCuboid.py | 6 + mathgenerator/funcs/volumeCylinder.py | 6 + mathgenerator/funcs/volumeSphereFunc.py | 5 + mathgenerator/mathgen.py | 241 ------------------ 83 files changed, 395 insertions(+), 241 deletions(-) diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/BinaryToDecimalFunc.py index f975ded..01fb780 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/BinaryToDecimalFunc.py @@ -11,3 +11,7 @@ def BinaryToDecimalFunc(max_dig=10): solution = int(problem, 2) return problem, solution + + +binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + BinaryToDecimalFunc) diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/DecimalToBinaryFunc.py index 2baaeeb..a2aa043 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/DecimalToBinaryFunc.py @@ -10,3 +10,7 @@ def DecimalToBinaryFunc(max_dec=99): solution = str(b) return problem, solution + + +decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", + DecimalToBinaryFunc) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/DiceSumProbFunc.py index 0bb00c9..720490e 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/DiceSumProbFunc.py @@ -25,3 +25,9 @@ def DiceSumProbFunc(maxDice=3): a, b) solution = "{}/{}".format(count, 6**a) return problem, solution + + +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) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/MidPointOfTwoPointFunc.py index 98d91b0..1a126b2 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/MidPointOfTwoPointFunc.py @@ -11,3 +11,8 @@ def MidPointOfTwoPointFunc(maxValue=20): problem = f"({x1},{y1}),({x2},{y2})=" solution = f"({(x1+x2)/2},{(y1+y2)/2})" return problem, solution + + +midPointOfTwoPoint = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absoluteDifferenceFunc.py index 065e6a6..755e049 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absoluteDifferenceFunc.py @@ -11,3 +11,9 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): str(a) + " and " + str(b) + " = " solution = absDiff return problem, solution + + +absoluteDifference = Generator( + "Absolute difference between two numbers", 71, + "Absolute difference betweeen two numbers a and b =", "|a-b|", + absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index 6e45eeb..65ec973 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -20,3 +20,9 @@ def angleBtwVectorsFunc(maxEltAmt=20): solution = 'NaN' # would return the answer in radians return problem, solution + + +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) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/areaOfTriangleFunc.py index 6d4ee66..c49167c 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/areaOfTriangleFunc.py @@ -14,3 +14,8 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): str(a) + " " + str(b) + " " + str(c) + " = " solution = area return problem, solution + + +areaOfTriangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmeticProgressionSumFunc.py index b441d16..294cb7f 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionSumFunc.py @@ -12,3 +12,8 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): problem = 'Find the sum of first ' + str(n) + ' terms of the AP series: ' + apString solution = n * ((2 * a1) + ((n - 1) * d)) / 2 return problem, solution + + +arithmeticProgressionSum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmeticProgressionTermFunc.py index ff67f60..e549c18 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmeticProgressionTermFunc.py @@ -12,3 +12,8 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): problem = 'Find the term number ' + str(n) + ' of the AP series: ' + apString solution = a1 + ((n - 1) * d) return problem, solution + + +arithmeticProgressionTerm = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basicAlgebraFunc.py index 0060883..504ac41 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basicAlgebraFunc.py @@ -24,3 +24,7 @@ def basicAlgebraFunc(maxVariable=10): problem = f"{a}x + {b} = {c}" solution = x return problem, solution + + +basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basicTrigonometryFunc.py index 2a6f5ce..da6d97c 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basicTrigonometryFunc.py @@ -24,3 +24,7 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], solution = result_fraction_map[round(eval(expression), 2)] if round( eval(expression), 2) <= 99999 else "∞" # for handling the ∞ condition return problem, solution + + +basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary2sComplement.py index 6fe00f8..891990d 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary2sComplement.py @@ -27,3 +27,8 @@ def binary2sComplementFunc(maxDigits=10): problem = "2's complement of " + question + " =" solution = ''.join(answer).lstrip('0') return problem, solution + + +binary2sComplement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binaryComplement1sFunc.py index dcc9796..f748af5 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binaryComplement1sFunc.py @@ -14,3 +14,7 @@ def binaryComplement1sFunc(maxDigits=10): problem = question + "=" solution = answer return problem, solution + + +binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binaryToHexFunc.py index 0523f8d..12dbe7f 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binaryToHexFunc.py @@ -10,3 +10,7 @@ def binaryToHexFunc(max_dig=10): solution = hex(int(problem, 2)) return problem, solution + + +binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinationsFunc.py index e0c7078..ca42532 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinationsFunc.py @@ -18,3 +18,9 @@ def combinationsFunc(maxlength=20): a, b) return problem, solution + + +combinations = Generator( + "Combinations of Objects", 30, + "Combinations available for picking 4 objects at a time from 6 distinct objects =", + " 15", combinationsFunc) diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/commonFactorsFunc.py index eab088f..929c48e 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/commonFactorsFunc.py @@ -23,3 +23,8 @@ def commonFactorsFunc(maxVal=100): problem = f"Common Factors of {a} and {b} = " solution = arr return problem, solution + + +commonFactors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compareFractionsFunc.py index c681d49..19ba5c9 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compareFractionsFunc.py @@ -25,3 +25,9 @@ def compareFractionsFunc(maxVal=10): problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?" return problem, solution + + +compareFractions = Generator( + "Compare Fractions", 44, + "Which symbol represents the comparison between a/b and c/d?", ">/</=", + compareFractionsFunc) diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compoundInterestFunc.py index 964bfb1..60a3f40 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compoundInterestFunc.py @@ -17,3 +17,9 @@ def compoundInterestFunc(maxPrinciple=10000, t) + " compounded monthly is = " solution = round(A, 2) return problem, solution + + +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) diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidenceIntervalFunc.py index 8f7abc5..9b13c81 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidenceIntervalFunc.py @@ -30,3 +30,8 @@ def confidenceIntervalFunc(): [x for x in lst], lst_per[j]) solution = '({}, {})'.format(mean + standard_error, mean - standard_error) return problem, solution + + +confidenceInterval = Generator("Confidence interval For sample S", 54, + "With X% confidence", "is (A,B)", + confidenceIntervalFunc) diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cubeRootFunc.py index a2e7ebf..3f18831 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cubeRootFunc.py @@ -9,3 +9,7 @@ def cubeRootFunc(minNo=1, maxNo=1000): problem = "cuberoot of " + str(b) + " upto 2 decimal places is:" solution = str(round(a, 2)) return problem, solution + + +CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", + "b", cubeRootFunc) diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index 275d372..cd5db00 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -27,3 +27,7 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): solution = "The Mean is {} , Standard Deviation is {}, Variance is {}".format( mean, var / number_values, (var / number_values)**0.5) return problem, solution + + +dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", + "Mean:a+b+c/3,Std,Var", dataSummaryFunc) diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/deciToHexaFunc.py index 3b76371..e1ac230 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/deciToHexaFunc.py @@ -9,3 +9,7 @@ def deciToHexaFunc(max_dec=1000): solution = str(b) return problem, solution + + +decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", + "b", deciToHexaFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/determinantToMatrix22.py index 2d9c40e..0117389 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/determinantToMatrix22.py @@ -12,3 +12,8 @@ def determinantToMatrix22(maxMatrixVal=100): problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " solution = f" {determinant}" return problem, solution + + +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distanceTwoPointsFunc.py index 6e447e3..e5de6ae 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distanceTwoPointsFunc.py @@ -13,3 +13,8 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): solution = f"sqrt({distanceSq})" problem = f"Find the distance between ({point1X}, {point1Y}) and ({point2X}, {point2Y})" return problem, solution + + +distance2Point = Generator("Distance between 2 points", 24, + "Find the distance between (x1,y1) and (x2,y2)", + "sqrt(distanceSquared)", distanceTwoPointsFunc) diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divideFractionsFunc.py index 19432f7..6d90b77 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divideFractionsFunc.py @@ -31,3 +31,7 @@ def divideFractionsFunc(maxVal=10): problem = f"({a}/{b})/({c}/{d})" solution = x return problem, solution + + +fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", + divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/divisionFunc.py index da1fa47..a99d9f7 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/divisionFunc.py @@ -10,3 +10,6 @@ def divisionFunc(maxRes=99, maxDivid=99): problem = str(a) + "/" + str(b) + "=" solution = str(c) return problem, solution + + +division = Generator("Division", 3, "a/b=", "c", divisionFunc) diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/divisionToIntFunc.py index 959d322..fa0514b 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/divisionToIntFunc.py @@ -12,3 +12,6 @@ def divisionToIntFunc(maxA=25, maxB=25): problem = f"{divisor}/{dividend} = " solution = int(divisor / dividend) return problem, solution + + +intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index 7e14f26..9b66167 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -7,3 +7,8 @@ def euclidianNormFunc(maxEltAmt=20): problem = f"Euclidian norm or L2 norm of the vector{vec} is:" solution = math.sqrt(sum([i**2 for i in vec])) return problem, solution + + +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) diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiationFunc.py index 6201b4f..1b4cc0c 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiationFunc.py @@ -9,3 +9,7 @@ def exponentiationFunc(maxBase=20, maxExpo=10): problem = f"{base}^{expo} =" solution = str(base**expo) return problem, solution + + +exponentiation = Generator("Exponentiation", 53, "a^b = ", "c", + exponentiationFunc) diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorialFunc.py index e242159..463d936 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorialFunc.py @@ -14,3 +14,6 @@ def factorialFunc(maxInput=6): n -= 1 solution = str(b) return problem, solution + + +factorial = Generator("Factorial", 31, "a! = ", "b", factorialFunc) diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoringFunc.py index 3858ef0..a0ef82e 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoringFunc.py @@ -28,3 +28,7 @@ def factoringFunc(range_x1=10, range_x2=10): x2 = intParser(x2) solution = f"(x{x1})(x{x2})" return problem, solution + + +factoring = Generator("Factoring Quadratic", 21, "x^2+(x1+x2)+x1*x2", + "(x-x1)(x-x2)", factoringFunc) diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacciSeriesFunc.py index e668f46..117befd 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacciSeriesFunc.py @@ -20,3 +20,8 @@ def fibonacciSeriesFunc(minNo=1): problem = "The Fibonacci Series of the first " + str(n) + " numbers is ?" solution = fibList return problem, solution + + +fibonacciSeries = Generator( + "Fibonacci Series", 56, "fibonacci series of first a numbers", + "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py index 5307746..871b725 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourthAngleOfQuadriFunc.py @@ -13,3 +13,9 @@ def fourthAngleOfQuadriFunc(maxAngle=180): problem = f"Fourth angle of quadrilateral with angles {angle1} , {angle2}, {angle3} =" solution = angle4 return problem, solution + + +fourthAngleOfQuadrilateral = Generator( + "Fourth Angle of Quadrilateral", 49, + "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", + fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcdFunc.py index c087db6..4f271d1 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcdFunc.py @@ -11,3 +11,7 @@ def gcdFunc(maxVal=20): problem = f"GCD of {a} and {b} = " solution = str(x) return problem, solution + + +gcd = Generator("GCD (Greatest Common Denominator)", 10, "GCD of a and b = ", + "c", gcdFunc) diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geomProgrFunc.py index f638c8a..0683c3c 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geomProgrFunc.py @@ -22,3 +22,9 @@ def geomProgrFunc(number_values=6, 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 + + +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) diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometricMeanFunc.py index 11085fa..ad80594 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometricMeanFunc.py @@ -26,3 +26,8 @@ def geometricMeanFunc(maxValue=100, maxNum=4): problem = f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}" return problem, solution + + +geometricMean = Generator("Geometric Mean of N Numbers", 67, + "Geometric mean of n numbers A1 , A2 , ... , An = ", + "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonicMeanFunc.py index 22e6a86..5febc7e 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonicMeanFunc.py @@ -27,3 +27,9 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): problem = f"Harmonic mean of {num} numbers {a} , {b} , {c} , {d} = " solution = f" {num}/((1/{a}) + (1/{b}) + (1/{c}) + (1/{d})) = {ans}" return problem, solution + + +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) diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcfFunc.py index 8faa555..aaab950 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcfFunc.py @@ -11,3 +11,7 @@ def hcfFunc(maxVal=20): problem = f"HCF of {a} and {b} = " solution = str(x) return problem, solution + + +hcf = Generator("HCF (Highest Common Factor)", 51, "HCF of a and b = ", "c", + hcfFunc) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py index 829f8e3..4697201 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersectionOfTwoLinesFunc.py @@ -65,3 +65,9 @@ def intersectionOfTwoLinesFunc(minM=-10, solution = f"({fractionToString(intersection_x)}, {fractionToString(intersection_y)})" return problem, solution + + +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) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/isTriangleValidFunc.py index d662e4e..19a4240 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/isTriangleValidFunc.py @@ -19,3 +19,8 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution solution = "No" return problem, solution + + +doesTriangleExist = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcmFunc.py index bf3b93f..ef57c2c 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcmFunc.py @@ -16,3 +16,7 @@ def lcmFunc(maxVal=20): solution = str(d) return problem, solution + + +lcm = Generator("LCM (Least Common Multiple)", 9, "LCM of a and b = ", "c", + lcmFunc) diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linearEquationsFunc.py index b7fed0e..62dc081 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linearEquationsFunc.py @@ -28,3 +28,7 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): problem = "\n".join(problem) return problem, solution + + +linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", + "x=-20 & y=12", linearEquationsFunc) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/logFunc.py index 96c611a..dcc7c05 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/logFunc.py @@ -11,3 +11,6 @@ def logFunc(maxBase=3, maxVal=8): solution = str(a) return problem, solution + + +log = Generator("Logarithm", 12, "log2(8)", "3", logFunc) diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/matrixInversion.py index 366207f..4eb2787 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/matrixInversion.py @@ -77,3 +77,7 @@ def matrixInversion(SquareMatrixDimension=3, problem = 'Inverse of Matrix ' + str(Mat) + ' is:' solution = str(sympy.Matrix.inv(Mat)) return problem, solution + + +invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrixMultiplicationFunc.py index 7190265..9706782 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrixMultiplicationFunc.py @@ -52,3 +52,8 @@ def matrixMultiplicationFuncHelper(inp): string += "]]" return string + + +matrixMultiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py index 5eb954a..cd20310 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -13,3 +13,8 @@ def meanMedianFunc(maxlen=10): 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 + + +meanMedian = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/moduloFunc.py index 9cf3a3b..3d97d52 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/moduloFunc.py @@ -10,3 +10,6 @@ def moduloFunc(maxRes=99, maxModulo=99): problem = str(a) + "%" + str(b) + "=" solution = str(c) return problem, solution + + +moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 017b5cd..1d1d339 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -10,3 +10,7 @@ def multiplicationFunc(maxRes=99, maxMulti=99): problem = str(a) + "*" + str(b) + "=" solution = str(c) return problem, solution + + +multiplication = Generator("Multiplication", 2, "a*b=", "c", + multiplicationFunc) diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiplyComplexNumbersFunc.py index 63f0280..8f825d0 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiplyComplexNumbersFunc.py @@ -11,3 +11,8 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, problem = f"{num1} * {num2} = " solution = num1 * num2 return problem, solution + + +complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/multiplyFractionsFunc.py index a71c5c9..39857c4 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/multiplyFractionsFunc.py @@ -31,3 +31,8 @@ def multiplyFractionsFunc(maxVal=10): problem = f"({a}/{b})*({c}/{d})" solution = x return problem, solution + + +fractionMultiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiplyIntToMatrix22.py index e96d595..1409a5b 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiplyIntToMatrix22.py @@ -12,3 +12,9 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): problem = f"{constant} * [[{a}, {b}], [{c}, {d}]] = " solution = f"[[{a*constant},{b*constant}],[{c*constant},{d*constant}]]" return problem, solution + + +intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", + 17, "k * [[a,b],[c,d]]=", + "[[k*a,k*b],[k*c,k*d]]", + multiplyIntToMatrix22) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nthFibonacciNumberFunc.py index bcbc784..1983a0d 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nthFibonacciNumberFunc.py @@ -9,3 +9,8 @@ def nthFibonacciNumberFunc(maxN=100): ans = round((math.pow(golden_ratio, n) - math.pow(-golden_ratio, -n)) / (math.sqrt(5))) solution = f"{ans}" return problem, solution + + +nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentageFunc.py index eeba61f..36d72be 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentageFunc.py @@ -10,3 +10,7 @@ def percentageFunc(maxValue=99, maxpercentage=99): formatted_float = "{:.2f}".format(percentage) solution = f"Required percentage = {formatted_float}%" return problem, solution + + +percentage = Generator("Percentage of a number", 80, "What is a% of b?", + "percentage", percentageFunc) diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutationFunc.py index 6ef5670..f4764c0 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutationFunc.py @@ -10,3 +10,9 @@ def permutationFunc(maxlength=20): problem = "Number of Permutations from {} objects picked {} at a time = ".format( a, b) return problem, solution + + +permutations = Generator( + "Permutations", 42, + "Total permutations of 4 objects at a time from 10 objects is", "5040", + permutationFunc) diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/powerRuleDifferentiationFunc.py index 774a80d..6e41170 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/powerRuleDifferentiationFunc.py @@ -17,3 +17,8 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): problem += str(coefficient) + "x^" + str(exponent) solution += str(coefficient * exponent) + "x^" + str(exponent - 1) return problem, solution + + +powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/powerRuleIntegrationFunc.py index 25a3861..4b5684b 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/powerRuleIntegrationFunc.py @@ -20,3 +20,7 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): solution += " + c" return problem, solution + + +powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/primeFactorsFunc.py index 71fa1d0..6eed7a9 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/primeFactorsFunc.py @@ -21,3 +21,7 @@ def primeFactorsFunc(minVal=1, maxVal=200): problem = f"Find prime factors of {a}" solution = f"{factors}" return problem, solution + + +primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profitLossPercentFunc.py index 7a6fd9e..c9d1d4d 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profitLossPercentFunc.py @@ -15,3 +15,9 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): solution = percent return problem, solution + + +profitLossPercent = Generator( + "Profit or Loss Percent", 63, + "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", + profitLossPercentFunc) diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagoreanTheoremFunc.py index 2e9c2e3..26dc744 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagoreanTheoremFunc.py @@ -10,3 +10,9 @@ def pythagoreanTheoremFunc(maxLength=20): problem = f"The hypotenuse of a right triangle given the other two lengths {a} and {b} = " solution = f"{c:.0f}" if c.is_integer() else f"{c:.2f}" return problem, solution + + +pythagoreanTheorem = Generator( + "Pythagorean Theorem", 25, + "The hypotenuse of a right triangle given the other two lengths a and b = ", + "hypotenuse", pythagoreanTheoremFunc) diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadraticEquation.py index c862ae0..021faff 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadraticEquation.py @@ -14,3 +14,9 @@ def quadraticEquation(maxVal=100): [round((-b + D) / (2 * a), 2), round((-b - D) / (2 * a), 2)]) return problem, solution + + +quadraticEquationSolve = Generator( + "Quadratic Equation", 50, + "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", + quadraticEquation) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/regularPolygonAngleFunc.py index d8d308a..a264c5a 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/regularPolygonAngleFunc.py @@ -9,3 +9,9 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): exteriorAngle = round((360 / sideNum), 2) solution = 180 - exteriorAngle return problem, solution + + +angleRegularPolygon = Generator( + "Angle of a Regular Polygon", 29, + "Find the angle of a regular polygon with 6 sides", "120", + regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index 4785557..db9dc7e 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -10,3 +10,8 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): formatted_float = "{:.5f}".format(secArea) solution = f"Area of sector = {formatted_float}" return problem, solution + + +sectorArea = Generator("Area of a Sector", 75, + "Area of a sector with radius, r and angle, a ", "Area", + sectorAreaFunc) diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simpleInterestFunc.py index aa5aae2..23f1afc 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simpleInterestFunc.py @@ -14,3 +14,9 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): c) + " years is = " solution = round(d, 2) return problem, solution + + +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) diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/squareFunc.py index 78c55e0..dbe284c 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/squareFunc.py @@ -9,3 +9,6 @@ def squareFunc(maxSquareNum=20): problem = str(a) + "^2" + "=" solution = str(b) return problem, solution + + +square = Generator("Square", 8, "a^2", "b", squareFunc) diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/squareRootFunc.py index 2c09168..6cc410a 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/squareRootFunc.py @@ -9,3 +9,6 @@ def squareRootFunc(minNo=1, maxNo=12): problem = "sqrt(" + str(a) + ")=" solution = str(b) return problem, solution + + +squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtractionFunc.py index ecac4e5..9298037 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtractionFunc.py @@ -10,3 +10,6 @@ def subtractionFunc(maxMinuend=99, maxDiff=99): problem = str(a) + "-" + str(b) + "=" solution = str(c) return problem, solution + + +subtraction = Generator("Subtraction", 1, "a-b=", "c", subtractionFunc) diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py index 9e7ff89..c0a9d7b 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py @@ -9,3 +9,8 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): problem = f"Sum of angles of polygon with {side} sides = " solution = sum return problem, solution + + +sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, + "Sum of angles of polygon with n sides = ", + "sum", sumOfAnglesOfPolygonFunc) diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surdsComparisonFunc.py index 4ee3e30..278c3c4 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surdsComparisonFunc.py @@ -16,3 +16,8 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): elif first < second: solution = "<" return problem, solution + + +surdsComparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surfaceAreaCone.py index d8cb21c..8497460 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surfaceAreaCone.py @@ -12,3 +12,9 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaConeGen = Generator( + "Surface Area of cone", 38, + "Surface area of cone with height = a units and radius = b units is", + "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surfaceAreaCube.py index 2452a05..42b07f4 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surfaceAreaCube.py @@ -8,3 +8,8 @@ def surfaceAreaCube(maxSide=20, unit='m'): ans = 6 * a * a solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surfaceAreaCuboid.py index f1b8205..0889441 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surfaceAreaCuboid.py @@ -11,3 +11,9 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): ans = 2 * (a * b + b * c + c * a) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCuboidGen = Generator( + "Surface Area of Cuboid", 33, + "Surface area of cuboid with sides = a units, b units, c units is", + "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surfaceAreaCylinder.py index 8a218dc..3a7a1e8 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surfaceAreaCylinder.py @@ -10,3 +10,9 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(2 * math.pi * a * b + 2 * math.pi * b * b) solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaCylinderGen = Generator( + "Surface Area of Cylinder", 34, + "Surface area of cylinder with height = a units and radius = b units is", + "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surfaceAreaSphere.py index 664e9f8..86a9456 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surfaceAreaSphere.py @@ -9,3 +9,9 @@ def surfaceAreaSphere(maxSide=20, unit='m'): ans = 4 * math.pi * r * r solution = f"{ans} {unit}^2" return problem, solution + + +surfaceAreaSphereGen = Generator( + "Surface Area of Sphere", 60, + "Surface area of sphere with radius = a units is", "d units^2", + surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/systemOfEquationsFunc.py index 84bf2c7..ef00b0e 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/systemOfEquationsFunc.py @@ -46,3 +46,8 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): solution = f"x = {x}, y = {y}" return problem, solution # Add random (non-zero) multiple of equations to each other + + +systemOfEquations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py index 9a8cbc6..f5f7afb 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/thirdAngleOfTriangleFunc.py @@ -10,3 +10,8 @@ def thirdAngleOfTriangleFunc(maxAngle=89): problem = f"Third angle of triangle with angles {angle1} and {angle2} = " solution = angle3 return problem, solution + + +thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vectorCrossFunc.py index 78cb99b..318beec 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vectorCrossFunc.py @@ -13,3 +13,7 @@ def vectorCrossFunc(minVal=-20, maxVal=20): problem = str(a) + " X " + str(b) + " = " solution = str(c) return problem, solution + + +vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vectorDotFunc.py index 871011a..0ca2609 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vectorDotFunc.py @@ -10,3 +10,7 @@ def vectorDotFunc(minVal=-20, maxVal=20): problem = str(a) + " . " + str(b) + " = " solution = str(c) return problem, solution + + +vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volumeCone.py index f965024..85dbd55 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volumeCone.py @@ -10,3 +10,9 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a * (1 / 3)) solution = f"{ans} {unit}^3" return problem, solution + + +volumeConeGen = Generator( + "Volume of cone", 39, + "Volume of cone with height = a units and radius = b units is", + "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volumeCube.py index 1efb25f..ff1ac76 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volumeCube.py @@ -9,3 +9,8 @@ def volumeCube(maxSide=20, unit='m'): ans = a * a * a solution = f"{ans} {unit}^3" return problem, solution + + +volumeCubeGen = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volumeCuboid.py index ea55e42..d25d753 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volumeCuboid.py @@ -11,3 +11,9 @@ def volumeCuboid(maxSide=20, unit='m'): ans = a * b * c solution = f"{ans} {unit}^3" return problem, solution + + +volumeCuboidGen = Generator( + "Volume of Cuboid", 36, + "Volume of cuboid with sides = a units, b units, c units is", "d units^3", + volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volumeCylinder.py index 39ab091..e021aab 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volumeCylinder.py @@ -10,3 +10,9 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): ans = int(math.pi * b * b * a) solution = f"{ans} {unit}^3" return problem, solution + + +volumeCylinderGen = Generator( + "Volume of cylinder", 37, + "Volume of cylinder with height = a units and radius = b units is", + "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volumeSphereFunc.py index 0a33b82..038607e 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volumeSphereFunc.py @@ -9,3 +9,8 @@ def volumeSphereFunc(maxRadius=100): ans = (4 * math.pi / 3) * r * r * r solution = f"{ans} m^3" return problem, solution + + +volumeSphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 61074cd..959093b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -33,246 +33,5 @@ def genById(id): return (generator()) -# -# def getGenList(): -# return(genList) - # Format is: # <title> = 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) -division = Generator("Division", 3, "a/b=", "c", divisionFunc) -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) -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) -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) -# 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", celsiustofahrenheitFunc) - -arithmeticProgressionTerm = Generator("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ...", - "a-n", arithmeticProgressionTermFunc) - -arithmeticProgressionSum = Generator("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) From ce79a2a94b67f06ddec87937135e9708b4a8dd53 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 20:42:49 -0400 Subject: [PATCH 54/99] Fixed all ordering except for addition --- mathgenerator/funcs/__init__.py | 8 ++++---- test.py | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bf9803e..8937e2c 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -11,8 +11,8 @@ from .moduloFunc import * from .squareRootFunc import * from .powerRuleDifferentiationFunc import * from .squareFunc import * -from .gcdFunc import * from .lcmFunc import * +from .gcdFunc import * from .basicAlgebraFunc import * from .logFunc import * from .divisionToIntFunc import * @@ -35,10 +35,10 @@ from .regularPolygonAngleFunc import * from .combinationsFunc import * from .factorialFunc import * from .surfaceAreaCube import * -from .volumeCube import * from .surfaceAreaCuboid import * -from .volumeCuboid import * from .surfaceAreaCylinder import * +from .volumeCube import * +from .volumeCuboid import * from .volumeCylinder import * from .surfaceAreaCone import * from .volumeCone import * @@ -84,5 +84,5 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * -from .arithmeticProgressionSumFunc import * from .arithmeticProgressionTermFunc import * +from .arithmeticProgressionSumFunc import * diff --git a/test.py b/test.py index 1302ce5..7f2d993 100644 --- a/test.py +++ b/test.py @@ -4,3 +4,9 @@ from mathgenerator import mathgen print(mathgen.addition()) print(mathgen.genById(79)) +print(mathgen.getGenList()) +list = mathgen.getGenList() + +# prints the order of generators in the list +for item in list: + print(item[2]) From 20918c5a78ce8d4b4e12f3d51d83169e12be2024 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:07:50 -0400 Subject: [PATCH 55/99] Rough fix of genList issue --- mathgenerator/__init__.py | 3 ++- test.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 0a261d0..956697a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -20,4 +20,5 @@ class Generator: def getGenList(): - return genList + correctedList = genList[-1:] + genList[:-1] + return correctedList diff --git a/test.py b/test.py index 7f2d993..9df861d 100644 --- a/test.py +++ b/test.py @@ -4,9 +4,10 @@ from mathgenerator import mathgen print(mathgen.addition()) print(mathgen.genById(79)) -print(mathgen.getGenList()) -list = mathgen.getGenList() -# prints the order of generators in the list +# prints each generator in genList +""" +list = mathgen.getGenList() for item in list: print(item[2]) +""" From 8a4036469269b6e7a4162bfdbd3f7a8e9604746f Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:19:32 -0400 Subject: [PATCH 56/99] Update decimalToOctalFunc.py --- mathgenerator/funcs/decimalToOctalFunc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py index 64bbae4..1f2cf6f 100644 --- a/mathgenerator/funcs/decimalToOctalFunc.py +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -6,3 +6,6 @@ def decimalToOctalFunc(maxDecimal=4096): problem = "The decimal number " + str(x) + " in Octal is: " solution = oct(x) return problem, solution + + +decimalToOctal = Generator("Converts decimal to octal", 82, "What's the octal representation of 98?", "0o142", decimalToOctalFunc) From e18a35559d8966a0907ebe922d20d0d36dd1ab2e Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:19:51 -0400 Subject: [PATCH 57/99] Update decimalToRomanNumeralsFunc.py --- mathgenerator/funcs/decimalToRomanNumeralsFunc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py index c7183c3..407a4f2 100644 --- a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -23,3 +23,6 @@ def decimalToRomanNumeralsFunc(maxDecimal=4000): x = math.floor(x % divisor) divisor /= 10 return problem, solution + + +decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", 83, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) From d4906d85f804a1168b12848d8e64a218a6e9d361 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:25:09 -0400 Subject: [PATCH 58/99] Id fix --- mathgenerator/funcs/decimalToOctalFunc.py | 3 ++- mathgenerator/funcs/decimalToRomanNumeralsFunc.py | 3 ++- test.py | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimalToOctalFunc.py index 1f2cf6f..4a5c7ab 100644 --- a/mathgenerator/funcs/decimalToOctalFunc.py +++ b/mathgenerator/funcs/decimalToOctalFunc.py @@ -8,4 +8,5 @@ def decimalToOctalFunc(maxDecimal=4096): return problem, solution -decimalToOctal = Generator("Converts decimal to octal", 82, "What's the octal representation of 98?", "0o142", decimalToOctalFunc) +decimalToOctal = Generator("Converts decimal to octal", 84, + "What's the octal representation of 98?", "0o142", decimalToOctalFunc) diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py index 407a4f2..03e369b 100644 --- a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py +++ b/mathgenerator/funcs/decimalToRomanNumeralsFunc.py @@ -25,4 +25,5 @@ def decimalToRomanNumeralsFunc(maxDecimal=4000): return problem, solution -decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", 83, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) +decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", + 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) diff --git a/test.py b/test.py index 9df861d..88a2724 100644 --- a/test.py +++ b/test.py @@ -6,8 +6,7 @@ print(mathgen.addition()) print(mathgen.genById(79)) # prints each generator in genList -""" + list = mathgen.getGenList() for item in list: print(item[2]) -""" From 079627622829594ebdc8d4838d103815cbbbfa3d Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:26:17 -0400 Subject: [PATCH 59/99] Update degreeToRadFunc.py --- mathgenerator/funcs/degreeToRadFunc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py index 0f4da2e..96ec12b 100644 --- a/mathgenerator/funcs/degreeToRadFunc.py +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -10,3 +10,6 @@ def degreeToRadFunc(max_deg=360): solution = str(b) return problem, solution + + +degreeToRad = Generator("Degrees to Radians", 86, "Angle a in radians is = ", "b", degreeToRadFunc) From cca6f16b6295534411bf8bc6ac6f7fa7995a6147 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:26:36 -0400 Subject: [PATCH 60/99] Update radianToDegFunc.py --- mathgenerator/funcs/radianToDegFunc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py index ce08cf3..1021a60 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -10,3 +10,5 @@ def degreeToRadFunc(max_rad=pi): solution = str(b) return problem, solution + +radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) From ce131477a71bb999dda3f49ec723af8a018751c6 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:28:15 -0400 Subject: [PATCH 61/99] Linter fix --- mathgenerator/funcs/degreeToRadFunc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degreeToRadFunc.py index 96ec12b..7ca4080 100644 --- a/mathgenerator/funcs/degreeToRadFunc.py +++ b/mathgenerator/funcs/degreeToRadFunc.py @@ -1,9 +1,10 @@ from .__init__ import * from numpy import pi + def degreeToRadFunc(max_deg=360): a = random.randint(0, max_deg) - b = (pi*a)/180 + b = (pi * a) / 180 b = round(b, 2) problem = "Angle " + str(a) + " in radians is = " From 742a2ff4d3c50b0487580ad7aa4281a148c71347 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:28:42 -0400 Subject: [PATCH 62/99] linter fix --- mathgenerator/funcs/radianToDegFunc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py index 1021a60..05285a8 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -1,9 +1,10 @@ from .__init__ import * from numpy import pi + def degreeToRadFunc(max_rad=pi): a = random.randint(0, max_rad) - b = (180*a)/pi + b = (180 * a) / pi b = round(b, 2) problem = "Angle " + str(a) + " in degrees is = " @@ -11,4 +12,5 @@ def degreeToRadFunc(max_rad=pi): return problem, solution + radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) From 238a82587412a62a3dd93d4966b8210f12d51a5b Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:30:15 -0400 Subject: [PATCH 63/99] Linter fix --- mathgenerator/mathgen.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index c455b41..959093b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -35,4 +35,3 @@ def genById(id): # Format is: # <title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) - From 82929ae4fce3ca67b37b9906d94f91dbb5fb2566 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:33:02 -0400 Subject: [PATCH 64/99] update dev-requirements --- dev-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 7b33738..259022d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,4 +2,5 @@ pytest hypothesis flake8 autopep8 -sympy \ No newline at end of file +sympy +numpy From 82a0e1433aa973316b731e69c7a7d9cefb8a8456 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Mon, 19 Oct 2020 21:38:42 -0400 Subject: [PATCH 65/99] Fix radianToDegreeFunc naming --- mathgenerator/funcs/radianToDegFunc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py index 05285a8..b9c7b56 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -2,7 +2,7 @@ from .__init__ import * from numpy import pi -def degreeToRadFunc(max_rad=pi): +def radianToDegFunc(max_rad=pi): a = random.randint(0, max_rad) b = (180 * a) / pi b = round(b, 2) From 611469ec38de3521aca10b74cff87cdf63860008 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:20:33 +0530 Subject: [PATCH 66/99] Update mathgen.py --- mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgen.py b/mathgen.py index 85a8f3d..ffb2ebe 100644 --- a/mathgen.py +++ b/mathgen.py @@ -40,3 +40,4 @@ def isprime(max_a=100): is_prime = Generator('isprime', 74, 'a any positive integer', 'True/False', isprime) +print(is_prime.func) From 979e9fa9f11fae428de6492b9d3a1d0df259d01d Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:26:44 +0530 Subject: [PATCH 67/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index ce5a58d..b24b2c1 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -from __init__ import * +.__init__ import * def isprime(max_a=100): From 8bf56dc57d1654bdd73bf1991db7a3b54adfd6b6 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:31:26 +0530 Subject: [PATCH 68/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index b24b2c1..ce5a58d 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -.__init__ import * +from __init__ import * def isprime(max_a=100): From 047cd7289e76ebe508058118283f28bdca93b856 Mon Sep 17 00:00:00 2001 From: Satyam Koshta <58166232+satyamkoshta340@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:38:20 +0530 Subject: [PATCH 69/99] Update isprime.py --- mathgenerator/funcs/isprime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/isprime.py index ce5a58d..9da7bfb 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/isprime.py @@ -1,4 +1,4 @@ -from __init__ import * +from .__init__ import * def isprime(max_a=100): From d73c4c5678e20663cf5ff6ae18d86589f8b0c279 Mon Sep 17 00:00:00 2001 From: strikeraryu <striker.aryu56@gmail.com> Date: Tue, 20 Oct 2020 10:59:10 +0530 Subject: [PATCH 70/99] Added differentiation generator --- mathgenerator/funcs/__init__.py | 1 + mathgenerator/funcs/differentiationFunc.py | 53 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 mathgenerator/funcs/differentiationFunc.py diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 12bf15e..df82c64 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -90,3 +90,4 @@ from .decimalToOctalFunc import * from .decimalToRomanNumeralsFunc import * from .degreeToRadFunc import * from .radianToDegFunc import * +from .differentiationFunc import * diff --git a/mathgenerator/funcs/differentiationFunc.py b/mathgenerator/funcs/differentiationFunc.py new file mode 100644 index 0000000..2b40dea --- /dev/null +++ b/mathgenerator/funcs/differentiationFunc.py @@ -0,0 +1,53 @@ +from .__init__ import * + + +def genDifferentiationProblem(diff_lvl): + problem = '' + + types = { + 'Logrithmic': ['ln'], + 'Trigonometric': ['sin', 'cos', 'tan', 'cot', 'sec'], + 'Exponentional': ['exp'] + } + + if diff_lvl == 1: + coeff = random.randrange(2, 10) + power = random.randint(2, 4) + flag = random.random() + if flag > 0.5: + power *= -1 + problem += str(coeff) + '*x^' + '(' + str(power) + ')' + else: + problem += str(coeff) + '*x^' + str(power) + if diff_lvl == 2: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(x)' + '+' + genDifferentiationProblem(1) + if diff_lvl == 3: + func_type = random.choices(list(types.keys()), weights=(1, 4, 1))[0] + func = random.choice(types[func_type]) + problem += func + '(' + genDifferentiationProblem(1) + ')' + if diff_lvl == 4: + operator = random.choice(('/', '*')) + problem = '(' + genDifferentiationProblem(2) + ')' + \ + operator + '(' + genDifferentiationProblem(3) + ')' + + return problem + + +def differentiationFunc(diff_lvl=2): + if diff_lvl < 1 or diff_lvl > 4: + print("diff_lvl not supported") + return None + problem = genDifferentiationProblem(diff_lvl) + + x = sympy.symbols('x') + solution = str(sympy.diff(problem.replace('^', '**'), x)) + solution = solution.replace('**', '^') + problem = f"differentiate w.r.t x : d({problem})/dx" + + return problem, solution + + +differentiation = Generator( + "Differentiation", 88, "differentiate w.r.t x : d(f(x))/dx", "g(x)", differentiationFunc) From fbd88492599055e17fdd1601ee099fcd86cc68cc Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:07:00 +0530 Subject: [PATCH 71/99] Create definiteIntegralFunc.py Created Definite Integral function within limits 0 to 1. --- mathgenerator/funcs/definiteIntegralFunc.py | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mathgenerator/funcs/definiteIntegralFunc.py diff --git a/mathgenerator/funcs/definiteIntegralFunc.py b/mathgenerator/funcs/definiteIntegralFunc.py new file mode 100644 index 0000000..73d81d6 --- /dev/null +++ b/mathgenerator/funcs/definiteIntegralFunc.py @@ -0,0 +1,22 @@ +from .__init__ import * +from ..__init__ import Generator +from scipy.integrate import quad + + +def definiteIntegralFunc(max_coeff=100): + + def integrand(x, a, b, c): + return a*x**2 + b*x + c + + a = random.randint(0, max_coeff) + b = random.randint(0, max_coeff) + c = random.randint(0, max_coeff) + + I = quad(integrand, 0, 1, args=(a, b, c))[0] + I = round(I, 4) + + problem = "The definite integral within limits 0 to 1 of the equation "+ str(a) +"x^2 + "+ str(b) +"x + "+ str(c) +" is = " + + solution = str(I) + + return problem, solution From 8407ba145856c8b253d4094ec052101fcfbdcc88 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:08:15 +0530 Subject: [PATCH 72/99] Update __init__.py updated init.py with definite integral module --- mathgenerator/funcs/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 12bf15e..7f2f7d4 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -90,3 +90,4 @@ from .decimalToOctalFunc import * from .decimalToRomanNumeralsFunc import * from .degreeToRadFunc import * from .radianToDegFunc import * +from .definiteIntegralFunc import * From 8f6fb56c15fb867acb0fbba5c4aabf50aeacbe0d Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:11:53 +0530 Subject: [PATCH 73/99] Update definiteIntegralFunc.py Added generator class --- mathgenerator/funcs/definiteIntegralFunc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mathgenerator/funcs/definiteIntegralFunc.py b/mathgenerator/funcs/definiteIntegralFunc.py index 73d81d6..e5631c0 100644 --- a/mathgenerator/funcs/definiteIntegralFunc.py +++ b/mathgenerator/funcs/definiteIntegralFunc.py @@ -20,3 +20,6 @@ def definiteIntegralFunc(max_coeff=100): solution = str(I) return problem, solution + + +definiteIntegral = Generator("Definite Integral of Quadratic Equation", 110, "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "I", definiteIntegralFunc) From 2f6c9b0eb70e0055a109f3c6200935ece6507545 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:24:17 +0530 Subject: [PATCH 74/99] Update definiteIntegralFunc.py fixed presentation errors --- mathgenerator/funcs/definiteIntegralFunc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mathgenerator/funcs/definiteIntegralFunc.py b/mathgenerator/funcs/definiteIntegralFunc.py index e5631c0..b029ccb 100644 --- a/mathgenerator/funcs/definiteIntegralFunc.py +++ b/mathgenerator/funcs/definiteIntegralFunc.py @@ -6,18 +6,18 @@ from scipy.integrate import quad def definiteIntegralFunc(max_coeff=100): def integrand(x, a, b, c): - return a*x**2 + b*x + c + return a * x ** 2 + b * x + c a = random.randint(0, max_coeff) b = random.randint(0, max_coeff) c = random.randint(0, max_coeff) I = quad(integrand, 0, 1, args=(a, b, c))[0] - I = round(I, 4) + S = round(I, 4) - problem = "The definite integral within limits 0 to 1 of the equation "+ str(a) +"x^2 + "+ str(b) +"x + "+ str(c) +" is = " + problem = "The definite integral within limits 0 to 1 of the equation " + str(a) + "x^2 + "+ str(b) +"x + " + str(c) + " is = " - solution = str(I) + solution = str(S) return problem, solution From 1d1a6f274056d851ba56a221e3edf42bc96ae31d Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:30:04 +0530 Subject: [PATCH 75/99] Update definiteIntegralFunc.py fixed presentation error --- mathgenerator/funcs/definiteIntegralFunc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mathgenerator/funcs/definiteIntegralFunc.py b/mathgenerator/funcs/definiteIntegralFunc.py index b029ccb..b0e502c 100644 --- a/mathgenerator/funcs/definiteIntegralFunc.py +++ b/mathgenerator/funcs/definiteIntegralFunc.py @@ -12,14 +12,14 @@ def definiteIntegralFunc(max_coeff=100): b = random.randint(0, max_coeff) c = random.randint(0, max_coeff) - I = quad(integrand, 0, 1, args=(a, b, c))[0] - S = round(I, 4) + result = quad(integrand, 0, 1, args=(a, b, c))[0] + S = round(result, 4) - problem = "The definite integral within limits 0 to 1 of the equation " + str(a) + "x^2 + "+ str(b) +"x + " + str(c) + " is = " + problem = "The definite integral within limits 0 to 1 of the equation " + str(a) + "x^2 + " + str(b) + "x + " + str(c) + " is = " solution = str(S) return problem, solution -definiteIntegral = Generator("Definite Integral of Quadratic Equation", 110, "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "I", definiteIntegralFunc) +definiteIntegral = Generator("Definite Integral of Quadratic Equation", 110, "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "S", definiteIntegralFunc) From 19a9d4981a2a6cba97717bd1131260b7334638e2 Mon Sep 17 00:00:00 2001 From: helplessThor <66440538+helplessThor@users.noreply.github.com> Date: Tue, 20 Oct 2020 12:36:23 +0530 Subject: [PATCH 76/99] Update mathgen.py importing scipy --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 959093b..d2eee73 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -3,6 +3,7 @@ import math import fractions from .funcs import * from .__init__ import getGenList +import scipy genList = getGenList() From 577edd967a156b6d3792d3222e6c9300719562bc Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 10:01:53 -0400 Subject: [PATCH 77/99] Update new-generator-idea.md --- .github/ISSUE_TEMPLATE/new-generator-idea.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/new-generator-idea.md b/.github/ISSUE_TEMPLATE/new-generator-idea.md index b986c9f..1a08806 100644 --- a/.github/ISSUE_TEMPLATE/new-generator-idea.md +++ b/.github/ISSUE_TEMPLATE/new-generator-idea.md @@ -11,6 +11,6 @@ assignees: '' **Example Solution:** -**Further explanation:** +**Further explanation (optional):** **Would you like to be assigned to this:** From b4044facf6b9be38b83a05faa8d47b98797619b1 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 10:13:54 -0400 Subject: [PATCH 78/99] function name included in generator instance variables and genList[3] --- README.md | 172 +++++++++++---------- makeReadme.py | 19 ++- mathgenerator/__init__.py | 9 +- mathgenerator/funcs/angleBtwVectorsFunc.py | 3 +- mathgenerator/funcs/multiplicationFunc.py | 5 +- mathgenerator/funcs/radianToDegFunc.py | 3 +- test.py | 7 +- 7 files changed, 121 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 042f337..ca34822 100644 --- a/README.md +++ b/README.md @@ -31,86 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 16+3= | 19 | subtraction | -| 1 | Subtraction | 96-17= | 79 | multiplication | -| 2 | Multiplication | 48*1= | 48 | multiplicationFunc) | -| 3 | Division | 83/97= | 0.8556701030927835 | division | -| 4 | Binary Complement 1s | 1110110111= | 0001001000 | binaryComplement1s | -| 5 | Modulo Division | 91%53= | 38 | binaryComplement1sFunc) | -| 6 | Square Root | sqrt(64)= | 8 | moduloDivision | -| 7 | Power Rule Differentiation | 6x^7 | 42x^6 | squareRoot | -| 8 | Square | 5^2= | 25 | powerRuleDifferentiation | -| 9 | LCM (Least Common Multiple) | LCM of 20 and 10 = | 20 | "(n*m)x^(m-1)", | -| 10 | GCD (Greatest Common Denominator) | GCD of 16 and 20 = | 4 | powerRuleDifferentiationFunc) | -| 11 | Basic Algebra | 9x + 10 = 10 | 0 | square | -| 12 | Logarithm | log3(3) | 1 | lcm | -| 13 | Easy Division | 399/19 = | 21 | lcmFunc) | -| 14 | Decimal to Binary | Binary of 99= | 1100011 | gcd | -| 15 | Binary to Decimal | 011100 | 28 | "c", gcdFunc) | -| 16 | Fraction Division | (6/8)/(4/7) | 21/16 | basicAlgebra | -| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[3, 3], [6, 3]] = | [[6,6],[12,6]] | basicAlgebraFunc) | -| 18 | Area of Triangle | Area of triangle with side lengths: 11 11 17 = | 59.348020186018 | log | -| 19 | Triangle exists check | Does triangle with sides 23, 29 and 34 exist? | Yes | intDivision | -| 20 | Midpoint of the two point | (0,-20),(14,-16)= | (7.0,-18.0) | decimalToBinary | -| 21 | Factoring Quadratic | x^2-5x-36 | (x-9)(x+4) | DecimalToBinaryFunc) | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 32 and 60 = | 88 | binaryToDecimal | -| 23 | Solve a System of Equations in R^2 | 4x - 6y = 14, -7x - 2y = 88 | x = -10, y = -9 | BinaryToDecimalFunc) | -| 24 | Distance between 2 points | Find the distance between (14, -9) and (12, 13) | sqrt(488) | fractionDivision | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 1 = | 13.04 | divideFractionsFunc) | -| 26 | Linear Equations | -12x + 13y = -22 --1x + -7y = -18 | x = 4, y = 2 | intMatrix22Multiplication | -| 27 | Prime Factorisation | Find prime factors of 2 | [2] | 17, "k * [[a,b],[c,d]] | -| 28 | Fraction Multiplication | (8/6)*(4/10) | 8/15 | "[[k*a,k*b],[k*c,k*d]]", | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 11 sides | 147.27 | multiplyIntToMatrix22) | -| 30 | Combinations of Objects | Number of combinations from 15 objects picked 7 at a time | 6435 | areaOfTriangle | -| 31 | Factorial | 3! = | 6 | "Area of Triangle with side lengths a, b, c | -| 32 | Surface Area of Cube | Surface area of cube with side = 14m is | 1176 m^2 | "area", areaOfTriangleFunc) | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 17m, 7m, 10m is | 718 m^2 | doesTriangleExist | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 36m and radius = 7m is | 1891 m^2 | "Does triangle with sides a, b and c exist?", | -| 35 | Volum of Cube | Volume of cube with side = 10m is | 1000 m^3 | "Yes/No", isTriangleValidFunc) | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 20m, 17m, 4m is | 1360 m^3 | midPointOfTwoPoint | -| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 1m is | 40 m^3 | "((X1,Y1),(X2,Y2)) | -| 38 | Surface Area of cone | Surface area of cone with height = 17m and radius = 9m is | 798 m^2 | MidPointOfTwoPointFunc) | -| 39 | Volume of cone | Volume of cone with height = 15m and radius = 5m is | 392 m^3 | factoring | -| 40 | Common Factors | Common Factors of 69 and 51 = | [1, 3] | "(x-x1)(x-x2)", factoringFunc) | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6/3x + 9 and y = 6x + 2 | (7/4, 25/2) | thirdAngleOfTriangle | -| 42 | Permutations | Number of Permutations from 14 objects picked 1 at a time = | 14 | "Third Angle of the triangle | -| 43 | Cross Product of 2 Vectors | [19, 17, -9] X [10, -10, -2] = | [-124, -52, -360] | thirdAngleOfTriangleFunc) | -| 44 | Compare Fractions | Which symbol represents the comparison between 10/6 and 10/8? | > | systemOfEquations | -| 45 | Simple Interest | Simple interest for a principle amount of 7091 dollars, 10% rate of interest and for a time period of 4 years is = | 2836.4 | "2x + 5y | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>2</td><td>8</td><td>-4</td><td>5</td></tr><tr><td>6</td><td>-5</td><td>-6</td><td>4</td></tr></table>and<table><tr><td>-5</td><td>1</td><td>-3</td><td>2</td></tr><tr><td>5</td><td>8</td><td>5</td><td>-5</td></tr><tr><td>-6</td><td>-8</td><td>-6</td><td>-7</td></tr><tr><td>-1</td><td>-5</td><td>3</td><td>-7</td></tr></table> | <table><tr><td>49</td><td>73</td><td>73</td><td>-43</td></tr><tr><td>-23</td><td>-6</td><td>5</td><td>51</td></tr></table> | systemOfEquationsFunc) | -| 47 | Cube Root | cuberoot of 951 upto 2 decimal places is: | 9.83 | distance2Point | -| 48 | Power Rule Integration | 10x^1 + 10x^6 + 1x^4 + 1x^6 | (10/1)x^2 + (10/6)x^7 + (1/4)x^5 + (1/6)x^7 + c | "Find the distance between (x1,y1) and (x2,y2)", | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 15 , 191, 94 = | 60 | "sqrt(distanceSquared)", distanceTwoPointsFunc) | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 48x^2+119x+57=0 | [-0.65, -1.83] | pythagoreanTheorem | -| 51 | HCF (Highest Common Factor) | HCF of 5 and 18 = | 1 | "Pythagorean Theorem", 25, | -| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/6 | "The hypotenuse of a right triangle given the other two lengths a and b | -| 53 | Exponentiation | 17^7 = | 410338673 | "hypotenuse", pythagoreanTheoremFunc) | -| 54 | Confidence interval For sample S | The confidence interval for sample [247, 230, 236, 207, 226, 278, 221, 297, 280, 267, 240, 259, 291, 284, 242, 252, 257, 220, 260, 213, 294] with 90% confidence is | (262.13973862175516, 242.71740423538768) | # This has multiple variables whereas #23 has only x and y | -| 55 | Comparing surds | Fill in the blanks 17^(1/2) _ 3^(1/6) | > | linearEquations | -| 56 | Fibonacci Series | The Fibonacci Series of the first 14 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233] | "x | -| 57 | Trigonometric Values | What is sin(90)? | 1 | primeFactors | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 7 sides = | 900 | "[b, c, d, ...]", primeFactorsFunc) | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[10, 47, 7, 37, 22, 44, 9, 30, 37, 8, 50, 29, 19, 12, 37] | The Mean is 26.533333333333335 , Standard Deviation is 214.38222222222217, Variance is 14.641797096744039 | fractionMultiplication | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 6m is | 452.3893421169302 m^2 | "(a/b)*(c/d) | -| 61 | Volume of Sphere | Volume of sphere with radius 54 m = | 659583.6608064842 m^3 | multiplyFractionsFunc) | -| 62 | nth Fibonacci number | What is the 5th Fibonacci number? | 5 | angleRegularPolygon | -| 63 | Profit or Loss Percent | Loss percent when CP = 801 and SP = 230 is: | 71.28589263420724 | "Angle of a Regular Polygon", 29, | -| 64 | Binary to Hexidecimal | 101111 | 0x2f | "Find the angle of a regular polygon with 6 sides", "120", | -| 65 | Multiplication of 2 complex numbers | (1+19j) * (-5+10j) = | (-195-85j) | regularPolygonAngleFunc) | -| 66 | Geometric Progression | For the given GP [8, 88, 968, 10648, 117128, 1288408] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 8, common ratio is 11 , 11th term is 207499396808 , sum upto 8th term is 171487104.0 | combinations | -| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 9 and 18 = | (9*18)^(1/2) = 12.727922061357855 | "Combinations of Objects", 30, | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 59 and 8 = | 2/((1/59) + (1/8)) = 14.08955223880597 | "Combinations available for picking 4 objects at a time from 6 distinct objects | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[868.2223524505417, 443.64852085459694, 828.1090462421802] is: | 1279.217986044348 | " 15", combinationsFunc) | -| 70 | Angle between 2 vectors | angle between the vectors [47.34750277983446, 802.0548522330859, 163.10760759590525, 544.7736923139344, 595.2668887448631, 781.8577226989729, 505.92984665962115, 212.21898772758718, 417.09503653850567, 498.8451357914803, 216.11050052884383, 316.85172611004697, 531.4467890864679] and [551.4845648456056, 524.0267675199452, 252.30514761182056, 256.4954536977715, 423.09002486817883, 861.6683390714214, 210.90265341510906, 918.3205871874211, 539.9315722140092, 988.4812675617247, 885.1803007416202, 566.6430154592439, 851.2210274645834] is: | NaN | factorial | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 51 and 3 = | 48 | surfaceAreaCubeGen | -| 72 | Dot Product of 2 Vectors | [4, 20, 12] . [15, 11, 9] = | 388 | "Surface area of cube with side a units is", | -| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | "b units^2", surfaceAreaCube) | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[2, 25, 60], [29, 30, 28], [23, 73, 95]]) is: | Matrix([[806/34457, 2005/34457, -1100/34457], [-2111/34457, -1190/34457, 1684/34457], [1427/34457, 429/34457, -665/34457]]) | surfaceAreaCuboidGen | -| 75 | Area of a Sector | Given radius, 28 and angle, 317. Find the area of the sector. | Area of sector = 2168.81594 | "Surface Area of Cuboid", 33, | -| 76 | Mean and Median | Given the series of numbers [67, 33, 40, 90, 81, 12, 91, 80, 5, 66]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 56.5 and Arithmetic median of this series is 66.5 | "Surface area of cuboid with sides | -| 77 | Determinant to 2x2 Matrix | Det([[10, 0], [95, 32]]) = | 320 | "d units^2", surfaceAreaCuboid) | -| 78 | Compound Interest | Compound Interest for a principle amount of 4156 dollars, 8% rate of interest and for a time period of 7 compounded monthly is = | 4156.0 | surfaceAreaCylinderGen | -| 79 | Decimal to Hexadecimal | Binary of 143= | 0x8f | "Surface Area of Cylinder", 34, | -| 80 | Percentage of a number | What is 49% of 13? | Required percentage = 6.37% | "Surface area of cylinder with height | -| 81 | Celsius To Fahrenheit | Convert 39 degrees Celsius to degrees Fahrenheit = | 102.2 | "c units^2", surfaceAreaCylinder) | +| 0 | Addition | 24+32= | 56 | addition | +| 1 | Subtraction | 14-4= | 10 | subtractionFunc | +| 2 | Multiplication | 28*3= | 84 | multiplicationFunc | +| 3 | Division | 55/39= | 1.4102564102564104 | divisionFunc | +| 4 | Binary Complement 1s | 1010000= | 0101111 | binaryComplement1sFunc | +| 5 | Modulo Division | 74%21= | 11 | moduloFunc | +| 6 | Square Root | sqrt(1)= | 1 | squareRootFunc | +| 7 | Power Rule Differentiation | 6x^5 + 10x^4 + 10x^9 | 30x^4 + 40x^3 + 90x^8 | powerRuleDifferentiationFunc | +| 8 | Square | 17^2= | 289 | squareFunc | +| 9 | LCM (Least Common Multiple) | LCM of 6 and 13 = | 78 | lcmFunc | +| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 3 = | 1 | gcdFunc | +| 11 | Basic Algebra | 3x + 9 = 9 | 0 | basicAlgebraFunc | +| 12 | Logarithm | log3(2187) | 7 | logFunc | +| 13 | Easy Division | 275/11 = | 25 | divisionToIntFunc | +| 14 | Decimal to Binary | Binary of 87= | 1010111 | DecimalToBinaryFunc | +| 15 | Binary to Decimal | 01111 | 15 | BinaryToDecimalFunc | +| 16 | Fraction Division | (1/8)/(8/1) | 1/64 | divideFractionsFunc | +| 17 | Integer Multiplication with 2x2 Matrix | 7 * [[7, 6], [1, 4]] = | [[49,42],[7,28]] | multiplyIntToMatrix22 | +| 18 | Area of Triangle | Area of triangle with side lengths: 8 5 18 = | (3.3825325984308986e-15+55.24094948496088j) | areaOfTriangleFunc | +| 19 | Triangle exists check | Does triangle with sides 22, 8 and 3 exist? | No | isTriangleValidFunc | +| 20 | Midpoint of the two point | (17,-8),(-14,-2)= | (1.5,-5.0) | MidPointOfTwoPointFunc | +| 21 | Factoring Quadratic | x^2+x-20 | (x+5)(x-4) | factoringFunc | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 36 and 55 = | 89 | thirdAngleOfTriangleFunc | +| 23 | Solve a System of Equations in R^2 | 2x - 7y = 56, -8x + 2y = 36 | x = -7, y = -10 | systemOfEquationsFunc | +| 24 | Distance between 2 points | Find the distance between (2, 19) and (3, 7) | sqrt(145) | distanceTwoPointsFunc | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 7 = | 17.46 | pythagoreanTheoremFunc | +| 26 | Linear Equations | -14x + -15y = 219 +8x = -48 | x = -6, y = -9 | linearEquationsFunc | +| 27 | Prime Factorisation | Find prime factors of 73 | [73] | primeFactorsFunc | +| 28 | Fraction Multiplication | (8/10)*(6/5) | 24/25 | multiplyFractionsFunc | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | regularPolygonAngleFunc | +| 30 | Combinations of Objects | Number of combinations from 15 objects picked 8 at a time | 6435 | combinationsFunc | +| 31 | Factorial | 4! = | 24 | factorialFunc | +| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surfaceAreaCube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 18m, 11m, 19m is | 1498 m^2 | surfaceAreaCuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 m^2 | surfaceAreaCylinder | +| 35 | Volum of Cube | Volume of cube with side = 5m is | 125 m^3 | volumeCube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 3m, 11m, 3m is | 99 m^3 | volumeCuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 20m and radius = 7m is | 3078 m^3 | volumeCylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 23m and radius = 2m is | 157 m^2 | surfaceAreaCone | +| 39 | Volume of cone | Volume of cone with height = 44m and radius = 5m is | 1151 m^3 | volumeCone | +| 40 | Common Factors | Common Factors of 99 and 93 = | [1, 3] | commonFactorsFunc | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10/3x - 8 and y = -10x + 4 | (9/10, -5) | intersectionOfTwoLinesFunc | +| 42 | Permutations | Number of Permutations from 19 objects picked 5 at a time = | 1395360 | permutationFunc | +| 43 | Cross Product of 2 Vectors | [0, 2, -6] X [4, 13, 15] = | [108, -24, -8] | vectorCrossFunc | +| 44 | Compare Fractions | Which symbol represents the comparison between 1/7 and 7/10? | < | compareFractionsFunc | +| 45 | Simple Interest | Simple interest for a principle amount of 9501 dollars, 10% rate of interest and for a time period of 10 years is = | 9501.0 | simpleInterestFunc | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>-10</td><td>6</td></tr><tr><td>2</td><td>-4</td></tr><tr><td>1</td><td>-8</td></tr><tr><td>-7</td><td>4</td></tr></table>and<table><tr><td>-5</td><td>-2</td></tr><tr><td>-3</td><td>-8</td></tr></table> | <table><tr><td>32</td><td>-28</td></tr><tr><td>2</td><td>28</td></tr><tr><td>19</td><td>62</td></tr><tr><td>23</td><td>-18</td></tr></table> | matrixMultiplicationFunc | +| 47 | Cube Root | cuberoot of 100 upto 2 decimal places is: | 4.64 | cubeRootFunc | +| 48 | Power Rule Integration | 9x^9 | (9/9)x^10 + c | powerRuleIntegrationFunc | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 84, 126 = | 121 | fourthAngleOfQuadriFunc | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 39x^2+176x+64=0 | [-0.4, -4.11] | quadraticEquation | +| 51 | HCF (Highest Common Factor) | HCF of 7 and 9 = | 1 | hcfFunc | +| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 13 = | 21/216 | DiceSumProbFunc | +| 53 | Exponentiation | 6^4 = | 1296 | exponentiationFunc | +| 54 | Confidence interval For sample S | The confidence interval for sample [293, 222, 227, 237, 299, 265, 238, 273, 229, 236, 286, 243, 220, 233, 224, 226, 257, 285, 268, 271, 247, 262] with 90% confidence is | (260.4441418746136, 243.28313085265916) | confidenceIntervalFunc | +| 55 | Comparing surds | Fill in the blanks 66^(1/5) _ 74^(1/6) | > | surdsComparisonFunc | +| 56 | Fibonacci Series | The Fibonacci Series of the first 18 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597] | fibonacciSeriesFunc | +| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometryFunc | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 4 sides = | 360 | sumOfAnglesOfPolygonFunc | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 20, 40, 14, 41, 42, 12, 18, 26, 41, 16, 48, 37, 30, 18] | The Mean is 28.933333333333334 , Standard Deviation is 134.86222222222221, Variance is 11.61301951355556 | dataSummaryFunc | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 16m is | 3216.990877275948 m^2 | surfaceAreaSphere | +| 61 | Volume of Sphere | Volume of sphere with radius 10 m = | 4188.790204786391 m^3 | volumeSphereFunc | +| 62 | nth Fibonacci number | What is the 65th Fibonacci number? | 17167680177565 | nthFibonacciNumberFunc | +| 63 | Profit or Loss Percent | Loss percent when CP = 639 and SP = 20 is: | 96.87010954616588 | profitLossPercentFunc | +| 64 | Binary to Hexidecimal | 10000010 | 0x82 | binaryToHexFunc | +| 65 | Multiplication of 2 complex numbers | (-16-5j) * (13+4j) = | (-188-129j) | multiplyComplexNumbersFunc | +| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,7th term value, sum upto 11th term | The value of a is 5, common ratio is 6 , 7th term is 233280 , sum upto 11th term is 362797055.0 | geomProgrFunc | +| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 12 , 76 and 88 = | (12*76*88)^(1/3) = 43.134606135637426 | geometricMeanFunc | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 32 , 82 , 98 , 59 = | 4/((1/32) + (1/82) + (1/98) + (1/59)) = 56.658543052293126 | harmonicMeanFunc | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[30.49374303007102, 744.9799127067523, 232.71392717506222, 219.07162873155772, 268.6667105157799, 655.700721848602, 630.8781230231998, 525.0331442958861, 603.1960329056955] is: | 1482.467804008134 | euclidianNormFunc | +| 70 | Angle between 2 vectors | angle between the vectors [411.45287273810993, 475.5310005335923, 585.8235737751623, 654.4447552592987, 7.9372591993011055, 944.1669660662357, 82.85267978544842, 855.1153353684535, 401.897628624623, 208.74276524448533, 18.113378046332063, 329.92425644581766, 656.1658677733768] and [340.21944929120787, 595.8624349766976, 458.3226781953552, 460.8316651658132, 237.2935680919427, 562.2537489196774, 705.3352878976389, 21.91461098842251, 950.6814899692208, 879.1343421626799, 177.86771165838067, 867.0564995964864, 762.591298578088] is: | NaN | angleBtwVectorsFunc | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -22 and 85 = | 107 | absoluteDifferenceFunc | +| 72 | Dot Product of 2 Vectors | [-4, -15, -19] . [-12, -18, -13] = | 565 | vectorDotFunc | +| 73 | Binary 2's Complement | 2's complement of = | | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[23, 14, 90], [15, 42, 7], [37, 19, 79]]) is: | Matrix([[-3185/53919, -604/53919, 3682/53919], [926/53919, 1513/53919, -1189/53919], [47/1997, -3/1997, -28/1997]]) | matrixInversion | +| 75 | Area of a Sector | Given radius, 32 and angle, 182. Find the area of the sector. | Area of sector = 1626.36761 | sectorAreaFunc | +| 76 | Mean and Median | Given the series of numbers [83, 63, 31, 44, 12, 73, 42, 51, 93, 3]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.5 and Arithmetic median of this series is 47.5 | meanMedianFunc | +| 77 | Determinant to 2x2 Matrix | Det([[35, 67], [54, 48]]) = | -1938 | determinantToMatrix22 | +| 78 | Compound Interest | Compound Interest for a principle amount of 4487 dollars, 5% rate of interest and for a time period of 9 compounded monthly is = | 4487.0 | compoundInterestFunc | +| 79 | Decimal to Hexadecimal | Binary of 992= | 0x3e0 | deciToHexaFunc | +| 80 | Percentage of a number | What is 37% of 83? | Required percentage = 30.71% | percentageFunc | +| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | celsiustofahrenheit | +| 82 | AP Term Calculation | Find the term number 31 of the AP series: -53, -107, -161 ... | -1673 | arithmeticProgressionTermFunc | +| 83 | AP Sum Calculation | Find the sum of first 56 terms of the AP series: -14, -24, -34 ... | -16184.0 | arithmeticProgressionSumFunc | +| 84 | Converts decimal to octal | The decimal number 1430 in Octal is: | 0o2626 | decimalToOctalFunc | +| 85 | Converts decimal to Roman Numerals | The number 3537 in Roman Numerals is: | MMMDXXXVII | decimalToRomanNumeralsFunc | +| 86 | Degrees to Radians | Angle 87 in radians is = | 1.52 | degreeToRadFunc | +| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | diff --git a/makeReadme.py b/makeReadme.py index f3efc3f..fb2894c 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -2,6 +2,7 @@ # NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * + def array2markdown_table(string): string = string.replace("[[", "<table><tr><td>") string = string.replace("[", "<tr><td>") @@ -20,29 +21,31 @@ 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 + # print(item[3]) prob, solu = myGen() prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - prob, solu = myGen(10, 4) + prob, solu = myGen(maxVal=10, max_dim=4) prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") prob = array2markdown_table(prob) solu = array2markdown_table(solu) - instName = lines[line] + # instName = lines[line] # NOTE: renamed 'def_name' to 'func_name' because it suits it more - func_name = instName[:instName.find('=')].strip() + #func_name = instName[:instName.find('=')].strip() + func_name = item[3] row = [myGen.id, myGen.title, prob, solu, func_name] - print('added', item[1],'-', func_name, 'to the README.md') - line += 1 - if line > len(lines): - break + print('added', item[1], '-', func_name, 'to the README.md') + # line += 1 + # if line > len(lines): + # break allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 956697a..33669b5 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -1,3 +1,5 @@ +import sys +import traceback genList = [] @@ -8,7 +10,12 @@ class Generator: self.generalProb = generalProb self.generalSol = generalSol self.func = func - genList.append([id, title, self]) + + (filename, line_number, function_name, text) = traceback.extract_stack()[-2] + funcname = filename[filename.rfind('/'):].strip() + funcname = funcname[1:-3] + print(funcname) + genList.append([id, title, self, funcname]) def __str__(self): return str( diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index 65ec973..9d8d817 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,5 +1,6 @@ from .__init__ import * from ..__init__ import Generator +import math def angleBtwVectorsFunc(maxEltAmt=20): @@ -15,7 +16,7 @@ def angleBtwVectorsFunc(maxEltAmt=20): solution = '' try: solution = str(math.acos(s / mags)) - except MathDomainError: + except ValueError: print('angleBtwVectorsFunc has some issues with math module, line 16') solution = 'NaN' # would return the answer in radians diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplicationFunc.py index 1d1d339..2994ad6 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplicationFunc.py @@ -4,7 +4,10 @@ from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): a = random.randint(0, maxMulti) - b = random.randint(0, min(int(maxMulti / a), maxRes)) + if a == 0: + b = random.randint(0, maxRes) + else: + b = random.randint(0, min(int(maxMulti / a), maxRes)) c = a * b problem = str(a) + "*" + str(b) + "=" diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radianToDegFunc.py index b9c7b56..5948eb7 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radianToDegFunc.py @@ -2,7 +2,8 @@ from .__init__ import * from numpy import pi -def radianToDegFunc(max_rad=pi): +def radianToDegFunc(max_rad=3): + # max_rad is supposed to be pi but random can't handle non-integer a = random.randint(0, max_rad) b = (180 * a) / pi b = round(b, 2) diff --git a/test.py b/test.py index 88a2724..8cd6bd0 100644 --- a/test.py +++ b/test.py @@ -3,10 +3,13 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(79)) +print(mathgen.genById(70)) # prints each generator in genList - +""" list = mathgen.getGenList() for item in list: print(item[2]) + +print(mathgen.getGenList()) +""" From 507eb4ff7603b61478066eacf5404dd0c16b43aa Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 10:19:03 -0400 Subject: [PATCH 79/99] Removed excessive print statements --- README.md | 174 ++++++++++++------------- makeReadme.py | 10 -- mathgenerator/__init__.py | 2 +- mathgenerator/funcs/dataSummaryFunc.py | 9 +- 4 files changed, 91 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index ca34822..87ca9e6 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 24+32= | 56 | addition | -| 1 | Subtraction | 14-4= | 10 | subtractionFunc | -| 2 | Multiplication | 28*3= | 84 | multiplicationFunc | -| 3 | Division | 55/39= | 1.4102564102564104 | divisionFunc | -| 4 | Binary Complement 1s | 1010000= | 0101111 | binaryComplement1sFunc | -| 5 | Modulo Division | 74%21= | 11 | moduloFunc | -| 6 | Square Root | sqrt(1)= | 1 | squareRootFunc | -| 7 | Power Rule Differentiation | 6x^5 + 10x^4 + 10x^9 | 30x^4 + 40x^3 + 90x^8 | powerRuleDifferentiationFunc | -| 8 | Square | 17^2= | 289 | squareFunc | -| 9 | LCM (Least Common Multiple) | LCM of 6 and 13 = | 78 | lcmFunc | -| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 3 = | 1 | gcdFunc | -| 11 | Basic Algebra | 3x + 9 = 9 | 0 | basicAlgebraFunc | -| 12 | Logarithm | log3(2187) | 7 | logFunc | -| 13 | Easy Division | 275/11 = | 25 | divisionToIntFunc | -| 14 | Decimal to Binary | Binary of 87= | 1010111 | DecimalToBinaryFunc | -| 15 | Binary to Decimal | 01111 | 15 | BinaryToDecimalFunc | -| 16 | Fraction Division | (1/8)/(8/1) | 1/64 | divideFractionsFunc | -| 17 | Integer Multiplication with 2x2 Matrix | 7 * [[7, 6], [1, 4]] = | [[49,42],[7,28]] | multiplyIntToMatrix22 | -| 18 | Area of Triangle | Area of triangle with side lengths: 8 5 18 = | (3.3825325984308986e-15+55.24094948496088j) | areaOfTriangleFunc | -| 19 | Triangle exists check | Does triangle with sides 22, 8 and 3 exist? | No | isTriangleValidFunc | -| 20 | Midpoint of the two point | (17,-8),(-14,-2)= | (1.5,-5.0) | MidPointOfTwoPointFunc | -| 21 | Factoring Quadratic | x^2+x-20 | (x+5)(x-4) | factoringFunc | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 36 and 55 = | 89 | thirdAngleOfTriangleFunc | -| 23 | Solve a System of Equations in R^2 | 2x - 7y = 56, -8x + 2y = 36 | x = -7, y = -10 | systemOfEquationsFunc | -| 24 | Distance between 2 points | Find the distance between (2, 19) and (3, 7) | sqrt(145) | distanceTwoPointsFunc | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 16 and 7 = | 17.46 | pythagoreanTheoremFunc | -| 26 | Linear Equations | -14x + -15y = 219 -8x = -48 | x = -6, y = -9 | linearEquationsFunc | -| 27 | Prime Factorisation | Find prime factors of 73 | [73] | primeFactorsFunc | -| 28 | Fraction Multiplication | (8/10)*(6/5) | 24/25 | multiplyFractionsFunc | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 15 sides | 156.0 | regularPolygonAngleFunc | -| 30 | Combinations of Objects | Number of combinations from 15 objects picked 8 at a time | 6435 | combinationsFunc | -| 31 | Factorial | 4! = | 24 | factorialFunc | -| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surfaceAreaCube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 18m, 11m, 19m is | 1498 m^2 | surfaceAreaCuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 m^2 | surfaceAreaCylinder | -| 35 | Volum of Cube | Volume of cube with side = 5m is | 125 m^3 | volumeCube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 3m, 11m, 3m is | 99 m^3 | volumeCuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 20m and radius = 7m is | 3078 m^3 | volumeCylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 23m and radius = 2m is | 157 m^2 | surfaceAreaCone | -| 39 | Volume of cone | Volume of cone with height = 44m and radius = 5m is | 1151 m^3 | volumeCone | -| 40 | Common Factors | Common Factors of 99 and 93 = | [1, 3] | commonFactorsFunc | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10/3x - 8 and y = -10x + 4 | (9/10, -5) | intersectionOfTwoLinesFunc | -| 42 | Permutations | Number of Permutations from 19 objects picked 5 at a time = | 1395360 | permutationFunc | -| 43 | Cross Product of 2 Vectors | [0, 2, -6] X [4, 13, 15] = | [108, -24, -8] | vectorCrossFunc | -| 44 | Compare Fractions | Which symbol represents the comparison between 1/7 and 7/10? | < | compareFractionsFunc | -| 45 | Simple Interest | Simple interest for a principle amount of 9501 dollars, 10% rate of interest and for a time period of 10 years is = | 9501.0 | simpleInterestFunc | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>-10</td><td>6</td></tr><tr><td>2</td><td>-4</td></tr><tr><td>1</td><td>-8</td></tr><tr><td>-7</td><td>4</td></tr></table>and<table><tr><td>-5</td><td>-2</td></tr><tr><td>-3</td><td>-8</td></tr></table> | <table><tr><td>32</td><td>-28</td></tr><tr><td>2</td><td>28</td></tr><tr><td>19</td><td>62</td></tr><tr><td>23</td><td>-18</td></tr></table> | matrixMultiplicationFunc | -| 47 | Cube Root | cuberoot of 100 upto 2 decimal places is: | 4.64 | cubeRootFunc | -| 48 | Power Rule Integration | 9x^9 | (9/9)x^10 + c | powerRuleIntegrationFunc | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 84, 126 = | 121 | fourthAngleOfQuadriFunc | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 39x^2+176x+64=0 | [-0.4, -4.11] | quadraticEquation | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 9 = | 1 | hcfFunc | +| 0 | Addition | 39+14= | 53 | addition | +| 1 | Subtraction | 28-20= | 8 | subtractionFunc | +| 2 | Multiplication | 23*2= | 46 | multiplicationFunc | +| 3 | Division | 34/27= | 1.2592592592592593 | divisionFunc | +| 4 | Binary Complement 1s | 01101= | 10010 | binaryComplement1sFunc | +| 5 | Modulo Division | 27%67= | 27 | moduloFunc | +| 6 | Square Root | sqrt(81)= | 9 | squareRootFunc | +| 7 | Power Rule Differentiation | 7x^2 + 1x^4 + 4x^8 + 5x^10 | 14x^1 + 4x^3 + 32x^7 + 50x^9 | powerRuleDifferentiationFunc | +| 8 | Square | 2^2= | 4 | squareFunc | +| 9 | LCM (Least Common Multiple) | LCM of 7 and 10 = | 70 | lcmFunc | +| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 3 = | 3 | gcdFunc | +| 11 | Basic Algebra | 9x + 8 = 9 | 1/9 | basicAlgebraFunc | +| 12 | Logarithm | log2(32) | 5 | logFunc | +| 13 | Easy Division | 176/11 = | 16 | divisionToIntFunc | +| 14 | Decimal to Binary | Binary of 49= | 110001 | DecimalToBinaryFunc | +| 15 | Binary to Decimal | 01100 | 12 | BinaryToDecimalFunc | +| 16 | Fraction Division | (9/5)/(10/2) | 9/25 | divideFractionsFunc | +| 17 | Integer Multiplication with 2x2 Matrix | 8 * [[8, 9], [0, 3]] = | [[64,72],[0,24]] | multiplyIntToMatrix22 | +| 18 | Area of Triangle | Area of triangle with side lengths: 19 2 15 = | (1.7998558638262156e-15+29.393876913398138j) | areaOfTriangleFunc | +| 19 | Triangle exists check | Does triangle with sides 9, 12 and 5 exist? | Yes | isTriangleValidFunc | +| 20 | Midpoint of the two point | (-3,-3),(-7,-4)= | (-5.0,-3.5) | MidPointOfTwoPointFunc | +| 21 | Factoring Quadratic | x^2+4x-12 | (x+6)(x-2) | factoringFunc | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 4 and 27 = | 149 | thirdAngleOfTriangleFunc | +| 23 | Solve a System of Equations in R^2 | -6x - 10y = 22, 4x - 3y = 53 | x = 8, y = -7 | systemOfEquationsFunc | +| 24 | Distance between 2 points | Find the distance between (6, 2) and (-2, -2) | sqrt(80) | distanceTwoPointsFunc | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 13 = | 16.40 | pythagoreanTheoremFunc | +| 26 | Linear Equations | 8x + -8y = -40 +20x + -16y = -108 | x = -7, y = -2 | linearEquationsFunc | +| 27 | Prime Factorisation | Find prime factors of 29 | [29] | primeFactorsFunc | +| 28 | Fraction Multiplication | (4/7)*(3/9) | 4/21 | multiplyFractionsFunc | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | regularPolygonAngleFunc | +| 30 | Combinations of Objects | Number of combinations from 20 objects picked 5 at a time | 15504 | combinationsFunc | +| 31 | Factorial | 3! = | 6 | factorialFunc | +| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surfaceAreaCube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 4m, 15m, 5m is | 310 m^2 | surfaceAreaCuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 14m and radius = 11m is | 1727 m^2 | surfaceAreaCylinder | +| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volumeCube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 9m, 6m, 15m is | 810 m^3 | volumeCuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 21m and radius = 4m is | 1055 m^3 | volumeCylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 7m and radius = 7m is | 371 m^2 | surfaceAreaCone | +| 39 | Volume of cone | Volume of cone with height = 46m and radius = 15m is | 10838 m^3 | volumeCone | +| 40 | Common Factors | Common Factors of 12 and 76 = | [1, 2, 4] | commonFactorsFunc | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6x + 8 and y = 3/2x + 4 | (-8/9, 8/3) | intersectionOfTwoLinesFunc | +| 42 | Permutations | Number of Permutations from 15 objects picked 5 at a time = | 360360 | permutationFunc | +| 43 | Cross Product of 2 Vectors | [-13, -2, 0] X [-4, 14, -4] = | [8, -52, -190] | vectorCrossFunc | +| 44 | Compare Fractions | Which symbol represents the comparison between 3/8 and 3/9? | > | compareFractionsFunc | +| 45 | Simple Interest | Simple interest for a principle amount of 6266 dollars, 8% rate of interest and for a time period of 3 years is = | 1503.84 | simpleInterestFunc | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>3</td><td>0</td></tr><tr><td>-1</td><td>-6</td></tr></table>and<table><tr><td>4</td><td>-7</td><td>5</td><td>-9</td></tr><tr><td>0</td><td>8</td><td>-10</td><td>-2</td></tr></table> | <table><tr><td>12</td><td>-21</td><td>15</td><td>-27</td></tr><tr><td>-4</td><td>-41</td><td>55</td><td>21</td></tr></table> | matrixMultiplicationFunc | +| 47 | Cube Root | cuberoot of 362 upto 2 decimal places is: | 7.13 | cubeRootFunc | +| 48 | Power Rule Integration | 2x^6 + 1x^5 + 7x^9 + 1x^10 | (2/6)x^7 + (1/5)x^6 + (7/9)x^10 + (1/10)x^11 + c | powerRuleIntegrationFunc | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 60 , 18, 7 = | 275 | fourthAngleOfQuadriFunc | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 40x^2+121x+89=0 | [-1.26, -1.76] | quadraticEquation | +| 51 | HCF (Highest Common Factor) | HCF of 4 and 12 = | 4 | hcfFunc | | 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 13 = | 21/216 | DiceSumProbFunc | -| 53 | Exponentiation | 6^4 = | 1296 | exponentiationFunc | -| 54 | Confidence interval For sample S | The confidence interval for sample [293, 222, 227, 237, 299, 265, 238, 273, 229, 236, 286, 243, 220, 233, 224, 226, 257, 285, 268, 271, 247, 262] with 90% confidence is | (260.4441418746136, 243.28313085265916) | confidenceIntervalFunc | -| 55 | Comparing surds | Fill in the blanks 66^(1/5) _ 74^(1/6) | > | surdsComparisonFunc | -| 56 | Fibonacci Series | The Fibonacci Series of the first 18 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597] | fibonacciSeriesFunc | -| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometryFunc | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 4 sides = | 360 | sumOfAnglesOfPolygonFunc | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 20, 40, 14, 41, 42, 12, 18, 26, 41, 16, 48, 37, 30, 18] | The Mean is 28.933333333333334 , Standard Deviation is 134.86222222222221, Variance is 11.61301951355556 | dataSummaryFunc | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 16m is | 3216.990877275948 m^2 | surfaceAreaSphere | -| 61 | Volume of Sphere | Volume of sphere with radius 10 m = | 4188.790204786391 m^3 | volumeSphereFunc | -| 62 | nth Fibonacci number | What is the 65th Fibonacci number? | 17167680177565 | nthFibonacciNumberFunc | -| 63 | Profit or Loss Percent | Loss percent when CP = 639 and SP = 20 is: | 96.87010954616588 | profitLossPercentFunc | -| 64 | Binary to Hexidecimal | 10000010 | 0x82 | binaryToHexFunc | -| 65 | Multiplication of 2 complex numbers | (-16-5j) * (13+4j) = | (-188-129j) | multiplyComplexNumbersFunc | -| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,7th term value, sum upto 11th term | The value of a is 5, common ratio is 6 , 7th term is 233280 , sum upto 11th term is 362797055.0 | geomProgrFunc | -| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 12 , 76 and 88 = | (12*76*88)^(1/3) = 43.134606135637426 | geometricMeanFunc | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 32 , 82 , 98 , 59 = | 4/((1/32) + (1/82) + (1/98) + (1/59)) = 56.658543052293126 | harmonicMeanFunc | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[30.49374303007102, 744.9799127067523, 232.71392717506222, 219.07162873155772, 268.6667105157799, 655.700721848602, 630.8781230231998, 525.0331442958861, 603.1960329056955] is: | 1482.467804008134 | euclidianNormFunc | -| 70 | Angle between 2 vectors | angle between the vectors [411.45287273810993, 475.5310005335923, 585.8235737751623, 654.4447552592987, 7.9372591993011055, 944.1669660662357, 82.85267978544842, 855.1153353684535, 401.897628624623, 208.74276524448533, 18.113378046332063, 329.92425644581766, 656.1658677733768] and [340.21944929120787, 595.8624349766976, 458.3226781953552, 460.8316651658132, 237.2935680919427, 562.2537489196774, 705.3352878976389, 21.91461098842251, 950.6814899692208, 879.1343421626799, 177.86771165838067, 867.0564995964864, 762.591298578088] is: | NaN | angleBtwVectorsFunc | -| 71 | Absolute difference between two numbers | Absolute difference between numbers -22 and 85 = | 107 | absoluteDifferenceFunc | -| 72 | Dot Product of 2 Vectors | [-4, -15, -19] . [-12, -18, -13] = | 565 | vectorDotFunc | -| 73 | Binary 2's Complement | 2's complement of = | | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[23, 14, 90], [15, 42, 7], [37, 19, 79]]) is: | Matrix([[-3185/53919, -604/53919, 3682/53919], [926/53919, 1513/53919, -1189/53919], [47/1997, -3/1997, -28/1997]]) | matrixInversion | -| 75 | Area of a Sector | Given radius, 32 and angle, 182. Find the area of the sector. | Area of sector = 1626.36761 | sectorAreaFunc | -| 76 | Mean and Median | Given the series of numbers [83, 63, 31, 44, 12, 73, 42, 51, 93, 3]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.5 and Arithmetic median of this series is 47.5 | meanMedianFunc | -| 77 | Determinant to 2x2 Matrix | Det([[35, 67], [54, 48]]) = | -1938 | determinantToMatrix22 | -| 78 | Compound Interest | Compound Interest for a principle amount of 4487 dollars, 5% rate of interest and for a time period of 9 compounded monthly is = | 4487.0 | compoundInterestFunc | -| 79 | Decimal to Hexadecimal | Binary of 992= | 0x3e0 | deciToHexaFunc | -| 80 | Percentage of a number | What is 37% of 83? | Required percentage = 30.71% | percentageFunc | -| 81 | Celsius To Fahrenheit | Convert 15 degrees Celsius to degrees Fahrenheit = | 59.0 | celsiustofahrenheit | -| 82 | AP Term Calculation | Find the term number 31 of the AP series: -53, -107, -161 ... | -1673 | arithmeticProgressionTermFunc | -| 83 | AP Sum Calculation | Find the sum of first 56 terms of the AP series: -14, -24, -34 ... | -16184.0 | arithmeticProgressionSumFunc | -| 84 | Converts decimal to octal | The decimal number 1430 in Octal is: | 0o2626 | decimalToOctalFunc | -| 85 | Converts decimal to Roman Numerals | The number 3537 in Roman Numerals is: | MMMDXXXVII | decimalToRomanNumeralsFunc | -| 86 | Degrees to Radians | Angle 87 in radians is = | 1.52 | degreeToRadFunc | +| 53 | Exponentiation | 11^8 = | 214358881 | exponentiationFunc | +| 54 | Confidence interval For sample S | The confidence interval for sample [239, 265, 215, 283, 231, 296, 270, 260, 289, 271, 245, 251, 206, 255, 257, 247, 292, 232, 276, 297, 263, 254, 279, 253, 211, 236, 274, 209, 275, 278, 212, 214, 226, 230, 256, 249, 293] with 95% confidence is | (262.3172302973649, 245.19628321614857) | confidenceIntervalFunc | +| 55 | Comparing surds | Fill in the blanks 86^(1/4) _ 39^(1/1) | < | surdsComparisonFunc | +| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeriesFunc | +| 57 | Trigonometric Values | What is sin(90)? | 1 | basicTrigonometryFunc | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sumOfAnglesOfPolygonFunc | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[19, 23, 36, 18, 44, 47, 18, 40, 27, 25, 14, 16, 6, 29, 50] | The Mean is 27.466666666666665 , Standard Deviation is 163.0488888888889, Variance is 12.769059827915637 | dataSummaryFunc | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 5m is | 314.1592653589793 m^2 | surfaceAreaSphere | +| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphereFunc | +| 62 | nth Fibonacci number | What is the 60th Fibonacci number? | 1548008755920 | nthFibonacciNumberFunc | +| 63 | Profit or Loss Percent | Profit percent when CP = 121 and SP = 615 is: | 408.26446280991735 | profitLossPercentFunc | +| 64 | Binary to Hexidecimal | 10110 | 0x16 | binaryToHexFunc | +| 65 | Multiplication of 2 complex numbers | (20-1j) * (-7+14j) = | (-126+287j) | multiplyComplexNumbersFunc | +| 66 | Geometric Progression | For the given GP [2, 24, 288, 3456, 41472, 497664] ,Find the value of a,common ratio,9th term value, sum upto 10th term | The value of a is 2, common ratio is 12 , 9th term is 859963392 , sum upto 10th term is 11257702586.0 | geomProgrFunc | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 18 , 24 , 99 , 12 = | (18*24*99*12)^(1/4) = 26.765480655440626 | geometricMeanFunc | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 41 and 82 = | 2/((1/41) + (1/82)) = 54.66666666666666 | harmonicMeanFunc | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[690.1926568125737, 148.904898302192, 222.19798825467595, 667.3276829127157, 366.9178192723557, 875.6869024243441, 336.14075266140685, 949.1256775112896, 626.0180041672427, 290.7427227038134, 207.55193301803965, 64.93900706542944, 736.3114771837603, 785.1756497858677] is: | 2142.639328828992 | euclidianNormFunc | +| 70 | Angle between 2 vectors | angle between the vectors [293.12905111302047, 909.0452944804068, 423.60965609823086, 870.8703924858319, 958.9076883380749, 837.4625321599826] and [938.5559146533071, 63.15299226225102, 418.14038421596024, 865.5267136591071, 513.9066820998474, 680.6577264839382] is: | NaN | angleBtwVectorsFunc | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 76 and -20 = | 96 | absoluteDifferenceFunc | +| 72 | Dot Product of 2 Vectors | [19, 10, -5] . [0, -18, 15] = | -255 | vectorDotFunc | +| 73 | Binary 2's Complement | 2's complement of 110 = | 10 | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[61, 68, 75], [31, 77, 66], [33, 59, 58]]) is: | Matrix([[11/141, 37/564, -33/188], [95/1833, 1063/7332, -567/2444], [-178/1833, -1355/7332, 863/2444]]) | matrixInversion | +| 75 | Area of a Sector | Given radius, 20 and angle, 235. Find the area of the sector. | Area of sector = 820.30475 | sectorAreaFunc | +| 76 | Mean and Median | Given the series of numbers [7, 89, 72, 14, 97, 48, 35, 12, 11, 27]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 41.2 and Arithmetic median of this series is 31.0 | meanMedianFunc | +| 77 | Determinant to 2x2 Matrix | Det([[26, 78], [39, 24]]) = | -2418 | determinantToMatrix22 | +| 78 | Compound Interest | Compound Interest for a principle amount of 6842 dollars, 8% rate of interest and for a time period of 5 compounded monthly is = | 6842.0 | compoundInterestFunc | +| 79 | Decimal to Hexadecimal | Binary of 860= | 0x35c | deciToHexaFunc | +| 80 | Percentage of a number | What is 75% of 28? | Required percentage = 21.00% | percentageFunc | +| 81 | Celsius To Fahrenheit | Convert 30 degrees Celsius to degrees Fahrenheit = | 86.0 | celsiustofahrenheit | +| 82 | AP Term Calculation | Find the term number 47 of the AP series: -56, 37, 130 ... | 4222 | arithmeticProgressionTermFunc | +| 83 | AP Sum Calculation | Find the sum of first 79 terms of the AP series: 34, 24, 14 ... | -28124.0 | arithmeticProgressionSumFunc | +| 84 | Converts decimal to octal | The decimal number 2245 in Octal is: | 0o4305 | decimalToOctalFunc | +| 85 | Converts decimal to Roman Numerals | The number 1658 in Roman Numerals is: | MDCLVIII | decimalToRomanNumeralsFunc | +| 86 | Degrees to Radians | Angle 12 in radians is = | 0.21 | degreeToRadFunc | | 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | diff --git a/makeReadme.py b/makeReadme.py index fb2894c..c17e15b 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -1,5 +1,3 @@ -# To use, paste at bottom of mathgen.py code, change line variable and remove all table rows in README.md except for the top 2 and run mathgen.py -# NOTE: not anymore. but still leaving this comment in. from mathgenerator.mathgen import * @@ -20,12 +18,9 @@ with open('mathgenerator/mathgen.py', 'r') as f: lines = f.readlines() allRows = [] -# 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 - # print(item[3]) prob, solu = myGen() prob = str(prob).rstrip("\n") solu = str(solu).rstrip("\n") @@ -37,15 +32,10 @@ for item in wList: prob = array2markdown_table(prob) solu = array2markdown_table(solu) - # instName = lines[line] # NOTE: renamed 'def_name' to 'func_name' because it suits it more - #func_name = instName[:instName.find('=')].strip() func_name = item[3] row = [myGen.id, myGen.title, prob, solu, func_name] print('added', item[1], '-', func_name, 'to the README.md') - # line += 1 - # if line > len(lines): - # break allRows.append(row) with open('README.md', "r") as g: diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index 33669b5..c4cea28 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -14,7 +14,7 @@ class Generator: (filename, line_number, function_name, text) = traceback.extract_stack()[-2] funcname = filename[filename.rfind('/'):].strip() funcname = funcname[1:-3] - print(funcname) + # print(funcname) genList.append([id, title, self, funcname]) def __str__(self): diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/dataSummaryFunc.py index cd5db00..9cd5a8f 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/dataSummaryFunc.py @@ -16,16 +16,13 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): for i in range(number_values): 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) + standardDeviation = var / number_values + variance = (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, standardDeviation, variance) return problem, solution From cbede21ddf0811f3644d7fb507d794d83156f6f4 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:30:55 -0400 Subject: [PATCH 80/99] renamed modules and generators to fit pep8 --- mathgenerator/funcs/__init__.py | 176 +++++++++--------- ...fferenceFunc.py => absolute_difference.py} | 3 +- mathgenerator/funcs/addition.py | 1 - ...BtwVectorsFunc.py => angle_btw_vectors.py} | 3 +- ...nAngleFunc.py => angle_regular_polygon.py} | 3 +- ...aOfTriangleFunc.py => area_of_triangle.py} | 7 +- ...mFunc.py => arithmetic_progression_sum.py} | 7 +- ...Func.py => arithmetic_progression_term.py} | 7 +- .../{basicAlgebraFunc.py => basic_algebra.py} | 5 +- ...gonometryFunc.py => basic_trigonometry.py} | 5 +- ...sComplement.py => binary_2s_complement.py} | 7 +- ...ement1sFunc.py => binary_complement_1s.py} | 5 +- ...yToDecimalFunc.py => binary_to_decimal.py} | 7 +- .../{binaryToHexFunc.py => binary_to_hex.py} | 5 +- ...fahrenheit.py => celsius_to_fahrenheit.py} | 5 +- .../{combinationsFunc.py => combinations.py} | 1 - ...commonFactorsFunc.py => common_factors.py} | 7 +- ...eFractionsFunc.py => compare_fractions.py} | 3 +- ...ndInterestFunc.py => compound_interest.py} | 3 +- ...IntervalFunc.py => confidence_interval.py} | 7 +- .../funcs/{cubeRootFunc.py => cube_root.py} | 5 +- .../{dataSummaryFunc.py => data_summary.py} | 5 +- ...alToBinaryFunc.py => decimal_to_binary.py} | 5 +- ...ciToHexaFunc.py => decimal_to_hexadeci.py} | 5 +- ...imalToOctalFunc.py => decimal_to_octal.py} | 4 +- ...lsFunc.py => decimal_to_roman_numerals.py} | 4 +- .../{degreeToRadFunc.py => degree_to_rad.py} | 3 +- ...SumProbFunc.py => dice_sum_probability.py} | 3 +- ...woPointsFunc.py => distance_two_points.py} | 7 +- ...deFractionsFunc.py => divide_fractions.py} | 3 +- .../funcs/{divisionFunc.py => division.py} | 1 - ...euclidianNormFunc.py => euclidian_norm.py} | 7 +- ...xponentiationFunc.py => exponentiation.py} | 1 - .../funcs/{factorialFunc.py => factorial.py} | 1 - .../funcs/{factoringFunc.py => factoring.py} | 1 - ...nacciSeriesFunc.py => fibonacci_series.py} | 3 +- ...nc.py => fourth_angle_of_quadrilateral.py} | 3 +- ...ionsFunc.py => fraction_multiplication.py} | 7 +- mathgenerator/funcs/{gcdFunc.py => gcd.py} | 1 - ...geometricMeanFunc.py => geometric_mean.py} | 7 +- ...mProgrFunc.py => geometric_progression.py} | 3 +- .../{harmonicMeanFunc.py => harmonic_mean.py} | 9 +- mathgenerator/funcs/{hcfFunc.py => hcf.py} | 1 - .../{divisionToIntFunc.py => int_division.py} | 3 +- ...trix22.py => int_matrix_22_determinant.py} | 7 +- ...esFunc.py => intersection_of_two_lines.py} | 3 +- .../{matrixInversion.py => invert_matrix.py} | 5 +- mathgenerator/funcs/{lcmFunc.py => lcm.py} | 1 - ...arEquationsFunc.py => linear_equations.py} | 5 +- mathgenerator/funcs/{logFunc.py => log.py} | 1 - ...cationFunc.py => matrix_multiplication.py} | 7 +- .../{meanMedianFunc.py => mean_median.py} | 7 +- ...PointFunc.py => midpoint_of_two_points.py} | 7 +- .../{moduloFunc.py => modulo_division.py} | 3 +- ...ultiplicationFunc.py => multiplication.py} | 1 - ...ersFunc.py => multiply_complex_numbers.py} | 7 +- ...trix22.py => multiply_int_to_22_matrix.py} | 3 +- ...iNumberFunc.py => nth_fibonacci_number.py} | 7 +- .../{percentageFunc.py => percentage.py} | 1 - .../{permutationFunc.py => permutation.py} | 3 +- ...nFunc.py => power_rule_differentiation.py} | 7 +- ...ationFunc.py => power_rule_integration.py} | 5 +- .../{primeFactorsFunc.py => prime_factors.py} | 5 +- ...sPercentFunc.py => profit_loss_percent.py} | 3 +- ...nTheoremFunc.py => pythagorean_theorem.py} | 3 +- ...raticEquation.py => quadratic_equation.py} | 3 +- .../{radianToDegFunc.py => radian_to_deg.py} | 3 +- .../{sectorAreaFunc.py => sector_area.py} | 7 +- ...mpleInterestFunc.py => simple_interest.py} | 3 +- .../funcs/{squareFunc.py => square.py} | 1 - .../{squareRootFunc.py => square_root.py} | 3 +- .../{subtractionFunc.py => subtraction.py} | 1 - ...olygonFunc.py => sum_of_polygon_angles.py} | 7 +- ...sComparisonFunc.py => surds_comparison.py} | 7 +- ...urfaceAreaCone.py => surface_area_cone.py} | 3 +- ...urfaceAreaCube.py => surface_area_cube.py} | 7 +- ...ceAreaCuboid.py => surface_area_cuboid.py} | 3 +- ...eaCylinder.py => surface_area_cylinder.py} | 3 +- ...ceAreaSphere.py => surface_area_sphere.py} | 3 +- ...quationsFunc.py => system_of_equations.py} | 7 +- ...ngleFunc.py => third_angle_of_triangle.py} | 7 +- ...TriangleValidFunc.py => valid_triangle.py} | 7 +- .../{vectorCrossFunc.py => vector_cross.py} | 5 +- .../funcs/{vectorDotFunc.py => vector_dot.py} | 5 +- .../funcs/{volumeCone.py => volume_cone.py} | 3 +- .../funcs/{volumeCube.py => volume_cube.py} | 7 +- .../{volumeCuboid.py => volume_cuboid.py} | 3 +- .../{volumeCylinder.py => volume_cylinder.py} | 3 +- .../{volumeSphereFunc.py => volume_sphere.py} | 7 +- test.py | 4 +- 90 files changed, 241 insertions(+), 321 deletions(-) rename mathgenerator/funcs/{absoluteDifferenceFunc.py => absolute_difference.py} (88%) rename mathgenerator/funcs/{angleBtwVectorsFunc.py => angle_btw_vectors.py} (93%) rename mathgenerator/funcs/{regularPolygonAngleFunc.py => angle_regular_polygon.py} (86%) rename mathgenerator/funcs/{areaOfTriangleFunc.py => area_of_triangle.py} (65%) rename mathgenerator/funcs/{arithmeticProgressionSumFunc.py => arithmetic_progression_sum.py} (63%) rename mathgenerator/funcs/{arithmeticProgressionTermFunc.py => arithmetic_progression_term.py} (62%) rename mathgenerator/funcs/{basicAlgebraFunc.py => basic_algebra.py} (79%) rename mathgenerator/funcs/{basicTrigonometryFunc.py => basic_trigonometry.py} (81%) rename mathgenerator/funcs/{binary2sComplement.py => binary_2s_complement.py} (76%) rename mathgenerator/funcs/{binaryComplement1sFunc.py => binary_complement_1s.py} (68%) rename mathgenerator/funcs/{BinaryToDecimalFunc.py => binary_to_decimal.py} (53%) rename mathgenerator/funcs/{binaryToHexFunc.py => binary_to_hex.py} (62%) rename mathgenerator/funcs/{celsiustofahrenheit.py => celsius_to_fahrenheit.py} (63%) rename mathgenerator/funcs/{combinationsFunc.py => combinations.py} (95%) rename mathgenerator/funcs/{commonFactorsFunc.py => common_factors.py} (70%) rename mathgenerator/funcs/{compareFractionsFunc.py => compare_fractions.py} (92%) rename mathgenerator/funcs/{compoundInterestFunc.py => compound_interest.py} (93%) rename mathgenerator/funcs/{confidenceIntervalFunc.py => confidence_interval.py} (76%) rename mathgenerator/funcs/{cubeRootFunc.py => cube_root.py} (62%) rename mathgenerator/funcs/{dataSummaryFunc.py => data_summary.py} (80%) rename mathgenerator/funcs/{DecimalToBinaryFunc.py => decimal_to_binary.py} (59%) rename mathgenerator/funcs/{deciToHexaFunc.py => decimal_to_hexadeci.py} (56%) rename mathgenerator/funcs/{decimalToOctalFunc.py => decimal_to_octal.py} (57%) rename mathgenerator/funcs/{decimalToRomanNumeralsFunc.py => decimal_to_roman_numerals.py} (83%) rename mathgenerator/funcs/{degreeToRadFunc.py => degree_to_rad.py} (67%) rename mathgenerator/funcs/{DiceSumProbFunc.py => dice_sum_probability.py} (93%) rename mathgenerator/funcs/{distanceTwoPointsFunc.py => distance_two_points.py} (68%) rename mathgenerator/funcs/{divideFractionsFunc.py => divide_fractions.py} (88%) rename mathgenerator/funcs/{divisionFunc.py => division.py} (90%) rename mathgenerator/funcs/{euclidianNormFunc.py => euclidian_norm.py} (52%) rename mathgenerator/funcs/{exponentiationFunc.py => exponentiation.py} (91%) rename mathgenerator/funcs/{factorialFunc.py => factorial.py} (90%) rename mathgenerator/funcs/{factoringFunc.py => factoring.py} (95%) rename mathgenerator/funcs/{fibonacciSeriesFunc.py => fibonacci_series.py} (91%) rename mathgenerator/funcs/{fourthAngleOfQuadriFunc.py => fourth_angle_of_quadrilateral.py} (88%) rename mathgenerator/funcs/{multiplyFractionsFunc.py => fraction_multiplication.py} (75%) rename mathgenerator/funcs/{gcdFunc.py => gcd.py} (91%) rename mathgenerator/funcs/{geometricMeanFunc.py => geometric_mean.py} (78%) rename mathgenerator/funcs/{geomProgrFunc.py => geometric_progression.py} (94%) rename mathgenerator/funcs/{harmonicMeanFunc.py => harmonic_mean.py} (77%) rename mathgenerator/funcs/{hcfFunc.py => hcf.py} (91%) rename mathgenerator/funcs/{divisionToIntFunc.py => int_division.py} (73%) rename mathgenerator/funcs/{determinantToMatrix22.py => int_matrix_22_determinant.py} (61%) rename mathgenerator/funcs/{intersectionOfTwoLinesFunc.py => intersection_of_two_lines.py} (97%) rename mathgenerator/funcs/{matrixInversion.py => invert_matrix.py} (94%) rename mathgenerator/funcs/{lcmFunc.py => lcm.py} (92%) rename mathgenerator/funcs/{linearEquationsFunc.py => linear_equations.py} (83%) rename mathgenerator/funcs/{logFunc.py => log.py} (90%) rename mathgenerator/funcs/{matrixMultiplicationFunc.py => matrix_multiplication.py} (85%) rename mathgenerator/funcs/{meanMedianFunc.py => mean_median.py} (71%) rename mathgenerator/funcs/{MidPointOfTwoPointFunc.py => midpoint_of_two_points.py} (59%) rename mathgenerator/funcs/{moduloFunc.py => modulo_division.py} (72%) rename mathgenerator/funcs/{multiplicationFunc.py => multiplication.py} (93%) rename mathgenerator/funcs/{multiplyComplexNumbersFunc.py => multiply_complex_numbers.py} (69%) rename mathgenerator/funcs/{multiplyIntToMatrix22.py => multiply_int_to_22_matrix.py} (87%) rename mathgenerator/funcs/{nthFibonacciNumberFunc.py => nth_fibonacci_number.py} (59%) rename mathgenerator/funcs/{percentageFunc.py => percentage.py} (93%) rename mathgenerator/funcs/{permutationFunc.py => permutation.py} (88%) rename mathgenerator/funcs/{powerRuleDifferentiationFunc.py => power_rule_differentiation.py} (69%) rename mathgenerator/funcs/{powerRuleIntegrationFunc.py => power_rule_integration.py} (76%) rename mathgenerator/funcs/{primeFactorsFunc.py => prime_factors.py} (70%) rename mathgenerator/funcs/{profitLossPercentFunc.py => profit_loss_percent.py} (89%) rename mathgenerator/funcs/{pythagoreanTheoremFunc.py => pythagorean_theorem.py} (88%) rename mathgenerator/funcs/{quadraticEquation.py => quadratic_equation.py} (89%) rename mathgenerator/funcs/{radianToDegFunc.py => radian_to_deg.py} (72%) rename mathgenerator/funcs/{sectorAreaFunc.py => sector_area.py} (68%) rename mathgenerator/funcs/{simpleInterestFunc.py => simple_interest.py} (91%) rename mathgenerator/funcs/{squareFunc.py => square.py} (88%) rename mathgenerator/funcs/{squareRootFunc.py => square_root.py} (66%) rename mathgenerator/funcs/{subtractionFunc.py => subtraction.py} (91%) rename mathgenerator/funcs/{sumOfAnglesOfPolygonFunc.py => sum_of_polygon_angles.py} (50%) rename mathgenerator/funcs/{surdsComparisonFunc.py => surds_comparison.py} (72%) rename mathgenerator/funcs/{surfaceAreaCone.py => surface_area_cone.py} (89%) rename mathgenerator/funcs/{surfaceAreaCube.py => surface_area_cube.py} (52%) rename mathgenerator/funcs/{surfaceAreaCuboid.py => surface_area_cuboid.py} (88%) rename mathgenerator/funcs/{surfaceAreaCylinder.py => surface_area_cylinder.py} (88%) rename mathgenerator/funcs/{surfaceAreaSphere.py => surface_area_sphere.py} (85%) rename mathgenerator/funcs/{systemOfEquationsFunc.py => system_of_equations.py} (89%) rename mathgenerator/funcs/{thirdAngleOfTriangleFunc.py => third_angle_of_triangle.py} (57%) rename mathgenerator/funcs/{isTriangleValidFunc.py => valid_triangle.py} (72%) rename mathgenerator/funcs/{vectorCrossFunc.py => vector_cross.py} (72%) rename mathgenerator/funcs/{vectorDotFunc.py => vector_dot.py} (70%) rename mathgenerator/funcs/{volumeCone.py => volume_cone.py} (88%) rename mathgenerator/funcs/{volumeCube.py => volume_cube.py} (55%) rename mathgenerator/funcs/{volumeCuboid.py => volume_cuboid.py} (88%) rename mathgenerator/funcs/{volumeCylinder.py => volume_cylinder.py} (88%) rename mathgenerator/funcs/{volumeSphereFunc.py => volume_sphere.py} (55%) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 12bf15e..9f82f30 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -2,91 +2,93 @@ import random import math import fractions +from ..__init__ import * + from .addition import * -from .subtractionFunc import * -from .multiplicationFunc import * -from .divisionFunc import * -from .binaryComplement1sFunc import * -from .moduloFunc import * -from .squareRootFunc import * -from .powerRuleDifferentiationFunc import * -from .squareFunc import * -from .lcmFunc import * -from .gcdFunc import * -from .basicAlgebraFunc import * -from .logFunc import * -from .divisionToIntFunc import * -from .DecimalToBinaryFunc import * -from .BinaryToDecimalFunc import * -from .divideFractionsFunc import * -from .multiplyIntToMatrix22 import * -from .areaOfTriangleFunc import * -from .isTriangleValidFunc import * -from .MidPointOfTwoPointFunc import * -from .factoringFunc import * -from .thirdAngleOfTriangleFunc import * -from .systemOfEquationsFunc import * -from .distanceTwoPointsFunc import * -from .pythagoreanTheoremFunc import * -from .linearEquationsFunc import * -from .primeFactorsFunc import * -from .multiplyFractionsFunc import * -from .regularPolygonAngleFunc import * -from .combinationsFunc import * -from .factorialFunc import * -from .surfaceAreaCube import * -from .surfaceAreaCuboid import * -from .surfaceAreaCylinder import * -from .volumeCube import * -from .volumeCuboid import * -from .volumeCylinder import * -from .surfaceAreaCone import * -from .volumeCone import * -from .commonFactorsFunc import * -from .intersectionOfTwoLinesFunc import * -from .permutationFunc import * -from .vectorCrossFunc import * -from .compareFractionsFunc import * -from .simpleInterestFunc import * -from .matrixMultiplicationFunc import * -from .cubeRootFunc import * -from .powerRuleIntegrationFunc import * -from .fourthAngleOfQuadriFunc import * -from .quadraticEquation import * -from .hcfFunc import * -from .DiceSumProbFunc import * -from .exponentiationFunc import * -from .confidenceIntervalFunc import * -from .surdsComparisonFunc import * -from .fibonacciSeriesFunc import * -from .basicTrigonometryFunc import * -from .sumOfAnglesOfPolygonFunc import * -from .dataSummaryFunc import * -from .surfaceAreaSphere import * -from .volumeSphereFunc import * -from .nthFibonacciNumberFunc import * -from .profitLossPercentFunc import * -from .binaryToHexFunc import * -from .multiplyComplexNumbersFunc import * -from .geomProgrFunc import * -from .geometricMeanFunc import * -from .harmonicMeanFunc import * -from .euclidianNormFunc import * -from .angleBtwVectorsFunc import * -from .absoluteDifferenceFunc import * -from .vectorDotFunc import * -from .binary2sComplement import * -from .matrixInversion import * -from .sectorAreaFunc import * -from .meanMedianFunc import * -from .determinantToMatrix22 import * -from .compoundInterestFunc import * -from .deciToHexaFunc import * -from .percentageFunc import * -from .celsiustofahrenheit import * -from .arithmeticProgressionTermFunc import * -from .arithmeticProgressionSumFunc import * -from .decimalToOctalFunc import * -from .decimalToRomanNumeralsFunc import * -from .degreeToRadFunc import * -from .radianToDegFunc import * +from .subtraction import * +from .multiplication import * +from .division import * +from .binary_complement_1s import * +from .modulo_division import * +from .square_root import * +from .power_rule_differentiation import * +from .square import * +from .lcm import * +from .gcd import * +from .basic_algebra import * +from .log import * +from .int_division import * +from .decimal_to_binary import * +from .binary_to_decimal import * +from .divide_fractions import * +from .multiply_int_to_22_matrix import * +from .area_of_triangle import * +from .valid_triangle import * +from .midpoint_of_two_points import * +from .factoring import * +from .third_angle_of_triangle import * +from .system_of_equations import * +from .distance_two_points import * +from .pythagorean_theorem import * +from .linear_equations import * +from .prime_factors import * +from .fraction_multiplication import * +from .angle_regular_polygon import * +from .combinations import * +from .factorial import * +from .surface_area_cube import * +from .surface_area_cuboid import * +from .surface_area_cylinder import * +from .volume_cube import * +from .volume_cuboid import * +from .volume_cylinder import * +from .surface_area_cone import * +from .volume_cone import * +from .common_factors import * +from .intersection_of_two_lines import * +from .permutation import * +from .vector_cross import * +from .compare_fractions import * +from .simple_interest import * +from .matrix_multiplication import * +from .cube_root import * +from .power_rule_integration import * +from .fourth_angle_of_quadrilateral import * +from .quadratic_equation import * +from .hcf import * +from .dice_sum_probability import * +from .exponentiation import * +from .confidence_interval import * +from .surds_comparison import * +from .fibonacci_series import * +from .basic_trigonometry import * +from .sum_of_polygon_angles import * +from .data_summary import * +from .surface_area_sphere import * +from .volume_sphere import * +from .nth_fibonacci_number import * +from .profit_loss_percent import * +from .binary_to_hex import * +from .multiply_complex_numbers import * +from .geometric_progression import * +from .geometric_mean import * +from .harmonic_mean import * +from .euclidian_norm import * +from .angle_btw_vectors import * +from .absolute_difference import * +from .vector_dot import * +from .binary_2s_complement import * +from .invert_matrix import * +from .sector_area import * +from .mean_median import * +from .int_matrix_22_determinant import * +from .compound_interest import * +from .decimal_to_hexadeci import * +from .percentage import * +from .celsius_to_fahrenheit import * +from .arithmetic_progression_term import * +from .arithmetic_progression_sum import * +from .decimal_to_octal import * +from .decimal_to_roman_numerals import * +from .degree_to_rad import * +from .radian_to_deg import * diff --git a/mathgenerator/funcs/absoluteDifferenceFunc.py b/mathgenerator/funcs/absolute_difference.py similarity index 88% rename from mathgenerator/funcs/absoluteDifferenceFunc.py rename to mathgenerator/funcs/absolute_difference.py index 755e049..fae1fb0 100644 --- a/mathgenerator/funcs/absoluteDifferenceFunc.py +++ b/mathgenerator/funcs/absolute_difference.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def absoluteDifferenceFunc(maxA=100, maxB=100): @@ -13,7 +12,7 @@ def absoluteDifferenceFunc(maxA=100, maxB=100): return problem, solution -absoluteDifference = Generator( +absolute_difference = Generator( "Absolute difference between two numbers", 71, "Absolute difference betweeen two numbers a and b =", "|a-b|", absoluteDifferenceFunc) diff --git a/mathgenerator/funcs/addition.py b/mathgenerator/funcs/addition.py index df74496..cab6dac 100644 --- a/mathgenerator/funcs/addition.py +++ b/mathgenerator/funcs/addition.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def additionFunc(maxSum=99, maxAddend=50): diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angle_btw_vectors.py similarity index 93% rename from mathgenerator/funcs/angleBtwVectorsFunc.py rename to mathgenerator/funcs/angle_btw_vectors.py index 9d8d817..f3b8a65 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angle_btw_vectors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator import math @@ -23,7 +22,7 @@ def angleBtwVectorsFunc(maxEltAmt=20): return problem, solution -angleBtwVectors = Generator( +angle_btw_vectors = 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) diff --git a/mathgenerator/funcs/regularPolygonAngleFunc.py b/mathgenerator/funcs/angle_regular_polygon.py similarity index 86% rename from mathgenerator/funcs/regularPolygonAngleFunc.py rename to mathgenerator/funcs/angle_regular_polygon.py index a264c5a..90f2c71 100644 --- a/mathgenerator/funcs/regularPolygonAngleFunc.py +++ b/mathgenerator/funcs/angle_regular_polygon.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def regularPolygonAngleFunc(minVal=3, maxVal=20): @@ -11,7 +10,7 @@ def regularPolygonAngleFunc(minVal=3, maxVal=20): return problem, solution -angleRegularPolygon = Generator( +angle_regular_polygon = Generator( "Angle of a Regular Polygon", 29, "Find the angle of a regular polygon with 6 sides", "120", regularPolygonAngleFunc) diff --git a/mathgenerator/funcs/areaOfTriangleFunc.py b/mathgenerator/funcs/area_of_triangle.py similarity index 65% rename from mathgenerator/funcs/areaOfTriangleFunc.py rename to mathgenerator/funcs/area_of_triangle.py index c49167c..488a997 100644 --- a/mathgenerator/funcs/areaOfTriangleFunc.py +++ b/mathgenerator/funcs/area_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): @@ -16,6 +15,6 @@ def areaOfTriangleFunc(maxA=20, maxB=20, maxC=20): return problem, solution -areaOfTriangle = Generator("Area of Triangle", 18, - "Area of Triangle with side lengths a, b, c = ", - "area", areaOfTriangleFunc) +area_of_triangle = Generator("Area of Triangle", 18, + "Area of Triangle with side lengths a, b, c = ", + "area", areaOfTriangleFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionSumFunc.py b/mathgenerator/funcs/arithmetic_progression_sum.py similarity index 63% rename from mathgenerator/funcs/arithmeticProgressionSumFunc.py rename to mathgenerator/funcs/arithmetic_progression_sum.py index 294cb7f..e376c3f 100644 --- a/mathgenerator/funcs/arithmeticProgressionSumFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_sum.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionSumFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionSum = Generator("AP Sum Calculation", 83, - "Find the sum of first n terms of the AP series: a1, a2, a3 ...", - "Sum", arithmeticProgressionSumFunc) +arithmetic_progression_sum = Generator("AP Sum Calculation", 83, + "Find the sum of first n terms of the AP series: a1, a2, a3 ...", + "Sum", arithmeticProgressionSumFunc) diff --git a/mathgenerator/funcs/arithmeticProgressionTermFunc.py b/mathgenerator/funcs/arithmetic_progression_term.py similarity index 62% rename from mathgenerator/funcs/arithmeticProgressionTermFunc.py rename to mathgenerator/funcs/arithmetic_progression_term.py index e549c18..8468921 100644 --- a/mathgenerator/funcs/arithmeticProgressionTermFunc.py +++ b/mathgenerator/funcs/arithmetic_progression_term.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): @@ -14,6 +13,6 @@ def arithmeticProgressionTermFunc(maxd=100, maxa=100, maxn=100): return problem, solution -arithmeticProgressionTerm = Generator("AP Term Calculation", 82, - "Find the term number n of the AP series: a1, a2, a3 ...", - "a-n", arithmeticProgressionTermFunc) +arithmetic_progression_term = Generator("AP Term Calculation", 82, + "Find the term number n of the AP series: a1, a2, a3 ...", + "a-n", arithmeticProgressionTermFunc) diff --git a/mathgenerator/funcs/basicAlgebraFunc.py b/mathgenerator/funcs/basic_algebra.py similarity index 79% rename from mathgenerator/funcs/basicAlgebraFunc.py rename to mathgenerator/funcs/basic_algebra.py index 504ac41..0626cf8 100644 --- a/mathgenerator/funcs/basicAlgebraFunc.py +++ b/mathgenerator/funcs/basic_algebra.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def basicAlgebraFunc(maxVariable=10): @@ -26,5 +25,5 @@ def basicAlgebraFunc(maxVariable=10): return problem, solution -basicAlgebra = Generator("Basic Algebra", 11, "ax + b = c", "d", - basicAlgebraFunc) +basic_algebra = Generator("Basic Algebra", 11, "ax + b = c", "d", + basicAlgebraFunc) diff --git a/mathgenerator/funcs/basicTrigonometryFunc.py b/mathgenerator/funcs/basic_trigonometry.py similarity index 81% rename from mathgenerator/funcs/basicTrigonometryFunc.py rename to mathgenerator/funcs/basic_trigonometry.py index da6d97c..2992034 100644 --- a/mathgenerator/funcs/basicTrigonometryFunc.py +++ b/mathgenerator/funcs/basic_trigonometry.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator # Handles degrees in quadrant one @@ -26,5 +25,5 @@ def basicTrigonometryFunc(angles=[0, 30, 45, 60, 90], return problem, solution -basicTrigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", - "ans", basicTrigonometryFunc) +basic_trigonometry = Generator("Trigonometric Values", 57, "What is sin(X)?", + "ans", basicTrigonometryFunc) diff --git a/mathgenerator/funcs/binary2sComplement.py b/mathgenerator/funcs/binary_2s_complement.py similarity index 76% rename from mathgenerator/funcs/binary2sComplement.py rename to mathgenerator/funcs/binary_2s_complement.py index 891990d..f053020 100644 --- a/mathgenerator/funcs/binary2sComplement.py +++ b/mathgenerator/funcs/binary_2s_complement.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binary2sComplementFunc(maxDigits=10): @@ -29,6 +28,6 @@ def binary2sComplementFunc(maxDigits=10): return problem, solution -binary2sComplement = Generator("Binary 2's Complement", 73, - "2's complement of 11010110 =", "101010", - binary2sComplementFunc) +binary_2s_complement = Generator("Binary 2's Complement", 73, + "2's complement of 11010110 =", "101010", + binary2sComplementFunc) diff --git a/mathgenerator/funcs/binaryComplement1sFunc.py b/mathgenerator/funcs/binary_complement_1s.py similarity index 68% rename from mathgenerator/funcs/binaryComplement1sFunc.py rename to mathgenerator/funcs/binary_complement_1s.py index f748af5..da6c481 100644 --- a/mathgenerator/funcs/binaryComplement1sFunc.py +++ b/mathgenerator/funcs/binary_complement_1s.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryComplement1sFunc(maxDigits=10): @@ -16,5 +15,5 @@ def binaryComplement1sFunc(maxDigits=10): return problem, solution -binaryComplement1s = Generator("Binary Complement 1s", 4, "1010=", "0101", - binaryComplement1sFunc) +binary_complement_1s = Generator("Binary Complement 1s", 4, "1010=", "0101", + binaryComplement1sFunc) diff --git a/mathgenerator/funcs/BinaryToDecimalFunc.py b/mathgenerator/funcs/binary_to_decimal.py similarity index 53% rename from mathgenerator/funcs/BinaryToDecimalFunc.py rename to mathgenerator/funcs/binary_to_decimal.py index 01fb780..f7e0aa8 100644 --- a/mathgenerator/funcs/BinaryToDecimalFunc.py +++ b/mathgenerator/funcs/binary_to_decimal.py @@ -1,8 +1,7 @@ from .__init__ import * -from ..__init__ import Generator -def BinaryToDecimalFunc(max_dig=10): +def binaryToDecimalFunc(max_dig=10): problem = '' for i in range(random.randint(1, max_dig)): @@ -13,5 +12,5 @@ def BinaryToDecimalFunc(max_dig=10): return problem, solution -binaryToDecimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", - BinaryToDecimalFunc) +binary_to_decimal = Generator("Binary to Decimal", 15, "Decimal of a=", "b", + binaryToDecimalFunc) diff --git a/mathgenerator/funcs/binaryToHexFunc.py b/mathgenerator/funcs/binary_to_hex.py similarity index 62% rename from mathgenerator/funcs/binaryToHexFunc.py rename to mathgenerator/funcs/binary_to_hex.py index 12dbe7f..77b03b1 100644 --- a/mathgenerator/funcs/binaryToHexFunc.py +++ b/mathgenerator/funcs/binary_to_hex.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def binaryToHexFunc(max_dig=10): @@ -12,5 +11,5 @@ def binaryToHexFunc(max_dig=10): return problem, solution -binaryToHex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", - binaryToHexFunc) +binary_to_hex = Generator("Binary to Hexidecimal", 64, "Hexidecimal of a=", "b", + binaryToHexFunc) diff --git a/mathgenerator/funcs/celsiustofahrenheit.py b/mathgenerator/funcs/celsius_to_fahrenheit.py similarity index 63% rename from mathgenerator/funcs/celsiustofahrenheit.py rename to mathgenerator/funcs/celsius_to_fahrenheit.py index 0e66be8..45122d0 100644 --- a/mathgenerator/funcs/celsiustofahrenheit.py +++ b/mathgenerator/funcs/celsius_to_fahrenheit.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def celsiustofahrenheitFunc(maxTemp=100): @@ -10,5 +9,5 @@ def celsiustofahrenheitFunc(maxTemp=100): return problem, solution -celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, - "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) +celsius_to_fahrenheit = Generator("Celsius To Fahrenheit", 81, + "(C +(9/5))+32=", "F", celsiustofahrenheitFunc) diff --git a/mathgenerator/funcs/combinationsFunc.py b/mathgenerator/funcs/combinations.py similarity index 95% rename from mathgenerator/funcs/combinationsFunc.py rename to mathgenerator/funcs/combinations.py index ca42532..60c7b41 100644 --- a/mathgenerator/funcs/combinationsFunc.py +++ b/mathgenerator/funcs/combinations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def combinationsFunc(maxlength=20): diff --git a/mathgenerator/funcs/commonFactorsFunc.py b/mathgenerator/funcs/common_factors.py similarity index 70% rename from mathgenerator/funcs/commonFactorsFunc.py rename to mathgenerator/funcs/common_factors.py index 929c48e..a783909 100644 --- a/mathgenerator/funcs/commonFactorsFunc.py +++ b/mathgenerator/funcs/common_factors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def commonFactorsFunc(maxVal=100): @@ -25,6 +24,6 @@ def commonFactorsFunc(maxVal=100): return problem, solution -commonFactors = Generator("Common Factors", 40, - "Common Factors of {a} and {b} = ", "[c, d, ...]", - commonFactorsFunc) +common_factors = Generator("Common Factors", 40, + "Common Factors of {a} and {b} = ", "[c, d, ...]", + commonFactorsFunc) diff --git a/mathgenerator/funcs/compareFractionsFunc.py b/mathgenerator/funcs/compare_fractions.py similarity index 92% rename from mathgenerator/funcs/compareFractionsFunc.py rename to mathgenerator/funcs/compare_fractions.py index 19ba5c9..53fe7a0 100644 --- a/mathgenerator/funcs/compareFractionsFunc.py +++ b/mathgenerator/funcs/compare_fractions.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def compareFractionsFunc(maxVal=10): @@ -27,7 +26,7 @@ def compareFractionsFunc(maxVal=10): return problem, solution -compareFractions = Generator( +compare_fractions = Generator( "Compare Fractions", 44, "Which symbol represents the comparison between a/b and c/d?", ">/</=", compareFractionsFunc) diff --git a/mathgenerator/funcs/compoundInterestFunc.py b/mathgenerator/funcs/compound_interest.py similarity index 93% rename from mathgenerator/funcs/compoundInterestFunc.py rename to mathgenerator/funcs/compound_interest.py index 60a3f40..4278d10 100644 --- a/mathgenerator/funcs/compoundInterestFunc.py +++ b/mathgenerator/funcs/compound_interest.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def compoundInterestFunc(maxPrinciple=10000, @@ -19,7 +18,7 @@ def compoundInterestFunc(maxPrinciple=10000, return problem, solution -compoundInterest = Generator( +compound_interest = 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) diff --git a/mathgenerator/funcs/confidenceIntervalFunc.py b/mathgenerator/funcs/confidence_interval.py similarity index 76% rename from mathgenerator/funcs/confidenceIntervalFunc.py rename to mathgenerator/funcs/confidence_interval.py index 9b13c81..e6cb161 100644 --- a/mathgenerator/funcs/confidenceIntervalFunc.py +++ b/mathgenerator/funcs/confidence_interval.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def confidenceIntervalFunc(): @@ -32,6 +31,6 @@ def confidenceIntervalFunc(): return problem, solution -confidenceInterval = Generator("Confidence interval For sample S", 54, - "With X% confidence", "is (A,B)", - confidenceIntervalFunc) +confidence_interval = Generator("Confidence interval For sample S", 54, + "With X% confidence", "is (A,B)", + confidenceIntervalFunc) diff --git a/mathgenerator/funcs/cubeRootFunc.py b/mathgenerator/funcs/cube_root.py similarity index 62% rename from mathgenerator/funcs/cubeRootFunc.py rename to mathgenerator/funcs/cube_root.py index 3f18831..041d492 100644 --- a/mathgenerator/funcs/cubeRootFunc.py +++ b/mathgenerator/funcs/cube_root.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def cubeRootFunc(minNo=1, maxNo=1000): @@ -11,5 +10,5 @@ def cubeRootFunc(minNo=1, maxNo=1000): return problem, solution -CubeRoot = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", - "b", cubeRootFunc) +cube_root = Generator("Cube Root", 47, "Cuberoot of a upto 2 decimal places is", + "b", cubeRootFunc) diff --git a/mathgenerator/funcs/dataSummaryFunc.py b/mathgenerator/funcs/data_summary.py similarity index 80% rename from mathgenerator/funcs/dataSummaryFunc.py rename to mathgenerator/funcs/data_summary.py index 9cd5a8f..a84a91c 100644 --- a/mathgenerator/funcs/dataSummaryFunc.py +++ b/mathgenerator/funcs/data_summary.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def dataSummaryFunc(number_values=15, minval=5, maxval=50): @@ -26,5 +25,5 @@ def dataSummaryFunc(number_values=15, minval=5, maxval=50): return problem, solution -dataSummary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", - "Mean:a+b+c/3,Std,Var", dataSummaryFunc) +data_summary = Generator("Mean,Standard Deviation,Variance", 59, "a,b,c", + "Mean:a+b+c/3,Std,Var", dataSummaryFunc) diff --git a/mathgenerator/funcs/DecimalToBinaryFunc.py b/mathgenerator/funcs/decimal_to_binary.py similarity index 59% rename from mathgenerator/funcs/DecimalToBinaryFunc.py rename to mathgenerator/funcs/decimal_to_binary.py index a2aa043..354b9d4 100644 --- a/mathgenerator/funcs/DecimalToBinaryFunc.py +++ b/mathgenerator/funcs/decimal_to_binary.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def DecimalToBinaryFunc(max_dec=99): @@ -12,5 +11,5 @@ def DecimalToBinaryFunc(max_dec=99): return problem, solution -decimalToBinary = Generator("Decimal to Binary", 14, "Binary of a=", "b", - DecimalToBinaryFunc) +decimal_to_binary = Generator("Decimal to Binary", 14, "Binary of a=", "b", + DecimalToBinaryFunc) diff --git a/mathgenerator/funcs/deciToHexaFunc.py b/mathgenerator/funcs/decimal_to_hexadeci.py similarity index 56% rename from mathgenerator/funcs/deciToHexaFunc.py rename to mathgenerator/funcs/decimal_to_hexadeci.py index e1ac230..57e753b 100644 --- a/mathgenerator/funcs/deciToHexaFunc.py +++ b/mathgenerator/funcs/decimal_to_hexadeci.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def deciToHexaFunc(max_dec=1000): @@ -11,5 +10,5 @@ def deciToHexaFunc(max_dec=1000): return problem, solution -decimalToHexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", - "b", deciToHexaFunc) +decimal_to_hexadeci = Generator("Decimal to Hexadecimal", 79, "Binary of a=", + "b", deciToHexaFunc) diff --git a/mathgenerator/funcs/decimalToOctalFunc.py b/mathgenerator/funcs/decimal_to_octal.py similarity index 57% rename from mathgenerator/funcs/decimalToOctalFunc.py rename to mathgenerator/funcs/decimal_to_octal.py index 4a5c7ab..5a89b99 100644 --- a/mathgenerator/funcs/decimalToOctalFunc.py +++ b/mathgenerator/funcs/decimal_to_octal.py @@ -8,5 +8,5 @@ def decimalToOctalFunc(maxDecimal=4096): return problem, solution -decimalToOctal = Generator("Converts decimal to octal", 84, - "What's the octal representation of 98?", "0o142", decimalToOctalFunc) +decimal_to_octal = Generator("Converts decimal to octal", 84, + "What's the octal representation of 98?", "0o142", decimalToOctalFunc) diff --git a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py b/mathgenerator/funcs/decimal_to_roman_numerals.py similarity index 83% rename from mathgenerator/funcs/decimalToRomanNumeralsFunc.py rename to mathgenerator/funcs/decimal_to_roman_numerals.py index 03e369b..46a1ebd 100644 --- a/mathgenerator/funcs/decimalToRomanNumeralsFunc.py +++ b/mathgenerator/funcs/decimal_to_roman_numerals.py @@ -25,5 +25,5 @@ def decimalToRomanNumeralsFunc(maxDecimal=4000): return problem, solution -decimalToRomanNumerals = Generator("Converts decimal to Roman Numerals", - 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) +decimal_to_roman_numerals = Generator("Converts decimal to Roman Numerals", + 85, "Convert 20 into Roman Numerals", "XX", decimalToRomanNumeralsFunc) diff --git a/mathgenerator/funcs/degreeToRadFunc.py b/mathgenerator/funcs/degree_to_rad.py similarity index 67% rename from mathgenerator/funcs/degreeToRadFunc.py rename to mathgenerator/funcs/degree_to_rad.py index 7ca4080..dc63f10 100644 --- a/mathgenerator/funcs/degreeToRadFunc.py +++ b/mathgenerator/funcs/degree_to_rad.py @@ -13,4 +13,5 @@ def degreeToRadFunc(max_deg=360): return problem, solution -degreeToRad = Generator("Degrees to Radians", 86, "Angle a in radians is = ", "b", degreeToRadFunc) +degree_to_rad = Generator("Degrees to Radians", 86, + "Angle a in radians is = ", "b", degreeToRadFunc) diff --git a/mathgenerator/funcs/DiceSumProbFunc.py b/mathgenerator/funcs/dice_sum_probability.py similarity index 93% rename from mathgenerator/funcs/DiceSumProbFunc.py rename to mathgenerator/funcs/dice_sum_probability.py index 720490e..d5139e4 100644 --- a/mathgenerator/funcs/DiceSumProbFunc.py +++ b/mathgenerator/funcs/dice_sum_probability.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def DiceSumProbFunc(maxDice=3): @@ -27,7 +26,7 @@ def DiceSumProbFunc(maxDice=3): return problem, solution -diceSumProbability = Generator( +dice_sum_probability = 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) diff --git a/mathgenerator/funcs/distanceTwoPointsFunc.py b/mathgenerator/funcs/distance_two_points.py similarity index 68% rename from mathgenerator/funcs/distanceTwoPointsFunc.py rename to mathgenerator/funcs/distance_two_points.py index e5de6ae..6dc6b7d 100644 --- a/mathgenerator/funcs/distanceTwoPointsFunc.py +++ b/mathgenerator/funcs/distance_two_points.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): @@ -15,6 +14,6 @@ def distanceTwoPointsFunc(maxValXY=20, minValXY=-20): return problem, solution -distance2Point = Generator("Distance between 2 points", 24, - "Find the distance between (x1,y1) and (x2,y2)", - "sqrt(distanceSquared)", distanceTwoPointsFunc) +distance_two_points = Generator("Distance between 2 points", 24, + "Find the distance between (x1,y1) and (x2,y2)", + "sqrt(distanceSquared)", distanceTwoPointsFunc) diff --git a/mathgenerator/funcs/divideFractionsFunc.py b/mathgenerator/funcs/divide_fractions.py similarity index 88% rename from mathgenerator/funcs/divideFractionsFunc.py rename to mathgenerator/funcs/divide_fractions.py index 6d90b77..e9a9ec4 100644 --- a/mathgenerator/funcs/divideFractionsFunc.py +++ b/mathgenerator/funcs/divide_fractions.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divideFractionsFunc(maxVal=10): @@ -33,5 +32,5 @@ def divideFractionsFunc(maxVal=10): return problem, solution -fractionDivision = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", +divide_fractions = Generator("Fraction Division", 16, "(a/b)/(c/d)=", "x/y", divideFractionsFunc) diff --git a/mathgenerator/funcs/divisionFunc.py b/mathgenerator/funcs/division.py similarity index 90% rename from mathgenerator/funcs/divisionFunc.py rename to mathgenerator/funcs/division.py index a99d9f7..63e70cb 100644 --- a/mathgenerator/funcs/divisionFunc.py +++ b/mathgenerator/funcs/division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divisionFunc(maxRes=99, maxDivid=99): diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidian_norm.py similarity index 52% rename from mathgenerator/funcs/euclidianNormFunc.py rename to mathgenerator/funcs/euclidian_norm.py index 9b66167..cfd178c 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidian_norm.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def euclidianNormFunc(maxEltAmt=20): @@ -9,6 +8,6 @@ def euclidianNormFunc(maxEltAmt=20): return problem, solution -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) +eucldian_norm = 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) diff --git a/mathgenerator/funcs/exponentiationFunc.py b/mathgenerator/funcs/exponentiation.py similarity index 91% rename from mathgenerator/funcs/exponentiationFunc.py rename to mathgenerator/funcs/exponentiation.py index 1b4cc0c..dd764e4 100644 --- a/mathgenerator/funcs/exponentiationFunc.py +++ b/mathgenerator/funcs/exponentiation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def exponentiationFunc(maxBase=20, maxExpo=10): diff --git a/mathgenerator/funcs/factorialFunc.py b/mathgenerator/funcs/factorial.py similarity index 90% rename from mathgenerator/funcs/factorialFunc.py rename to mathgenerator/funcs/factorial.py index 463d936..15d1e9d 100644 --- a/mathgenerator/funcs/factorialFunc.py +++ b/mathgenerator/funcs/factorial.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def factorialFunc(maxInput=6): diff --git a/mathgenerator/funcs/factoringFunc.py b/mathgenerator/funcs/factoring.py similarity index 95% rename from mathgenerator/funcs/factoringFunc.py rename to mathgenerator/funcs/factoring.py index a0ef82e..170a764 100644 --- a/mathgenerator/funcs/factoringFunc.py +++ b/mathgenerator/funcs/factoring.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def factoringFunc(range_x1=10, range_x2=10): diff --git a/mathgenerator/funcs/fibonacciSeriesFunc.py b/mathgenerator/funcs/fibonacci_series.py similarity index 91% rename from mathgenerator/funcs/fibonacciSeriesFunc.py rename to mathgenerator/funcs/fibonacci_series.py index 117befd..d81c782 100644 --- a/mathgenerator/funcs/fibonacciSeriesFunc.py +++ b/mathgenerator/funcs/fibonacci_series.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def fibonacciSeriesFunc(minNo=1): @@ -22,6 +21,6 @@ def fibonacciSeriesFunc(minNo=1): return problem, solution -fibonacciSeries = Generator( +fibonacci_series = Generator( "Fibonacci Series", 56, "fibonacci series of first a numbers", "prints the fibonacci series starting from 0 to a", fibonacciSeriesFunc) diff --git a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py b/mathgenerator/funcs/fourth_angle_of_quadrilateral.py similarity index 88% rename from mathgenerator/funcs/fourthAngleOfQuadriFunc.py rename to mathgenerator/funcs/fourth_angle_of_quadrilateral.py index 871b725..1ecc9aa 100644 --- a/mathgenerator/funcs/fourthAngleOfQuadriFunc.py +++ b/mathgenerator/funcs/fourth_angle_of_quadrilateral.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def fourthAngleOfQuadriFunc(maxAngle=180): @@ -15,7 +14,7 @@ def fourthAngleOfQuadriFunc(maxAngle=180): return problem, solution -fourthAngleOfQuadrilateral = Generator( +fourth_angle_of_quadrilateral = Generator( "Fourth Angle of Quadrilateral", 49, "Fourth angle of Quadrilateral with angles a,b,c =", "angle4", fourthAngleOfQuadriFunc) diff --git a/mathgenerator/funcs/multiplyFractionsFunc.py b/mathgenerator/funcs/fraction_multiplication.py similarity index 75% rename from mathgenerator/funcs/multiplyFractionsFunc.py rename to mathgenerator/funcs/fraction_multiplication.py index 39857c4..5c11940 100644 --- a/mathgenerator/funcs/multiplyFractionsFunc.py +++ b/mathgenerator/funcs/fraction_multiplication.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyFractionsFunc(maxVal=10): @@ -33,6 +32,6 @@ def multiplyFractionsFunc(maxVal=10): return problem, solution -fractionMultiplication = Generator("Fraction Multiplication", 28, - "(a/b)*(c/d)=", "x/y", - multiplyFractionsFunc) +fraction_multiplication = Generator("Fraction Multiplication", 28, + "(a/b)*(c/d)=", "x/y", + multiplyFractionsFunc) diff --git a/mathgenerator/funcs/gcdFunc.py b/mathgenerator/funcs/gcd.py similarity index 91% rename from mathgenerator/funcs/gcdFunc.py rename to mathgenerator/funcs/gcd.py index 4f271d1..ef1914b 100644 --- a/mathgenerator/funcs/gcdFunc.py +++ b/mathgenerator/funcs/gcd.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def gcdFunc(maxVal=20): diff --git a/mathgenerator/funcs/geometricMeanFunc.py b/mathgenerator/funcs/geometric_mean.py similarity index 78% rename from mathgenerator/funcs/geometricMeanFunc.py rename to mathgenerator/funcs/geometric_mean.py index ad80594..034ddf2 100644 --- a/mathgenerator/funcs/geometricMeanFunc.py +++ b/mathgenerator/funcs/geometric_mean.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def geometricMeanFunc(maxValue=100, maxNum=4): @@ -28,6 +27,6 @@ def geometricMeanFunc(maxValue=100, maxNum=4): return problem, solution -geometricMean = Generator("Geometric Mean of N Numbers", 67, - "Geometric mean of n numbers A1 , A2 , ... , An = ", - "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) +geometric_mean = Generator("Geometric Mean of N Numbers", 67, + "Geometric mean of n numbers A1 , A2 , ... , An = ", + "(A1*A2*...An)^(1/n) = ans", geometricMeanFunc) diff --git a/mathgenerator/funcs/geomProgrFunc.py b/mathgenerator/funcs/geometric_progression.py similarity index 94% rename from mathgenerator/funcs/geomProgrFunc.py rename to mathgenerator/funcs/geometric_progression.py index 0683c3c..7c5c8f3 100644 --- a/mathgenerator/funcs/geomProgrFunc.py +++ b/mathgenerator/funcs/geometric_progression.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def geomProgrFunc(number_values=6, @@ -24,7 +23,7 @@ def geomProgrFunc(number_values=6, return problem, solution -geometricprogression = Generator( +geometric_progression = Generator( "Geometric Progression", 66, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc) diff --git a/mathgenerator/funcs/harmonicMeanFunc.py b/mathgenerator/funcs/harmonic_mean.py similarity index 77% rename from mathgenerator/funcs/harmonicMeanFunc.py rename to mathgenerator/funcs/harmonic_mean.py index 5febc7e..179c061 100644 --- a/mathgenerator/funcs/harmonicMeanFunc.py +++ b/mathgenerator/funcs/harmonic_mean.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def harmonicMeanFunc(maxValue=100, maxNum=4): @@ -29,7 +28,7 @@ def harmonicMeanFunc(maxValue=100, maxNum=4): return problem, solution -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) +harmonic_mean = Generator("Harmonic Mean of N Numbers", 68, + "Harmonic mean of n numbers A1 , A2 , ... , An = ", + " n/((1/A1) + (1/A2) + ... + (1/An)) = ans", + harmonicMeanFunc) diff --git a/mathgenerator/funcs/hcfFunc.py b/mathgenerator/funcs/hcf.py similarity index 91% rename from mathgenerator/funcs/hcfFunc.py rename to mathgenerator/funcs/hcf.py index aaab950..f9a0366 100644 --- a/mathgenerator/funcs/hcfFunc.py +++ b/mathgenerator/funcs/hcf.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def hcfFunc(maxVal=20): diff --git a/mathgenerator/funcs/divisionToIntFunc.py b/mathgenerator/funcs/int_division.py similarity index 73% rename from mathgenerator/funcs/divisionToIntFunc.py rename to mathgenerator/funcs/int_division.py index fa0514b..65cfd08 100644 --- a/mathgenerator/funcs/divisionToIntFunc.py +++ b/mathgenerator/funcs/int_division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def divisionToIntFunc(maxA=25, maxB=25): @@ -14,4 +13,4 @@ def divisionToIntFunc(maxA=25, maxB=25): return problem, solution -intDivision = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) +int_division = Generator("Easy Division", 13, "a/b=", "c", divisionToIntFunc) diff --git a/mathgenerator/funcs/determinantToMatrix22.py b/mathgenerator/funcs/int_matrix_22_determinant.py similarity index 61% rename from mathgenerator/funcs/determinantToMatrix22.py rename to mathgenerator/funcs/int_matrix_22_determinant.py index 0117389..4e3d3ca 100644 --- a/mathgenerator/funcs/determinantToMatrix22.py +++ b/mathgenerator/funcs/int_matrix_22_determinant.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def determinantToMatrix22(maxMatrixVal=100): @@ -14,6 +13,6 @@ def determinantToMatrix22(maxMatrixVal=100): return problem, solution -intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 77, - "Det([[a,b],[c,d]]) =", " a * d - b * c", - determinantToMatrix22) +int_matrix_22_determinant = Generator("Determinant to 2x2 Matrix", 77, + "Det([[a,b],[c,d]]) =", " a * d - b * c", + determinantToMatrix22) diff --git a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py b/mathgenerator/funcs/intersection_of_two_lines.py similarity index 97% rename from mathgenerator/funcs/intersectionOfTwoLinesFunc.py rename to mathgenerator/funcs/intersection_of_two_lines.py index 4697201..c53f6be 100644 --- a/mathgenerator/funcs/intersectionOfTwoLinesFunc.py +++ b/mathgenerator/funcs/intersection_of_two_lines.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def intersectionOfTwoLinesFunc(minM=-10, @@ -67,7 +66,7 @@ def intersectionOfTwoLinesFunc(minM=-10, return problem, solution -intersectionOfTwoLines = Generator( +intersection_of_two_lines = 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) diff --git a/mathgenerator/funcs/matrixInversion.py b/mathgenerator/funcs/invert_matrix.py similarity index 94% rename from mathgenerator/funcs/matrixInversion.py rename to mathgenerator/funcs/invert_matrix.py index 4eb2787..7a196c5 100644 --- a/mathgenerator/funcs/matrixInversion.py +++ b/mathgenerator/funcs/invert_matrix.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator import sympy @@ -79,5 +78,5 @@ def matrixInversion(SquareMatrixDimension=3, return problem, solution -invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", - "A^(-1)", matrixInversion) +invert_matrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", + "A^(-1)", matrixInversion) diff --git a/mathgenerator/funcs/lcmFunc.py b/mathgenerator/funcs/lcm.py similarity index 92% rename from mathgenerator/funcs/lcmFunc.py rename to mathgenerator/funcs/lcm.py index ef57c2c..c786b52 100644 --- a/mathgenerator/funcs/lcmFunc.py +++ b/mathgenerator/funcs/lcm.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def lcmFunc(maxVal=20): diff --git a/mathgenerator/funcs/linearEquationsFunc.py b/mathgenerator/funcs/linear_equations.py similarity index 83% rename from mathgenerator/funcs/linearEquationsFunc.py rename to mathgenerator/funcs/linear_equations.py index 62dc081..73b62f5 100644 --- a/mathgenerator/funcs/linearEquationsFunc.py +++ b/mathgenerator/funcs/linear_equations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def linearEquationsFunc(n=2, varRange=20, coeffRange=20): @@ -30,5 +29,5 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): return problem, solution -linearEquations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", - "x=-20 & y=12", linearEquationsFunc) +linear_equations = Generator("Linear Equations", 26, "2x+5y=20 & 3x+6y=12", + "x=-20 & y=12", linearEquationsFunc) diff --git a/mathgenerator/funcs/logFunc.py b/mathgenerator/funcs/log.py similarity index 90% rename from mathgenerator/funcs/logFunc.py rename to mathgenerator/funcs/log.py index dcc7c05..bc147f2 100644 --- a/mathgenerator/funcs/logFunc.py +++ b/mathgenerator/funcs/log.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def logFunc(maxBase=3, maxVal=8): diff --git a/mathgenerator/funcs/matrixMultiplicationFunc.py b/mathgenerator/funcs/matrix_multiplication.py similarity index 85% rename from mathgenerator/funcs/matrixMultiplicationFunc.py rename to mathgenerator/funcs/matrix_multiplication.py index 9706782..51c60f9 100644 --- a/mathgenerator/funcs/matrixMultiplicationFunc.py +++ b/mathgenerator/funcs/matrix_multiplication.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def matrixMultiplicationFunc(maxVal=100, max_dim=10): @@ -54,6 +53,6 @@ def matrixMultiplicationFuncHelper(inp): return string -matrixMultiplication = Generator("Multiplication of two matrices", 46, - "Multiply two matrices A and B", "C", - matrixMultiplicationFunc) +matrix_multiplication = Generator("Multiplication of two matrices", 46, + "Multiply two matrices A and B", "C", + matrixMultiplicationFunc) diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/mean_median.py similarity index 71% rename from mathgenerator/funcs/meanMedianFunc.py rename to mathgenerator/funcs/mean_median.py index cd20310..91295c7 100644 --- a/mathgenerator/funcs/meanMedianFunc.py +++ b/mathgenerator/funcs/mean_median.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def meanMedianFunc(maxlen=10): @@ -15,6 +14,6 @@ def meanMedianFunc(maxlen=10): return problem, solution -meanMedian = Generator("Mean and Median", 76, - "Mean and median of given set of numbers", - "Mean, Median", meanMedianFunc) +mean_median = Generator("Mean and Median", 76, + "Mean and median of given set of numbers", + "Mean, Median", meanMedianFunc) diff --git a/mathgenerator/funcs/MidPointOfTwoPointFunc.py b/mathgenerator/funcs/midpoint_of_two_points.py similarity index 59% rename from mathgenerator/funcs/MidPointOfTwoPointFunc.py rename to mathgenerator/funcs/midpoint_of_two_points.py index 1a126b2..2b021aa 100644 --- a/mathgenerator/funcs/MidPointOfTwoPointFunc.py +++ b/mathgenerator/funcs/midpoint_of_two_points.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def MidPointOfTwoPointFunc(maxValue=20): @@ -13,6 +12,6 @@ def MidPointOfTwoPointFunc(maxValue=20): return problem, solution -midPointOfTwoPoint = Generator("Midpoint of the two point", 20, - "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", - MidPointOfTwoPointFunc) +midPoint_of_two_points = Generator("Midpoint of the two point", 20, + "((X1,Y1),(X2,Y2))=", "((X1+X2)/2,(Y1+Y2)/2)", + MidPointOfTwoPointFunc) diff --git a/mathgenerator/funcs/moduloFunc.py b/mathgenerator/funcs/modulo_division.py similarity index 72% rename from mathgenerator/funcs/moduloFunc.py rename to mathgenerator/funcs/modulo_division.py index 3d97d52..12f07a2 100644 --- a/mathgenerator/funcs/moduloFunc.py +++ b/mathgenerator/funcs/modulo_division.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def moduloFunc(maxRes=99, maxModulo=99): @@ -12,4 +11,4 @@ def moduloFunc(maxRes=99, maxModulo=99): return problem, solution -moduloDivision = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) +modulo_division = Generator("Modulo Division", 5, "a%b=", "c", moduloFunc) diff --git a/mathgenerator/funcs/multiplicationFunc.py b/mathgenerator/funcs/multiplication.py similarity index 93% rename from mathgenerator/funcs/multiplicationFunc.py rename to mathgenerator/funcs/multiplication.py index 2994ad6..7e6e36e 100644 --- a/mathgenerator/funcs/multiplicationFunc.py +++ b/mathgenerator/funcs/multiplication.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplicationFunc(maxRes=99, maxMulti=99): diff --git a/mathgenerator/funcs/multiplyComplexNumbersFunc.py b/mathgenerator/funcs/multiply_complex_numbers.py similarity index 69% rename from mathgenerator/funcs/multiplyComplexNumbersFunc.py rename to mathgenerator/funcs/multiply_complex_numbers.py index 8f825d0..03762e8 100644 --- a/mathgenerator/funcs/multiplyComplexNumbersFunc.py +++ b/mathgenerator/funcs/multiply_complex_numbers.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, @@ -13,6 +12,6 @@ def multiplyComplexNumbersFunc(minRealImaginaryNum=-20, return problem, solution -complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, - "(x + j) (y + j) = ", "xy + xj + yj -1", - multiplyComplexNumbersFunc) +multiply_complex_numbers = Generator("Multiplication of 2 complex numbers", 65, + "(x + j) (y + j) = ", "xy + xj + yj -1", + multiplyComplexNumbersFunc) diff --git a/mathgenerator/funcs/multiplyIntToMatrix22.py b/mathgenerator/funcs/multiply_int_to_22_matrix.py similarity index 87% rename from mathgenerator/funcs/multiplyIntToMatrix22.py rename to mathgenerator/funcs/multiply_int_to_22_matrix.py index 1409a5b..3d79834 100644 --- a/mathgenerator/funcs/multiplyIntToMatrix22.py +++ b/mathgenerator/funcs/multiply_int_to_22_matrix.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): @@ -14,7 +13,7 @@ def multiplyIntToMatrix22(maxMatrixVal=10, maxRes=100): return problem, solution -intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", +multiply_int_to_22_matrix = Generator("Integer Multiplication with 2x2 Matrix", 17, "k * [[a,b],[c,d]]=", "[[k*a,k*b],[k*c,k*d]]", multiplyIntToMatrix22) diff --git a/mathgenerator/funcs/nthFibonacciNumberFunc.py b/mathgenerator/funcs/nth_fibonacci_number.py similarity index 59% rename from mathgenerator/funcs/nthFibonacciNumberFunc.py rename to mathgenerator/funcs/nth_fibonacci_number.py index 1983a0d..cfb7e8a 100644 --- a/mathgenerator/funcs/nthFibonacciNumberFunc.py +++ b/mathgenerator/funcs/nth_fibonacci_number.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def nthFibonacciNumberFunc(maxN=100): @@ -11,6 +10,6 @@ def nthFibonacciNumberFunc(maxN=100): return problem, solution -nthFibonacciNumberGen = Generator("nth Fibonacci number", 62, - "What is the nth Fibonacci number", "Fn", - nthFibonacciNumberFunc) +nth_fibonacci_number = Generator("nth Fibonacci number", 62, + "What is the nth Fibonacci number", "Fn", + nthFibonacciNumberFunc) diff --git a/mathgenerator/funcs/percentageFunc.py b/mathgenerator/funcs/percentage.py similarity index 93% rename from mathgenerator/funcs/percentageFunc.py rename to mathgenerator/funcs/percentage.py index 36d72be..e108a10 100644 --- a/mathgenerator/funcs/percentageFunc.py +++ b/mathgenerator/funcs/percentage.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def percentageFunc(maxValue=99, maxpercentage=99): diff --git a/mathgenerator/funcs/permutationFunc.py b/mathgenerator/funcs/permutation.py similarity index 88% rename from mathgenerator/funcs/permutationFunc.py rename to mathgenerator/funcs/permutation.py index f4764c0..63d78a8 100644 --- a/mathgenerator/funcs/permutationFunc.py +++ b/mathgenerator/funcs/permutation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def permutationFunc(maxlength=20): @@ -12,7 +11,7 @@ def permutationFunc(maxlength=20): return problem, solution -permutations = Generator( +permutation = Generator( "Permutations", 42, "Total permutations of 4 objects at a time from 10 objects is", "5040", permutationFunc) diff --git a/mathgenerator/funcs/powerRuleDifferentiationFunc.py b/mathgenerator/funcs/power_rule_differentiation.py similarity index 69% rename from mathgenerator/funcs/powerRuleDifferentiationFunc.py rename to mathgenerator/funcs/power_rule_differentiation.py index 6e41170..cdc8c76 100644 --- a/mathgenerator/funcs/powerRuleDifferentiationFunc.py +++ b/mathgenerator/funcs/power_rule_differentiation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -19,6 +18,6 @@ def powerRuleDifferentiationFunc(maxCoef=10, maxExp=10, maxTerms=5): return problem, solution -powerRuleDifferentiation = Generator("Power Rule Differentiation", 7, "nx^m=", - "(n*m)x^(m-1)", - powerRuleDifferentiationFunc) +power_rule_differentiation = Generator("Power Rule Differentiation", 7, "nx^m=", + "(n*m)x^(m-1)", + powerRuleDifferentiationFunc) diff --git a/mathgenerator/funcs/powerRuleIntegrationFunc.py b/mathgenerator/funcs/power_rule_integration.py similarity index 76% rename from mathgenerator/funcs/powerRuleIntegrationFunc.py rename to mathgenerator/funcs/power_rule_integration.py index 4b5684b..7356a68 100644 --- a/mathgenerator/funcs/powerRuleIntegrationFunc.py +++ b/mathgenerator/funcs/power_rule_integration.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): @@ -22,5 +21,5 @@ def powerRuleIntegrationFunc(maxCoef=10, maxExp=10, maxTerms=5): return problem, solution -powerRuleIntegration = Generator("Power Rule Integration", 48, "nx^m=", - "(n/m)x^(m+1)", powerRuleIntegrationFunc) +power_rule_integration = Generator("Power Rule Integration", 48, "nx^m=", + "(n/m)x^(m+1)", powerRuleIntegrationFunc) diff --git a/mathgenerator/funcs/primeFactorsFunc.py b/mathgenerator/funcs/prime_factors.py similarity index 70% rename from mathgenerator/funcs/primeFactorsFunc.py rename to mathgenerator/funcs/prime_factors.py index 6eed7a9..575db01 100644 --- a/mathgenerator/funcs/primeFactorsFunc.py +++ b/mathgenerator/funcs/prime_factors.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def primeFactorsFunc(minVal=1, maxVal=200): @@ -23,5 +22,5 @@ def primeFactorsFunc(minVal=1, maxVal=200): return problem, solution -primeFactors = Generator("Prime Factorisation", 27, "Prime Factors of a =", - "[b, c, d, ...]", primeFactorsFunc) +prime_factors = Generator("Prime Factorisation", 27, "Prime Factors of a =", + "[b, c, d, ...]", primeFactorsFunc) diff --git a/mathgenerator/funcs/profitLossPercentFunc.py b/mathgenerator/funcs/profit_loss_percent.py similarity index 89% rename from mathgenerator/funcs/profitLossPercentFunc.py rename to mathgenerator/funcs/profit_loss_percent.py index c9d1d4d..c43351c 100644 --- a/mathgenerator/funcs/profitLossPercentFunc.py +++ b/mathgenerator/funcs/profit_loss_percent.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def profitLossPercentFunc(maxCP=1000, maxSP=1000): @@ -17,7 +16,7 @@ def profitLossPercentFunc(maxCP=1000, maxSP=1000): return problem, solution -profitLossPercent = Generator( +profit_loss_percent = Generator( "Profit or Loss Percent", 63, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc) diff --git a/mathgenerator/funcs/pythagoreanTheoremFunc.py b/mathgenerator/funcs/pythagorean_theorem.py similarity index 88% rename from mathgenerator/funcs/pythagoreanTheoremFunc.py rename to mathgenerator/funcs/pythagorean_theorem.py index 26dc744..7387499 100644 --- a/mathgenerator/funcs/pythagoreanTheoremFunc.py +++ b/mathgenerator/funcs/pythagorean_theorem.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def pythagoreanTheoremFunc(maxLength=20): @@ -12,7 +11,7 @@ def pythagoreanTheoremFunc(maxLength=20): return problem, solution -pythagoreanTheorem = Generator( +pythagorean_theorem = Generator( "Pythagorean Theorem", 25, "The hypotenuse of a right triangle given the other two lengths a and b = ", "hypotenuse", pythagoreanTheoremFunc) diff --git a/mathgenerator/funcs/quadraticEquation.py b/mathgenerator/funcs/quadratic_equation.py similarity index 89% rename from mathgenerator/funcs/quadraticEquation.py rename to mathgenerator/funcs/quadratic_equation.py index 021faff..5961852 100644 --- a/mathgenerator/funcs/quadraticEquation.py +++ b/mathgenerator/funcs/quadratic_equation.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def quadraticEquation(maxVal=100): @@ -16,7 +15,7 @@ def quadraticEquation(maxVal=100): return problem, solution -quadraticEquationSolve = Generator( +quadratic_equation = Generator( "Quadratic Equation", 50, "Find the zeros {x1,x2} of the quadratic equation ax^2+bx+c=0", "x1,x2", quadraticEquation) diff --git a/mathgenerator/funcs/radianToDegFunc.py b/mathgenerator/funcs/radian_to_deg.py similarity index 72% rename from mathgenerator/funcs/radianToDegFunc.py rename to mathgenerator/funcs/radian_to_deg.py index 5948eb7..e48acc0 100644 --- a/mathgenerator/funcs/radianToDegFunc.py +++ b/mathgenerator/funcs/radian_to_deg.py @@ -14,4 +14,5 @@ def radianToDegFunc(max_rad=3): return problem, solution -radianToDeg = Generator("Radians to Degrees", 87, "Angle a in degrees is = ", "b", radianToDegFunc) +radian_to_deg = Generator("Radians to Degrees", 87, + "Angle a in degrees is = ", "b", radianToDegFunc) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sector_area.py similarity index 68% rename from mathgenerator/funcs/sectorAreaFunc.py rename to mathgenerator/funcs/sector_area.py index db9dc7e..9a14728 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sector_area.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def sectorAreaFunc(maxRadius=49, maxAngle=359): @@ -12,6 +11,6 @@ def sectorAreaFunc(maxRadius=49, maxAngle=359): return problem, solution -sectorArea = Generator("Area of a Sector", 75, - "Area of a sector with radius, r and angle, a ", "Area", - sectorAreaFunc) +sector_area = Generator("Area of a Sector", 75, + "Area of a sector with radius, r and angle, a ", "Area", + sectorAreaFunc) diff --git a/mathgenerator/funcs/simpleInterestFunc.py b/mathgenerator/funcs/simple_interest.py similarity index 91% rename from mathgenerator/funcs/simpleInterestFunc.py rename to mathgenerator/funcs/simple_interest.py index 23f1afc..00242b1 100644 --- a/mathgenerator/funcs/simpleInterestFunc.py +++ b/mathgenerator/funcs/simple_interest.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): @@ -16,7 +15,7 @@ def simpleInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): return problem, solution -simpleInterest = Generator( +simple_interest = 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) diff --git a/mathgenerator/funcs/squareFunc.py b/mathgenerator/funcs/square.py similarity index 88% rename from mathgenerator/funcs/squareFunc.py rename to mathgenerator/funcs/square.py index dbe284c..28ed2c3 100644 --- a/mathgenerator/funcs/squareFunc.py +++ b/mathgenerator/funcs/square.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def squareFunc(maxSquareNum=20): diff --git a/mathgenerator/funcs/squareRootFunc.py b/mathgenerator/funcs/square_root.py similarity index 66% rename from mathgenerator/funcs/squareRootFunc.py rename to mathgenerator/funcs/square_root.py index 6cc410a..fa09006 100644 --- a/mathgenerator/funcs/squareRootFunc.py +++ b/mathgenerator/funcs/square_root.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def squareRootFunc(minNo=1, maxNo=12): @@ -11,4 +10,4 @@ def squareRootFunc(minNo=1, maxNo=12): return problem, solution -squareRoot = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) +square_root = Generator("Square Root", 6, "sqrt(a)=", "b", squareRootFunc) diff --git a/mathgenerator/funcs/subtractionFunc.py b/mathgenerator/funcs/subtraction.py similarity index 91% rename from mathgenerator/funcs/subtractionFunc.py rename to mathgenerator/funcs/subtraction.py index 9298037..47c7ef2 100644 --- a/mathgenerator/funcs/subtractionFunc.py +++ b/mathgenerator/funcs/subtraction.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def subtractionFunc(maxMinuend=99, maxDiff=99): diff --git a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py b/mathgenerator/funcs/sum_of_polygon_angles.py similarity index 50% rename from mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py rename to mathgenerator/funcs/sum_of_polygon_angles.py index c0a9d7b..29519df 100644 --- a/mathgenerator/funcs/sumOfAnglesOfPolygonFunc.py +++ b/mathgenerator/funcs/sum_of_polygon_angles.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def sumOfAnglesOfPolygonFunc(maxSides=12): @@ -11,6 +10,6 @@ def sumOfAnglesOfPolygonFunc(maxSides=12): return problem, solution -sumOfAnglesOfPolygon = Generator("Sum of Angles of Polygon", 58, - "Sum of angles of polygon with n sides = ", - "sum", sumOfAnglesOfPolygonFunc) +sum_of_polygon_angles = Generator("Sum of Angles of Polygon", 58, + "Sum of angles of polygon with n sides = ", + "sum", sumOfAnglesOfPolygonFunc) diff --git a/mathgenerator/funcs/surdsComparisonFunc.py b/mathgenerator/funcs/surds_comparison.py similarity index 72% rename from mathgenerator/funcs/surdsComparisonFunc.py rename to mathgenerator/funcs/surds_comparison.py index 278c3c4..7c2825c 100644 --- a/mathgenerator/funcs/surdsComparisonFunc.py +++ b/mathgenerator/funcs/surds_comparison.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surdsComparisonFunc(maxValue=100, maxRoot=10): @@ -18,6 +17,6 @@ def surdsComparisonFunc(maxValue=100, maxRoot=10): return problem, solution -surdsComparison = Generator("Comparing surds", 55, - "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", - surdsComparisonFunc) +surds_comparison = Generator("Comparing surds", 55, + "Fill in the blanks a^(1/b) _ c^(1/d)", "</>/=", + surdsComparisonFunc) diff --git a/mathgenerator/funcs/surfaceAreaCone.py b/mathgenerator/funcs/surface_area_cone.py similarity index 89% rename from mathgenerator/funcs/surfaceAreaCone.py rename to mathgenerator/funcs/surface_area_cone.py index 8497460..2d86c5e 100644 --- a/mathgenerator/funcs/surfaceAreaCone.py +++ b/mathgenerator/funcs/surface_area_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): @@ -14,7 +13,7 @@ def surfaceAreaCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaConeGen = Generator( +surface_area_cone = Generator( "Surface Area of cone", 38, "Surface area of cone with height = a units and radius = b units is", "c units^2", surfaceAreaCone) diff --git a/mathgenerator/funcs/surfaceAreaCube.py b/mathgenerator/funcs/surface_area_cube.py similarity index 52% rename from mathgenerator/funcs/surfaceAreaCube.py rename to mathgenerator/funcs/surface_area_cube.py index 42b07f4..f2f4a99 100644 --- a/mathgenerator/funcs/surfaceAreaCube.py +++ b/mathgenerator/funcs/surface_area_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCube(maxSide=20, unit='m'): @@ -10,6 +9,6 @@ def surfaceAreaCube(maxSide=20, unit='m'): return problem, solution -surfaceAreaCubeGen = Generator("Surface Area of Cube", 32, - "Surface area of cube with side a units is", - "b units^2", surfaceAreaCube) +surface_area_cube = Generator("Surface Area of Cube", 32, + "Surface area of cube with side a units is", + "b units^2", surfaceAreaCube) diff --git a/mathgenerator/funcs/surfaceAreaCuboid.py b/mathgenerator/funcs/surface_area_cuboid.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCuboid.py rename to mathgenerator/funcs/surface_area_cuboid.py index 0889441..723217c 100644 --- a/mathgenerator/funcs/surfaceAreaCuboid.py +++ b/mathgenerator/funcs/surface_area_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def surfaceAreaCuboid(maxSide=20, unit='m'): return problem, solution -surfaceAreaCuboidGen = Generator( +surface_area_cuboid = Generator( "Surface Area of Cuboid", 33, "Surface area of cuboid with sides = a units, b units, c units is", "d units^2", surfaceAreaCuboid) diff --git a/mathgenerator/funcs/surfaceAreaCylinder.py b/mathgenerator/funcs/surface_area_cylinder.py similarity index 88% rename from mathgenerator/funcs/surfaceAreaCylinder.py rename to mathgenerator/funcs/surface_area_cylinder.py index 3a7a1e8..bdbed93 100644 --- a/mathgenerator/funcs/surfaceAreaCylinder.py +++ b/mathgenerator/funcs/surface_area_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def surfaceAreaCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -surfaceAreaCylinderGen = Generator( +surface_area_cylinder = Generator( "Surface Area of Cylinder", 34, "Surface area of cylinder with height = a units and radius = b units is", "c units^2", surfaceAreaCylinder) diff --git a/mathgenerator/funcs/surfaceAreaSphere.py b/mathgenerator/funcs/surface_area_sphere.py similarity index 85% rename from mathgenerator/funcs/surfaceAreaSphere.py rename to mathgenerator/funcs/surface_area_sphere.py index 86a9456..bc5e91a 100644 --- a/mathgenerator/funcs/surfaceAreaSphere.py +++ b/mathgenerator/funcs/surface_area_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def surfaceAreaSphere(maxSide=20, unit='m'): @@ -11,7 +10,7 @@ def surfaceAreaSphere(maxSide=20, unit='m'): return problem, solution -surfaceAreaSphereGen = Generator( +surface_area_sphere = Generator( "Surface Area of Sphere", 60, "Surface area of sphere with radius = a units is", "d units^2", surfaceAreaSphere) diff --git a/mathgenerator/funcs/systemOfEquationsFunc.py b/mathgenerator/funcs/system_of_equations.py similarity index 89% rename from mathgenerator/funcs/systemOfEquationsFunc.py rename to mathgenerator/funcs/system_of_equations.py index ef00b0e..c35e549 100644 --- a/mathgenerator/funcs/systemOfEquationsFunc.py +++ b/mathgenerator/funcs/system_of_equations.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): @@ -48,6 +47,6 @@ def systemOfEquationsFunc(range_x=10, range_y=10, coeff_mult_range=10): # Add random (non-zero) multiple of equations to each other -systemOfEquations = Generator("Solve a System of Equations in R^2", 23, - "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", - systemOfEquationsFunc) +system_of_equations = Generator("Solve a System of Equations in R^2", 23, + "2x + 5y = 13, -3x - 3y = -6", "x = -1, y = 3", + systemOfEquationsFunc) diff --git a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py b/mathgenerator/funcs/third_angle_of_triangle.py similarity index 57% rename from mathgenerator/funcs/thirdAngleOfTriangleFunc.py rename to mathgenerator/funcs/third_angle_of_triangle.py index f5f7afb..b41ff35 100644 --- a/mathgenerator/funcs/thirdAngleOfTriangleFunc.py +++ b/mathgenerator/funcs/third_angle_of_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def thirdAngleOfTriangleFunc(maxAngle=89): @@ -12,6 +11,6 @@ def thirdAngleOfTriangleFunc(maxAngle=89): return problem, solution -thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, - "Third Angle of the triangle = ", "angle3", - thirdAngleOfTriangleFunc) +third_angle_of_triangle = Generator("Third Angle of Triangle", 22, + "Third Angle of the triangle = ", "angle3", + thirdAngleOfTriangleFunc) diff --git a/mathgenerator/funcs/isTriangleValidFunc.py b/mathgenerator/funcs/valid_triangle.py similarity index 72% rename from mathgenerator/funcs/isTriangleValidFunc.py rename to mathgenerator/funcs/valid_triangle.py index 19a4240..e8a5128 100644 --- a/mathgenerator/funcs/isTriangleValidFunc.py +++ b/mathgenerator/funcs/valid_triangle.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def isTriangleValidFunc(maxSideLength=50): @@ -21,6 +20,6 @@ def isTriangleValidFunc(maxSideLength=50): return problem, solution -doesTriangleExist = Generator("Triangle exists check", 19, - "Does triangle with sides a, b and c exist?", - "Yes/No", isTriangleValidFunc) +valid_triangle = Generator("Triangle exists check", 19, + "Does triangle with sides a, b and c exist?", + "Yes/No", isTriangleValidFunc) diff --git a/mathgenerator/funcs/vectorCrossFunc.py b/mathgenerator/funcs/vector_cross.py similarity index 72% rename from mathgenerator/funcs/vectorCrossFunc.py rename to mathgenerator/funcs/vector_cross.py index 318beec..92b82a9 100644 --- a/mathgenerator/funcs/vectorCrossFunc.py +++ b/mathgenerator/funcs/vector_cross.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorCrossFunc(minVal=-20, maxVal=20): @@ -15,5 +14,5 @@ def vectorCrossFunc(minVal=-20, maxVal=20): return problem, solution -vectorCross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", - vectorCrossFunc) +vector_cross = Generator("Cross Product of 2 Vectors", 43, "a X b = ", "c", + vectorCrossFunc) diff --git a/mathgenerator/funcs/vectorDotFunc.py b/mathgenerator/funcs/vector_dot.py similarity index 70% rename from mathgenerator/funcs/vectorDotFunc.py rename to mathgenerator/funcs/vector_dot.py index 0ca2609..608ce66 100644 --- a/mathgenerator/funcs/vectorDotFunc.py +++ b/mathgenerator/funcs/vector_dot.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def vectorDotFunc(minVal=-20, maxVal=20): @@ -12,5 +11,5 @@ def vectorDotFunc(minVal=-20, maxVal=20): return problem, solution -vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", - vectorDotFunc) +vector_dot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", + vectorDotFunc) diff --git a/mathgenerator/funcs/volumeCone.py b/mathgenerator/funcs/volume_cone.py similarity index 88% rename from mathgenerator/funcs/volumeCone.py rename to mathgenerator/funcs/volume_cone.py index 85dbd55..39a3a26 100644 --- a/mathgenerator/funcs/volumeCone.py +++ b/mathgenerator/funcs/volume_cone.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCone(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCone(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeConeGen = Generator( +volume_cone = Generator( "Volume of cone", 39, "Volume of cone with height = a units and radius = b units is", "c units^3", volumeCone) diff --git a/mathgenerator/funcs/volumeCube.py b/mathgenerator/funcs/volume_cube.py similarity index 55% rename from mathgenerator/funcs/volumeCube.py rename to mathgenerator/funcs/volume_cube.py index ff1ac76..1de5984 100644 --- a/mathgenerator/funcs/volumeCube.py +++ b/mathgenerator/funcs/volume_cube.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCube(maxSide=20, unit='m'): @@ -11,6 +10,6 @@ def volumeCube(maxSide=20, unit='m'): return problem, solution -volumeCubeGen = Generator("Volum of Cube", 35, - "Volume of cube with side a units is", "b units^3", - volumeCube) +volume_cube = Generator("Volum of Cube", 35, + "Volume of cube with side a units is", "b units^3", + volumeCube) diff --git a/mathgenerator/funcs/volumeCuboid.py b/mathgenerator/funcs/volume_cuboid.py similarity index 88% rename from mathgenerator/funcs/volumeCuboid.py rename to mathgenerator/funcs/volume_cuboid.py index d25d753..a1eee6f 100644 --- a/mathgenerator/funcs/volumeCuboid.py +++ b/mathgenerator/funcs/volume_cuboid.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCuboid(maxSide=20, unit='m'): @@ -13,7 +12,7 @@ def volumeCuboid(maxSide=20, unit='m'): return problem, solution -volumeCuboidGen = Generator( +volume_cuboid = Generator( "Volume of Cuboid", 36, "Volume of cuboid with sides = a units, b units, c units is", "d units^3", volumeCuboid) diff --git a/mathgenerator/funcs/volumeCylinder.py b/mathgenerator/funcs/volume_cylinder.py similarity index 88% rename from mathgenerator/funcs/volumeCylinder.py rename to mathgenerator/funcs/volume_cylinder.py index e021aab..28b89a1 100644 --- a/mathgenerator/funcs/volumeCylinder.py +++ b/mathgenerator/funcs/volume_cylinder.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): @@ -12,7 +11,7 @@ def volumeCylinder(maxRadius=20, maxHeight=50, unit='m'): return problem, solution -volumeCylinderGen = Generator( +volume_cylinder = Generator( "Volume of cylinder", 37, "Volume of cylinder with height = a units and radius = b units is", "c units^3", volumeCylinder) diff --git a/mathgenerator/funcs/volumeSphereFunc.py b/mathgenerator/funcs/volume_sphere.py similarity index 55% rename from mathgenerator/funcs/volumeSphereFunc.py rename to mathgenerator/funcs/volume_sphere.py index 038607e..b686bd4 100644 --- a/mathgenerator/funcs/volumeSphereFunc.py +++ b/mathgenerator/funcs/volume_sphere.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def volumeSphereFunc(maxRadius=100): @@ -11,6 +10,6 @@ def volumeSphereFunc(maxRadius=100): return problem, solution -volumeSphere = Generator("Volume of Sphere", 61, - "Volume of sphere with radius r m = ", - "(4*pi/3)*r*r*r", volumeSphereFunc) +volume_sphere = Generator("Volume of Sphere", 61, + "Volume of sphere with radius r m = ", + "(4*pi/3)*r*r*r", volumeSphereFunc) diff --git a/test.py b/test.py index 8cd6bd0..9625e78 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,7 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(70)) +print(mathgen.genById(40)) # prints each generator in genList """ @@ -11,5 +11,5 @@ list = mathgen.getGenList() for item in list: print(item[2]) -print(mathgen.getGenList()) +# print(mathgen.getGenList()) """ From 1f708af50f7374289f69e0c0b8671f5ae40f873e Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:37:59 -0400 Subject: [PATCH 81/99] fixed tests --- tests/test_mathgen.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_mathgen.py b/tests/test_mathgen.py index ed9066b..745b9dc 100644 --- a/tests/test_mathgen.py +++ b/tests/test_mathgen.py @@ -33,15 +33,15 @@ def test_division(maxRes, maxDivid): @given(maxRes=st.integers(min_value=1), maxModulo=st.integers(min_value=1)) -def test_moduloDivision(maxRes, maxModulo): +def test_modulo_division(maxRes, maxModulo): assume(maxRes > maxModulo) - problem, solution = moduloDivision.func(maxRes, maxModulo) + problem, solution = modulo_division.func(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)) -def test_squareRoot(minNo, maxNo): +def test_square_root(minNo, maxNo): assume(maxNo > minNo) - problem, solution = squareRoot.func(minNo, maxNo) + problem, solution = square_root.func(minNo, maxNo) assert eval(problem[:-1]) == float(solution) From 80278e44a94e29f6deebc2ff1865287730dd4f3a Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:43:54 -0400 Subject: [PATCH 82/99] update readme --- README.md | 178 +++++++++++++++++++++++++++--------------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 87ca9e6..8bec872 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 39+14= | 53 | addition | -| 1 | Subtraction | 28-20= | 8 | subtractionFunc | -| 2 | Multiplication | 23*2= | 46 | multiplicationFunc | -| 3 | Division | 34/27= | 1.2592592592592593 | divisionFunc | -| 4 | Binary Complement 1s | 01101= | 10010 | binaryComplement1sFunc | -| 5 | Modulo Division | 27%67= | 27 | moduloFunc | -| 6 | Square Root | sqrt(81)= | 9 | squareRootFunc | -| 7 | Power Rule Differentiation | 7x^2 + 1x^4 + 4x^8 + 5x^10 | 14x^1 + 4x^3 + 32x^7 + 50x^9 | powerRuleDifferentiationFunc | -| 8 | Square | 2^2= | 4 | squareFunc | -| 9 | LCM (Least Common Multiple) | LCM of 7 and 10 = | 70 | lcmFunc | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 3 = | 3 | gcdFunc | -| 11 | Basic Algebra | 9x + 8 = 9 | 1/9 | basicAlgebraFunc | -| 12 | Logarithm | log2(32) | 5 | logFunc | -| 13 | Easy Division | 176/11 = | 16 | divisionToIntFunc | -| 14 | Decimal to Binary | Binary of 49= | 110001 | DecimalToBinaryFunc | -| 15 | Binary to Decimal | 01100 | 12 | BinaryToDecimalFunc | -| 16 | Fraction Division | (9/5)/(10/2) | 9/25 | divideFractionsFunc | -| 17 | Integer Multiplication with 2x2 Matrix | 8 * [[8, 9], [0, 3]] = | [[64,72],[0,24]] | multiplyIntToMatrix22 | -| 18 | Area of Triangle | Area of triangle with side lengths: 19 2 15 = | (1.7998558638262156e-15+29.393876913398138j) | areaOfTriangleFunc | -| 19 | Triangle exists check | Does triangle with sides 9, 12 and 5 exist? | Yes | isTriangleValidFunc | -| 20 | Midpoint of the two point | (-3,-3),(-7,-4)= | (-5.0,-3.5) | MidPointOfTwoPointFunc | -| 21 | Factoring Quadratic | x^2+4x-12 | (x+6)(x-2) | factoringFunc | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 4 and 27 = | 149 | thirdAngleOfTriangleFunc | -| 23 | Solve a System of Equations in R^2 | -6x - 10y = 22, 4x - 3y = 53 | x = 8, y = -7 | systemOfEquationsFunc | -| 24 | Distance between 2 points | Find the distance between (6, 2) and (-2, -2) | sqrt(80) | distanceTwoPointsFunc | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 13 = | 16.40 | pythagoreanTheoremFunc | -| 26 | Linear Equations | 8x + -8y = -40 -20x + -16y = -108 | x = -7, y = -2 | linearEquationsFunc | -| 27 | Prime Factorisation | Find prime factors of 29 | [29] | primeFactorsFunc | -| 28 | Fraction Multiplication | (4/7)*(3/9) | 4/21 | multiplyFractionsFunc | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | regularPolygonAngleFunc | -| 30 | Combinations of Objects | Number of combinations from 20 objects picked 5 at a time | 15504 | combinationsFunc | -| 31 | Factorial | 3! = | 6 | factorialFunc | -| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surfaceAreaCube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 4m, 15m, 5m is | 310 m^2 | surfaceAreaCuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 14m and radius = 11m is | 1727 m^2 | surfaceAreaCylinder | -| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volumeCube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 9m, 6m, 15m is | 810 m^3 | volumeCuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 21m and radius = 4m is | 1055 m^3 | volumeCylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 7m and radius = 7m is | 371 m^2 | surfaceAreaCone | -| 39 | Volume of cone | Volume of cone with height = 46m and radius = 15m is | 10838 m^3 | volumeCone | -| 40 | Common Factors | Common Factors of 12 and 76 = | [1, 2, 4] | commonFactorsFunc | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 6x + 8 and y = 3/2x + 4 | (-8/9, 8/3) | intersectionOfTwoLinesFunc | -| 42 | Permutations | Number of Permutations from 15 objects picked 5 at a time = | 360360 | permutationFunc | -| 43 | Cross Product of 2 Vectors | [-13, -2, 0] X [-4, 14, -4] = | [8, -52, -190] | vectorCrossFunc | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/8 and 3/9? | > | compareFractionsFunc | -| 45 | Simple Interest | Simple interest for a principle amount of 6266 dollars, 8% rate of interest and for a time period of 3 years is = | 1503.84 | simpleInterestFunc | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>3</td><td>0</td></tr><tr><td>-1</td><td>-6</td></tr></table>and<table><tr><td>4</td><td>-7</td><td>5</td><td>-9</td></tr><tr><td>0</td><td>8</td><td>-10</td><td>-2</td></tr></table> | <table><tr><td>12</td><td>-21</td><td>15</td><td>-27</td></tr><tr><td>-4</td><td>-41</td><td>55</td><td>21</td></tr></table> | matrixMultiplicationFunc | -| 47 | Cube Root | cuberoot of 362 upto 2 decimal places is: | 7.13 | cubeRootFunc | -| 48 | Power Rule Integration | 2x^6 + 1x^5 + 7x^9 + 1x^10 | (2/6)x^7 + (1/5)x^6 + (7/9)x^10 + (1/10)x^11 + c | powerRuleIntegrationFunc | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 60 , 18, 7 = | 275 | fourthAngleOfQuadriFunc | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 40x^2+121x+89=0 | [-1.26, -1.76] | quadraticEquation | -| 51 | HCF (Highest Common Factor) | HCF of 4 and 12 = | 4 | hcfFunc | -| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 13 = | 21/216 | DiceSumProbFunc | -| 53 | Exponentiation | 11^8 = | 214358881 | exponentiationFunc | -| 54 | Confidence interval For sample S | The confidence interval for sample [239, 265, 215, 283, 231, 296, 270, 260, 289, 271, 245, 251, 206, 255, 257, 247, 292, 232, 276, 297, 263, 254, 279, 253, 211, 236, 274, 209, 275, 278, 212, 214, 226, 230, 256, 249, 293] with 95% confidence is | (262.3172302973649, 245.19628321614857) | confidenceIntervalFunc | -| 55 | Comparing surds | Fill in the blanks 86^(1/4) _ 39^(1/1) | < | surdsComparisonFunc | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeriesFunc | -| 57 | Trigonometric Values | What is sin(90)? | 1 | basicTrigonometryFunc | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sumOfAnglesOfPolygonFunc | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[19, 23, 36, 18, 44, 47, 18, 40, 27, 25, 14, 16, 6, 29, 50] | The Mean is 27.466666666666665 , Standard Deviation is 163.0488888888889, Variance is 12.769059827915637 | dataSummaryFunc | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 5m is | 314.1592653589793 m^2 | surfaceAreaSphere | -| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphereFunc | -| 62 | nth Fibonacci number | What is the 60th Fibonacci number? | 1548008755920 | nthFibonacciNumberFunc | -| 63 | Profit or Loss Percent | Profit percent when CP = 121 and SP = 615 is: | 408.26446280991735 | profitLossPercentFunc | -| 64 | Binary to Hexidecimal | 10110 | 0x16 | binaryToHexFunc | -| 65 | Multiplication of 2 complex numbers | (20-1j) * (-7+14j) = | (-126+287j) | multiplyComplexNumbersFunc | -| 66 | Geometric Progression | For the given GP [2, 24, 288, 3456, 41472, 497664] ,Find the value of a,common ratio,9th term value, sum upto 10th term | The value of a is 2, common ratio is 12 , 9th term is 859963392 , sum upto 10th term is 11257702586.0 | geomProgrFunc | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 18 , 24 , 99 , 12 = | (18*24*99*12)^(1/4) = 26.765480655440626 | geometricMeanFunc | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 41 and 82 = | 2/((1/41) + (1/82)) = 54.66666666666666 | harmonicMeanFunc | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[690.1926568125737, 148.904898302192, 222.19798825467595, 667.3276829127157, 366.9178192723557, 875.6869024243441, 336.14075266140685, 949.1256775112896, 626.0180041672427, 290.7427227038134, 207.55193301803965, 64.93900706542944, 736.3114771837603, 785.1756497858677] is: | 2142.639328828992 | euclidianNormFunc | -| 70 | Angle between 2 vectors | angle between the vectors [293.12905111302047, 909.0452944804068, 423.60965609823086, 870.8703924858319, 958.9076883380749, 837.4625321599826] and [938.5559146533071, 63.15299226225102, 418.14038421596024, 865.5267136591071, 513.9066820998474, 680.6577264839382] is: | NaN | angleBtwVectorsFunc | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 76 and -20 = | 96 | absoluteDifferenceFunc | -| 72 | Dot Product of 2 Vectors | [19, 10, -5] . [0, -18, 15] = | -255 | vectorDotFunc | -| 73 | Binary 2's Complement | 2's complement of 110 = | 10 | binary2sComplement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[61, 68, 75], [31, 77, 66], [33, 59, 58]]) is: | Matrix([[11/141, 37/564, -33/188], [95/1833, 1063/7332, -567/2444], [-178/1833, -1355/7332, 863/2444]]) | matrixInversion | -| 75 | Area of a Sector | Given radius, 20 and angle, 235. Find the area of the sector. | Area of sector = 820.30475 | sectorAreaFunc | -| 76 | Mean and Median | Given the series of numbers [7, 89, 72, 14, 97, 48, 35, 12, 11, 27]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 41.2 and Arithmetic median of this series is 31.0 | meanMedianFunc | -| 77 | Determinant to 2x2 Matrix | Det([[26, 78], [39, 24]]) = | -2418 | determinantToMatrix22 | -| 78 | Compound Interest | Compound Interest for a principle amount of 6842 dollars, 8% rate of interest and for a time period of 5 compounded monthly is = | 6842.0 | compoundInterestFunc | -| 79 | Decimal to Hexadecimal | Binary of 860= | 0x35c | deciToHexaFunc | -| 80 | Percentage of a number | What is 75% of 28? | Required percentage = 21.00% | percentageFunc | -| 81 | Celsius To Fahrenheit | Convert 30 degrees Celsius to degrees Fahrenheit = | 86.0 | celsiustofahrenheit | -| 82 | AP Term Calculation | Find the term number 47 of the AP series: -56, 37, 130 ... | 4222 | arithmeticProgressionTermFunc | -| 83 | AP Sum Calculation | Find the sum of first 79 terms of the AP series: 34, 24, 14 ... | -28124.0 | arithmeticProgressionSumFunc | -| 84 | Converts decimal to octal | The decimal number 2245 in Octal is: | 0o4305 | decimalToOctalFunc | -| 85 | Converts decimal to Roman Numerals | The number 1658 in Roman Numerals is: | MDCLVIII | decimalToRomanNumeralsFunc | -| 86 | Degrees to Radians | Angle 12 in radians is = | 0.21 | degreeToRadFunc | -| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radianToDegFunc | +| 0 | Addition | 6+12= | 18 | addition | +| 1 | Subtraction | 17-11= | 6 | subtraction | +| 2 | Multiplication | 99*1= | 99 | multiplication | +| 3 | Division | 23/29= | 0.7931034482758621 | division | +| 4 | Binary Complement 1s | 1000= | 0111 | binary_complement_1s | +| 5 | Modulo Division | 80%49= | 31 | modulo_division | +| 6 | Square Root | sqrt(49)= | 7 | square_root | +| 7 | Power Rule Differentiation | 10x^9 | 90x^8 | power_rule_differentiation | +| 8 | Square | 13^2= | 169 | square | +| 9 | LCM (Least Common Multiple) | LCM of 14 and 12 = | 84 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 5 and 19 = | 1 | gcd | +| 11 | Basic Algebra | 4x + 1 = 2 | 1/4 | basic_algebra | +| 12 | Logarithm | log2(128) | 7 | log | +| 13 | Easy Division | 264/11 = | 24 | int_division | +| 14 | Decimal to Binary | Binary of 96= | 1100000 | decimal_to_binary | +| 15 | Binary to Decimal | 1011 | 11 | binary_to_decimal | +| 16 | Fraction Division | (8/6)/(8/1) | 1/6 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[9, 9], [6, 5]] = | [[18,18],[12,10]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 16 9 3 = | (2.402930536500827e-15+39.242833740697165j) | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 37, 37 and 44 exist? | Yes | valid_triangle | +| 20 | Midpoint of the two point | (-16,19),(-4,10)= | (-10.0,14.5) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2+x-42 | (x+7)(x-6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 8 and 77 = | 95 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | -3x - 2y = 23, 7x + 8y = -87 | x = -1, y = -10 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (17, 10) and (15, 9) | sqrt(5) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 7 and 13 = | 14.76 | pythagorean_theorem | +| 26 | Linear Equations | -10x + -17y = 373 +17x + -17y = 238 | x = -5, y = -19 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 76 | [2, 2, 19] | prime_factors | +| 28 | Fraction Multiplication | (8/3)*(10/1) | 80/3 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 2 at a time | 136 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 20m, 13m, 15m is | 1510 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 18m and radius = 12m is | 2261 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 8m, 8m is | 896 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 33m and radius = 9m is | 8397 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 3m and radius = 9m is | 522 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 31m and radius = 1m is | 32 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 5 and 90 = | [1, 5] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 9/6x - 4 and y = -8/6x + 1 | (30/17, -23/17) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 19 objects picked 1 at a time = | 19 | permutation | +| 43 | Cross Product of 2 Vectors | [-3, -11, -6] X [2, 18, 11] = | [-13, 21, -32] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 10/4 and 6/9? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 9924 dollars, 2% rate of interest and for a time period of 2 years is = | 396.96 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>8</td><td>3</td><td>-7</td></tr><tr><td>-3</td><td>3</td><td>-10</td></tr><tr><td>-9</td><td>4</td><td>4</td></tr></table>and<table><tr><td>8</td><td>8</td><td>-3</td></tr><tr><td>9</td><td>4</td><td>1</td></tr><tr><td>-2</td><td>-7</td><td>-7</td></tr></table> | <table><tr><td>105</td><td>125</td><td>28</td></tr><tr><td>23</td><td>58</td><td>82</td></tr><tr><td>-44</td><td>-84</td><td>3</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 194 upto 2 decimal places is: | 5.79 | cube_root | +| 48 | Power Rule Integration | 8x^1 + 2x^1 + 8x^8 + 3x^3 | (8/1)x^2 + (2/1)x^2 + (8/8)x^9 + (3/3)x^4 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 179 , 29, 29 = | 123 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 77x^2+91x+14=0 | [-0.18, -1.0] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 11 and 1 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 13 = | 21/216 | dice_sum_probability | +| 53 | Exponentiation | 16^8 = | 4294967296 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [208, 221, 294, 275, 252, 253, 236, 216, 290, 296, 227, 251, 266, 277, 263, 268, 260, 248, 214, 298, 284, 293, 213, 264, 206, 238, 211, 203, 276, 279, 285, 220, 222, 299] with 90% confidence is | (261.88480835505726, 244.3504857625898) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 68^(1/3) _ 84^(1/8) | > | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | +| 57 | Trigonometric Values | What is sin(90)? | 1 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 8 sides = | 1080 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[35, 18, 28, 21, 50, 17, 30, 33, 14, 41, 35, 31, 7, 28, 8] | The Mean is 26.4 , Standard Deviation is 137.17333333333335, Variance is 11.7121020031988 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 12m is | 1809.5573684677208 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 61 m = | 950775.7894726198 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 98th Fibonacci number? | 135301852344707186688 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Loss percent when CP = 948 and SP = 729 is: | 23.10126582278481 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 10101010 | 0xaa | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-16+11j) * (7+19j) = | (-321-227j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,9th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 9th term is 46118408 , sum upto 8th term is 7686400.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 24 , 6 , 17 , 34 = | (24*6*17*34)^(1/4) = 16.985274997011718 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 72 , 17 and 14 = | 3/((1/72) + (1/17) + (1/14)) = 20.812955465587045 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[959.2746467619136, 621.8392214146113, 922.8483095629905, 386.90198896263786, 998.2816134301269, 924.4767901166847, 526.4451342917619, 540.6365528762716, 921.5612942821017, 507.86794502436186] is: | 2415.8011015687784 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [828.7073706479772, 912.8938227679938, 154.5891010528101, 789.3839240933659, 470.5951408141951, 365.0311186930294, 492.5244778860853, 433.2880676781922, 498.50124161369234] and [209.0406231603238, 64.7709335985529, 413.202808762719, 1.9226444773620122, 215.67348315298196, 668.6663275149825, 99.38710508880888, 74.18515931735026, 384.83132929263707] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 18 and 88 = | 70 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [5, 9, -5] . [11, 19, -16] = | 306 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[37, 41, 67], [47, 57, 55], [73, 23, 22]]) is: | Matrix([[1/7686, -71/9394, 782/42273], [-271/7686, 453/9394, -557/42273], [20/549, -17/671, -13/6039]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 39 and angle, 299. Find the area of the sector. | Area of sector = 3968.69546 | sector_area | +| 76 | Mean and Median | Given the series of numbers [2, 78, 43, 59, 84, 10, 17, 62, 44, 94]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.3 and Arithmetic median of this series is 51.5 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[74, 66], [92, 76]]) = | -448 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 8675 dollars, 10% rate of interest and for a time period of 3 compounded monthly is = | 8675.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 533= | 0x215 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 46% of 69? | Required percentage = 31.74% | percentage | +| 81 | Celsius To Fahrenheit | Convert -43 degrees Celsius to degrees Fahrenheit = | -45.400000000000006 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 67 of the AP series: 3, 99, 195 ... | 6339 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 16 terms of the AP series: 60, -36, -132 ... | -10560.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 3881 in Octal is: | 0o7451 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 2606 in Roman Numerals is: | MMDCVI | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 55 in radians is = | 0.96 | degree_to_rad | +| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | From 16a45b082b885f1abee29386d60efa0b48ab8780 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:50:08 -0400 Subject: [PATCH 83/99] Added args to Generator __call__ --- mathgenerator/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/__init__.py b/mathgenerator/__init__.py index c4cea28..090e18a 100644 --- a/mathgenerator/__init__.py +++ b/mathgenerator/__init__.py @@ -22,8 +22,8 @@ class Generator: self.id ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - def __call__(self, **kwargs): - return self.func(**kwargs) + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) def getGenList(): From 94b20746428e20c7f1a40e887b86216627864fb4 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:52:48 -0400 Subject: [PATCH 84/99] cleaned up mathgen.py --- README.md | 176 +++++++++++++++++++-------------------- mathgenerator/mathgen.py | 24 ------ 2 files changed, 88 insertions(+), 112 deletions(-) diff --git a/README.md b/README.md index 8bec872..50de608 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 6+12= | 18 | addition | -| 1 | Subtraction | 17-11= | 6 | subtraction | -| 2 | Multiplication | 99*1= | 99 | multiplication | -| 3 | Division | 23/29= | 0.7931034482758621 | division | -| 4 | Binary Complement 1s | 1000= | 0111 | binary_complement_1s | -| 5 | Modulo Division | 80%49= | 31 | modulo_division | -| 6 | Square Root | sqrt(49)= | 7 | square_root | -| 7 | Power Rule Differentiation | 10x^9 | 90x^8 | power_rule_differentiation | -| 8 | Square | 13^2= | 169 | square | -| 9 | LCM (Least Common Multiple) | LCM of 14 and 12 = | 84 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 5 and 19 = | 1 | gcd | -| 11 | Basic Algebra | 4x + 1 = 2 | 1/4 | basic_algebra | -| 12 | Logarithm | log2(128) | 7 | log | -| 13 | Easy Division | 264/11 = | 24 | int_division | -| 14 | Decimal to Binary | Binary of 96= | 1100000 | decimal_to_binary | -| 15 | Binary to Decimal | 1011 | 11 | binary_to_decimal | -| 16 | Fraction Division | (8/6)/(8/1) | 1/6 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 2 * [[9, 9], [6, 5]] = | [[18,18],[12,10]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 16 9 3 = | (2.402930536500827e-15+39.242833740697165j) | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 37, 37 and 44 exist? | Yes | valid_triangle | -| 20 | Midpoint of the two point | (-16,19),(-4,10)= | (-10.0,14.5) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2+x-42 | (x+7)(x-6) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 8 and 77 = | 95 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | -3x - 2y = 23, 7x + 8y = -87 | x = -1, y = -10 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (17, 10) and (15, 9) | sqrt(5) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 7 and 13 = | 14.76 | pythagorean_theorem | -| 26 | Linear Equations | -10x + -17y = 373 -17x + -17y = 238 | x = -5, y = -19 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 76 | [2, 2, 19] | prime_factors | -| 28 | Fraction Multiplication | (8/3)*(10/1) | 80/3 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 3 sides | 60.0 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 17 objects picked 2 at a time | 136 | combinations | -| 31 | Factorial | 0! = | 1 | factorial | +| 0 | Addition | 42+42= | 84 | addition | +| 1 | Subtraction | 6-3= | 3 | subtraction | +| 2 | Multiplication | 5*10= | 50 | multiplication | +| 3 | Division | 48/95= | 0.5052631578947369 | division | +| 4 | Binary Complement 1s | 0110000= | 1001111 | binary_complement_1s | +| 5 | Modulo Division | 92%7= | 1 | modulo_division | +| 6 | Square Root | sqrt(1)= | 1 | square_root | +| 7 | Power Rule Differentiation | 3x^8 + 7x^6 + 3x^7 + 1x^3 | 24x^7 + 42x^5 + 21x^6 + 3x^2 | power_rule_differentiation | +| 8 | Square | 19^2= | 361 | square | +| 9 | LCM (Least Common Multiple) | LCM of 14 and 16 = | 112 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 7 and 18 = | 1 | gcd | +| 11 | Basic Algebra | 10x + 1 = 2 | 1/10 | basic_algebra | +| 12 | Logarithm | log3(6561) | 8 | log | +| 13 | Easy Division | 198/18 = | 11 | int_division | +| 14 | Decimal to Binary | Binary of 17= | 10001 | decimal_to_binary | +| 15 | Binary to Decimal | 100111010 | 314 | binary_to_decimal | +| 16 | Fraction Division | (9/7)/(4/9) | 81/28 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 15 * [[6, 6], [1, 1]] = | [[90,90],[15,15]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 18 17 13 = | 105.29957264870546 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 12, 33 and 30 exist? | Yes | valid_triangle | +| 20 | Midpoint of the two point | (-7,-12),(-1,6)= | (-4.0,-3.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-9x+8 | (x-8)(x-1) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 55 and 17 = | 108 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | 10x - 6y = 46, 9x + 5y = -21 | x = 1, y = -6 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (14, 8) and (1, -11) | sqrt(530) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 20 and 14 = | 24.41 | pythagorean_theorem | +| 26 | Linear Equations | -2x + 14y = 154 +-10x + -8y = -166 | x = 7, y = 12 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 189 | [3, 3, 3, 7] | prime_factors | +| 28 | Fraction Multiplication | (9/4)*(5/9) | 5/4 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 14 sides | 154.29 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 9 at a time | 24310 | combinations | +| 31 | Factorial | 2! = | 2 | factorial | | 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 20m, 13m, 15m is | 1510 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 18m and radius = 12m is | 2261 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 8m, 8m is | 896 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 33m and radius = 9m is | 8397 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 3m and radius = 9m is | 522 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 31m and radius = 1m is | 32 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 5 and 90 = | [1, 5] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 9/6x - 4 and y = -8/6x + 1 | (30/17, -23/17) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 19 objects picked 1 at a time = | 19 | permutation | -| 43 | Cross Product of 2 Vectors | [-3, -11, -6] X [2, 18, 11] = | [-13, 21, -32] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 10/4 and 6/9? | > | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 9924 dollars, 2% rate of interest and for a time period of 2 years is = | 396.96 | simple_interest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>8</td><td>3</td><td>-7</td></tr><tr><td>-3</td><td>3</td><td>-10</td></tr><tr><td>-9</td><td>4</td><td>4</td></tr></table>and<table><tr><td>8</td><td>8</td><td>-3</td></tr><tr><td>9</td><td>4</td><td>1</td></tr><tr><td>-2</td><td>-7</td><td>-7</td></tr></table> | <table><tr><td>105</td><td>125</td><td>28</td></tr><tr><td>23</td><td>58</td><td>82</td></tr><tr><td>-44</td><td>-84</td><td>3</td></tr></table> | matrix_multiplication | -| 47 | Cube Root | cuberoot of 194 upto 2 decimal places is: | 5.79 | cube_root | -| 48 | Power Rule Integration | 8x^1 + 2x^1 + 8x^8 + 3x^3 | (8/1)x^2 + (2/1)x^2 + (8/8)x^9 + (3/3)x^4 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 179 , 29, 29 = | 123 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 77x^2+91x+14=0 | [-0.18, -1.0] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 11 and 1 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 13 = | 21/216 | dice_sum_probability | -| 53 | Exponentiation | 16^8 = | 4294967296 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [208, 221, 294, 275, 252, 253, 236, 216, 290, 296, 227, 251, 266, 277, 263, 268, 260, 248, 214, 298, 284, 293, 213, 264, 206, 238, 211, 203, 276, 279, 285, 220, 222, 299] with 90% confidence is | (261.88480835505726, 244.3504857625898) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 68^(1/3) _ 84^(1/8) | > | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | -| 57 | Trigonometric Values | What is sin(90)? | 1 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 8 sides = | 1080 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[35, 18, 28, 21, 50, 17, 30, 33, 14, 41, 35, 31, 7, 28, 8] | The Mean is 26.4 , Standard Deviation is 137.17333333333335, Variance is 11.7121020031988 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 12m is | 1809.5573684677208 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 61 m = | 950775.7894726198 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 98th Fibonacci number? | 135301852344707186688 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Loss percent when CP = 948 and SP = 729 is: | 23.10126582278481 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 10101010 | 0xaa | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (-16+11j) * (7+19j) = | (-321-227j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,9th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 9th term is 46118408 , sum upto 8th term is 7686400.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 24 , 6 , 17 , 34 = | (24*6*17*34)^(1/4) = 16.985274997011718 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 72 , 17 and 14 = | 3/((1/72) + (1/17) + (1/14)) = 20.812955465587045 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[959.2746467619136, 621.8392214146113, 922.8483095629905, 386.90198896263786, 998.2816134301269, 924.4767901166847, 526.4451342917619, 540.6365528762716, 921.5612942821017, 507.86794502436186] is: | 2415.8011015687784 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [828.7073706479772, 912.8938227679938, 154.5891010528101, 789.3839240933659, 470.5951408141951, 365.0311186930294, 492.5244778860853, 433.2880676781922, 498.50124161369234] and [209.0406231603238, 64.7709335985529, 413.202808762719, 1.9226444773620122, 215.67348315298196, 668.6663275149825, 99.38710508880888, 74.18515931735026, 384.83132929263707] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 18 and 88 = | 70 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [5, 9, -5] . [11, 19, -16] = | 306 | vector_dot | -| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[37, 41, 67], [47, 57, 55], [73, 23, 22]]) is: | Matrix([[1/7686, -71/9394, 782/42273], [-271/7686, 453/9394, -557/42273], [20/549, -17/671, -13/6039]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 39 and angle, 299. Find the area of the sector. | Area of sector = 3968.69546 | sector_area | -| 76 | Mean and Median | Given the series of numbers [2, 78, 43, 59, 84, 10, 17, 62, 44, 94]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 49.3 and Arithmetic median of this series is 51.5 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[74, 66], [92, 76]]) = | -448 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 8675 dollars, 10% rate of interest and for a time period of 3 compounded monthly is = | 8675.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 533= | 0x215 | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 46% of 69? | Required percentage = 31.74% | percentage | -| 81 | Celsius To Fahrenheit | Convert -43 degrees Celsius to degrees Fahrenheit = | -45.400000000000006 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 67 of the AP series: 3, 99, 195 ... | 6339 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 16 terms of the AP series: 60, -36, -132 ... | -10560.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 3881 in Octal is: | 0o7451 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 2606 in Roman Numerals is: | MMDCVI | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 55 in radians is = | 0.96 | degree_to_rad | -| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 6m, 3m, 9m is | 198 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 25m and radius = 17m is | 4486 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 12m, 8m, 20m is | 1920 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 35m and radius = 13m is | 18582 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 45m and radius = 1m is | 144 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 25m and radius = 16m is | 6702 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 52 and 89 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -3/5x + 10 and y = -3/4x - 5 | (-100, 70) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 14 objects picked 8 at a time = | 121080960 | permutation | +| 43 | Cross Product of 2 Vectors | [-16, -2, -1] X [-16, -7, 19] = | [-45, 320, 80] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 9/2 and 9/10? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 4736 dollars, 1% rate of interest and for a time period of 7 years is = | 331.52 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>4</td><td>-2</td><td>-2</td></tr><tr><td>4</td><td>6</td><td>-4</td></tr><tr><td>-1</td><td>1</td><td>-5</td></tr><tr><td>-10</td><td>8</td><td>3</td></tr></table>and<table><tr><td>6</td><td>3</td><td>9</td><td>-4</td></tr><tr><td>-4</td><td>-6</td><td>-3</td><td>0</td></tr><tr><td>-10</td><td>-3</td><td>-7</td><td>-7</td></tr></table> | <table><tr><td>52</td><td>30</td><td>56</td><td>-2</td></tr><tr><td>40</td><td>-12</td><td>46</td><td>12</td></tr><tr><td>40</td><td>6</td><td>23</td><td>39</td></tr><tr><td>-122</td><td>-87</td><td>-135</td><td>19</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 744 upto 2 decimal places is: | 9.06 | cube_root | +| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 96 , 118, 81 = | 65 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 88x^2+193x+32=0 | [-0.18, -2.01] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 16 and 3 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 5 = | 1/6 | dice_sum_probability | +| 53 | Exponentiation | 6^5 = | 7776 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [202, 227, 233, 291, 294, 242, 247, 283, 251, 228, 216, 240, 289, 243, 282, 238, 257, 255, 203, 276, 293, 214, 207, 210, 265, 212, 236, 297, 256, 280, 288] with 99% confidence is | (264.1616033070315, 236.1609773381298) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 27^(1/4) _ 87^(1/1) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 5 numbers is ? | [0, 1, 1, 2, 3] | fibonacci_series | +| 57 | Trigonometric Values | What is tan(45)? | 1 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 22, 9, 8, 12, 36, 39, 19, 12, 11, 49, 27, 22, 27, 26] | The Mean is 22.0 , Standard Deviation is 139.73333333333332, Variance is 11.820885471627467 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 20m is | 5026.548245743669 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 69 m = | 1376055.2813841724 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 33th Fibonacci number? | 3524578 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Loss percent when CP = 883 and SP = 393 is: | 55.492638731596834 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 00010100 | 0x14 | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-3+0j) * 16j = | (-0-48j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [4, 20, 100, 500, 2500, 12500] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 4, common ratio is 5 , 6th term is 12500 , sum upto 8th term is 390624.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 41 and 54 = | (41*54)^(1/2) = 47.05316142407437 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 8 , 71 and 68 = | 3/((1/8) + (1/71) + (1/68)) = 19.507070707070707 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[865.7151963569839, 226.4057036465874, 14.824800248170567, 706.1262882326861, 865.8569268338141, 559.1781356802616, 756.7052133079868, 164.9216239520549, 609.9900978280176, 697.4174107118105, 486.57415492429044, 993.1670184061886, 640.1534234049134, 368.9654609248786] is: | 2364.168521129801 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [275.27222370228554, 360.4704403955723, 828.9475033885524, 339.2072270059939, 233.95550521713915, 887.4530688219838, 390.16238631557763, 351.47764321737054, 103.32257528086953, 867.8009318330934, 525.3164032492849] and [886.3103662444178, 562.6461993125878, 190.16362305272116, 909.6771690252709, 555.7134133875247, 553.903105904929, 828.5687817542065, 208.31947038854025, 388.8973006974784, 424.9452146134446, 460.00088587027324] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 25 and -64 = | 89 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [-20, -4, 9] . [4, -19, -3] = | -31 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 110000 = | 10000 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[43, 31, 88], [96, 41, 11], [68, 89, 13]]) is: | Matrix([[-223/235925, 7429/471850, -3267/471850], [-10/9437, -217/18874, 319/18874], [2878/235925, -1719/471850, -1213/471850]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 45 and angle, 191. Find the area of the sector. | Area of sector = 3375.24861 | sector_area | +| 76 | Mean and Median | Given the series of numbers [44, 90, 6, 3, 25, 67, 76, 86, 51, 69]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 51.7 and Arithmetic median of this series is 59.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[51, 51], [15, 83]]) = | 3468 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 2506 dollars, 5% rate of interest and for a time period of 10 compounded monthly is = | 2506.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 588= | 0x24c | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 21% of 84? | Required percentage = 17.64% | percentage | +| 81 | Celsius To Fahrenheit | Convert 62 degrees Celsius to degrees Fahrenheit = | 143.60000000000002 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 76 of the AP series: 94, 46, -2 ... | -3506 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 20 terms of the AP series: -69, -146, -223 ... | -16010.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 1829 in Octal is: | 0o3445 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 1938 in Roman Numerals is: | MCMXXXVIII | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 197 in radians is = | 3.44 | degree_to_rad | +| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radian_to_deg | diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 959093b..5b0ab6b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -6,32 +6,8 @@ from .__init__ import getGenList genList = getGenList() -# || Generator class - - -class Generator: - def __init__(self, title, id, generalProb, generalSol, func): - self.title = title - self.id = id - self.generalProb = generalProb - self.generalSol = generalSol - self.func = func - genList.append([id, title, self]) - - def __str__(self): - return str( - self.id - ) + " " + self.title + " " + self.generalProb + " " + self.generalSol - - def __call__(self, *args, **kwargs): - return self.func(*args, **kwargs) - # || Non-generator Functions def genById(id): generator = genList[id][2] return (generator()) - - -# Format is: -# <title> = Generator("<Title>", <id>, <generalized problem>, <generalized solution>, <function name>) From 44bd19d0d27cf4c903d6c86d91fdca52c352f614 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 11:55:42 -0400 Subject: [PATCH 85/99] differentiation fixes --- README.md | 179 +++++++++--------- mathgenerator/funcs/__init__.py | 2 +- ...ferentiationFunc.py => differentiation.py} | 0 test.py | 2 +- 4 files changed, 92 insertions(+), 91 deletions(-) rename mathgenerator/funcs/{differentiationFunc.py => differentiation.py} (100%) diff --git a/README.md b/README.md index 50de608..42b6eab 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,93 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 42+42= | 84 | addition | -| 1 | Subtraction | 6-3= | 3 | subtraction | -| 2 | Multiplication | 5*10= | 50 | multiplication | -| 3 | Division | 48/95= | 0.5052631578947369 | division | -| 4 | Binary Complement 1s | 0110000= | 1001111 | binary_complement_1s | -| 5 | Modulo Division | 92%7= | 1 | modulo_division | -| 6 | Square Root | sqrt(1)= | 1 | square_root | -| 7 | Power Rule Differentiation | 3x^8 + 7x^6 + 3x^7 + 1x^3 | 24x^7 + 42x^5 + 21x^6 + 3x^2 | power_rule_differentiation | -| 8 | Square | 19^2= | 361 | square | -| 9 | LCM (Least Common Multiple) | LCM of 14 and 16 = | 112 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 7 and 18 = | 1 | gcd | -| 11 | Basic Algebra | 10x + 1 = 2 | 1/10 | basic_algebra | -| 12 | Logarithm | log3(6561) | 8 | log | -| 13 | Easy Division | 198/18 = | 11 | int_division | -| 14 | Decimal to Binary | Binary of 17= | 10001 | decimal_to_binary | -| 15 | Binary to Decimal | 100111010 | 314 | binary_to_decimal | -| 16 | Fraction Division | (9/7)/(4/9) | 81/28 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 15 * [[6, 6], [1, 1]] = | [[90,90],[15,15]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 18 17 13 = | 105.29957264870546 | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 12, 33 and 30 exist? | Yes | valid_triangle | -| 20 | Midpoint of the two point | (-7,-12),(-1,6)= | (-4.0,-3.0) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2-9x+8 | (x-8)(x-1) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 55 and 17 = | 108 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | 10x - 6y = 46, 9x + 5y = -21 | x = 1, y = -6 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (14, 8) and (1, -11) | sqrt(530) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 20 and 14 = | 24.41 | pythagorean_theorem | -| 26 | Linear Equations | -2x + 14y = 154 --10x + -8y = -166 | x = 7, y = 12 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 189 | [3, 3, 3, 7] | prime_factors | -| 28 | Fraction Multiplication | (9/4)*(5/9) | 5/4 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 14 sides | 154.29 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 17 objects picked 9 at a time | 24310 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 15m is | 1350 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 6m, 3m, 9m is | 198 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 25m and radius = 17m is | 4486 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 6m is | 216 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 12m, 8m, 20m is | 1920 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 35m and radius = 13m is | 18582 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 45m and radius = 1m is | 144 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 25m and radius = 16m is | 6702 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 52 and 89 = | [1] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -3/5x + 10 and y = -3/4x - 5 | (-100, 70) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 14 objects picked 8 at a time = | 121080960 | permutation | -| 43 | Cross Product of 2 Vectors | [-16, -2, -1] X [-16, -7, 19] = | [-45, 320, 80] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 9/2 and 9/10? | > | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 4736 dollars, 1% rate of interest and for a time period of 7 years is = | 331.52 | simple_interest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>4</td><td>-2</td><td>-2</td></tr><tr><td>4</td><td>6</td><td>-4</td></tr><tr><td>-1</td><td>1</td><td>-5</td></tr><tr><td>-10</td><td>8</td><td>3</td></tr></table>and<table><tr><td>6</td><td>3</td><td>9</td><td>-4</td></tr><tr><td>-4</td><td>-6</td><td>-3</td><td>0</td></tr><tr><td>-10</td><td>-3</td><td>-7</td><td>-7</td></tr></table> | <table><tr><td>52</td><td>30</td><td>56</td><td>-2</td></tr><tr><td>40</td><td>-12</td><td>46</td><td>12</td></tr><tr><td>40</td><td>6</td><td>23</td><td>39</td></tr><tr><td>-122</td><td>-87</td><td>-135</td><td>19</td></tr></table> | matrix_multiplication | -| 47 | Cube Root | cuberoot of 744 upto 2 decimal places is: | 9.06 | cube_root | -| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 96 , 118, 81 = | 65 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 88x^2+193x+32=0 | [-0.18, -2.01] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 16 and 3 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 5 = | 1/6 | dice_sum_probability | -| 53 | Exponentiation | 6^5 = | 7776 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [202, 227, 233, 291, 294, 242, 247, 283, 251, 228, 216, 240, 289, 243, 282, 238, 257, 255, 203, 276, 293, 214, 207, 210, 265, 212, 236, 297, 256, 280, 288] with 99% confidence is | (264.1616033070315, 236.1609773381298) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 27^(1/4) _ 87^(1/1) | < | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 5 numbers is ? | [0, 1, 1, 2, 3] | fibonacci_series | -| 57 | Trigonometric Values | What is tan(45)? | 1 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 22, 9, 8, 12, 36, 39, 19, 12, 11, 49, 27, 22, 27, 26] | The Mean is 22.0 , Standard Deviation is 139.73333333333332, Variance is 11.820885471627467 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 20m is | 5026.548245743669 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 69 m = | 1376055.2813841724 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 33th Fibonacci number? | 3524578 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Loss percent when CP = 883 and SP = 393 is: | 55.492638731596834 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 00010100 | 0x14 | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (-3+0j) * 16j = | (-0-48j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [4, 20, 100, 500, 2500, 12500] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 4, common ratio is 5 , 6th term is 12500 , sum upto 8th term is 390624.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 41 and 54 = | (41*54)^(1/2) = 47.05316142407437 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 8 , 71 and 68 = | 3/((1/8) + (1/71) + (1/68)) = 19.507070707070707 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[865.7151963569839, 226.4057036465874, 14.824800248170567, 706.1262882326861, 865.8569268338141, 559.1781356802616, 756.7052133079868, 164.9216239520549, 609.9900978280176, 697.4174107118105, 486.57415492429044, 993.1670184061886, 640.1534234049134, 368.9654609248786] is: | 2364.168521129801 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [275.27222370228554, 360.4704403955723, 828.9475033885524, 339.2072270059939, 233.95550521713915, 887.4530688219838, 390.16238631557763, 351.47764321737054, 103.32257528086953, 867.8009318330934, 525.3164032492849] and [886.3103662444178, 562.6461993125878, 190.16362305272116, 909.6771690252709, 555.7134133875247, 553.903105904929, 828.5687817542065, 208.31947038854025, 388.8973006974784, 424.9452146134446, 460.00088587027324] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 25 and -64 = | 89 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [-20, -4, 9] . [4, -19, -3] = | -31 | vector_dot | -| 73 | Binary 2's Complement | 2's complement of 110000 = | 10000 | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[43, 31, 88], [96, 41, 11], [68, 89, 13]]) is: | Matrix([[-223/235925, 7429/471850, -3267/471850], [-10/9437, -217/18874, 319/18874], [2878/235925, -1719/471850, -1213/471850]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 45 and angle, 191. Find the area of the sector. | Area of sector = 3375.24861 | sector_area | -| 76 | Mean and Median | Given the series of numbers [44, 90, 6, 3, 25, 67, 76, 86, 51, 69]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 51.7 and Arithmetic median of this series is 59.0 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[51, 51], [15, 83]]) = | 3468 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 2506 dollars, 5% rate of interest and for a time period of 10 compounded monthly is = | 2506.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 588= | 0x24c | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 21% of 84? | Required percentage = 17.64% | percentage | -| 81 | Celsius To Fahrenheit | Convert 62 degrees Celsius to degrees Fahrenheit = | 143.60000000000002 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 76 of the AP series: 94, 46, -2 ... | -3506 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 20 terms of the AP series: -69, -146, -223 ... | -16010.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 1829 in Octal is: | 0o3445 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 1938 in Roman Numerals is: | MCMXXXVIII | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 197 in radians is = | 3.44 | degree_to_rad | -| 87 | Radians to Degrees | Angle 3 in degrees is = | 171.89 | radian_to_deg | +| 0 | Addition | 39+28= | 67 | addition | +| 1 | Subtraction | 46-1= | 45 | subtraction | +| 2 | Multiplication | 70*1= | 70 | multiplication | +| 3 | Division | 79/83= | 0.9518072289156626 | division | +| 4 | Binary Complement 1s | 00= | 11 | binary_complement_1s | +| 5 | Modulo Division | 7%99= | 7 | modulo_division | +| 6 | Square Root | sqrt(36)= | 6 | square_root | +| 7 | Power Rule Differentiation | 1x^3 + 6x^9 + 4x^9 + 2x^3 + 7x^8 | 3x^2 + 54x^8 + 36x^8 + 6x^2 + 56x^7 | power_rule_differentiation | +| 8 | Square | 15^2= | 225 | square | +| 9 | LCM (Least Common Multiple) | LCM of 16 and 10 = | 80 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 13 = | 1 | gcd | +| 11 | Basic Algebra | 7x + 2 = 6 | 4/7 | basic_algebra | +| 12 | Logarithm | log2(16) | 4 | log | +| 13 | Easy Division | 345/15 = | 23 | int_division | +| 14 | Decimal to Binary | Binary of 4= | 100 | decimal_to_binary | +| 15 | Binary to Decimal | 0 | 0 | binary_to_decimal | +| 16 | Fraction Division | (3/10)/(3/5) | 1/2 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[8, 0], [7, 3]] = | [[40,0],[35,15]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 15 15 6 = | 44.090815370097204 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 15, 42 and 1 exist? | No | valid_triangle | +| 20 | Midpoint of the two point | (-10,19),(-11,-11)= | (-10.5,4.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-4x-12 | (x-6)(x+2) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 71 and 59 = | 50 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | -5x - 7y = -66, -x + 5y = 6 | x = 9, y = 3 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (-8, -11) and (5, -4) | sqrt(218) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 19 = | 25.50 | pythagorean_theorem | +| 26 | Linear Equations | 17x + -8y = -154 +-15x + 13y = 23 | x = -18, y = -19 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 106 | [2, 53] | prime_factors | +| 28 | Fraction Multiplication | (3/9)*(8/4) | 2/3 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 20 sides | 162.0 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 6 at a time | 3003 | combinations | +| 31 | Factorial | 3! = | 6 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 14m, 4m, 4m is | 256 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 15m and radius = 4m is | 477 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 6m, 1m, 4m is | 24 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 3m and radius = 11m is | 1140 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 22m and radius = 14m is | 1762 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 10m and radius = 14m is | 2052 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 69 and 45 = | [1, 3] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10x - 4 and y = 6/6x + 10 | (14/9, 104/9) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 18 objects picked 3 at a time = | 4896 | permutation | +| 43 | Cross Product of 2 Vectors | [1, 3, 19] X [-1, 5, 4] = | [-83, -23, 8] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 1/10 and 9/6? | < | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 3365 dollars, 8% rate of interest and for a time period of 2 years is = | 538.4 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>1</td><td>2</td><td>-6</td></tr><tr><td>-10</td><td>-7</td><td>-4</td></tr></table>and<table><tr><td>10</td><td>-7</td><td>0</td></tr><tr><td>-8</td><td>-6</td><td>-8</td></tr><tr><td>4</td><td>4</td><td>-5</td></tr></table> | <table><tr><td>-30</td><td>-43</td><td>14</td></tr><tr><td>-60</td><td>96</td><td>76</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 353 upto 2 decimal places is: | 7.07 | cube_root | +| 48 | Power Rule Integration | 7x^4 + 10x^3 | (7/4)x^5 + (10/3)x^4 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 52 , 119, 98 = | 91 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 71x^2+167x+59=0 | [-0.43, -1.92] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 2 and 8 = | 2 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/36 | dice_sum_probability | +| 53 | Exponentiation | 6^10 = | 60466176 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [241, 229, 246, 299, 220, 249, 289, 214, 280, 275, 276, 278, 202, 203, 256, 235, 294, 263, 233, 223, 206, 295, 216, 242] with 80% confidence is | (256.54200290575125, 240.45799709424878) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 8^(1/6) _ 38^(1/4) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 13 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144] | fibonacci_series | +| 57 | Trigonometric Values | What is cos(0)? | 1 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 12 sides = | 1800 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[40, 14, 47, 30, 6, 32, 25, 32, 42, 34, 34, 37, 22, 30, 31] | The Mean is 30.4 , Standard Deviation is 102.77333333333331, Variance is 10.137718349477526 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 1m is | 12.566370614359172 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 98 m = | 3942455.8304233127 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 26th Fibonacci number? | 121393 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 171 and SP = 313 is: | 83.04093567251462 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 1011101 | 0x5d | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (11+3j) * (2+18j) = | (-32+204j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,7th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 7th term is 941192 , sum upto 8th term is 7686400.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 47 , 92 and 3 = | (47*92*3)^(1/3) = 23.49645336547587 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 94 , 92 and 59 = | 3/((1/94) + (1/92) + (1/59)) = 78.00917337682192 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[304.9779176267893, 837.4224202657908] is: | 891.228276146907 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [673.5350704033146, 195.45799005765386, 92.93464829626352, 116.63589535434215, 594.8238225788838, 345.12804915831896, 421.4756162395643, 718.6449275827789, 134.11947817433213, 573.4174565052257, 96.96537158190588, 188.69415889717357] and [520.2618389520298, 141.25763773504042, 998.0680511901267, 88.96111274282836, 131.27448267605467, 196.35332202572542, 63.657368381112356, 58.100728119799825, 818.3595663049074, 910.4545383236834, 173.11410173656193, 517.355465521104] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 95 and 92 = | 3 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [-4, 20, 2] . [8, -14, -14] = | -340 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 111101001 = | 10111 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[65, 7, 75], [69, 31, 73], [67, 15, 8]]) is: | Matrix([[847/102832, -1069/102832, 907/51416], [-4339/102832, 4505/102832, -215/51416], [521/51416, 253/51416, -383/25708]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 20 and angle, 72. Find the area of the sector. | Area of sector = 251.32741 | sector_area | +| 76 | Mean and Median | Given the series of numbers [59, 80, 5, 46, 57, 30, 13, 3, 54, 48]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 39.5 and Arithmetic median of this series is 47.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[17, 94], [26, 42]]) = | -1730 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 1069 dollars, 8% rate of interest and for a time period of 3 compounded monthly is = | 1069.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 175= | 0xaf | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 30% of 26? | Required percentage = 7.80% | percentage | +| 81 | Celsius To Fahrenheit | Convert 51 degrees Celsius to degrees Fahrenheit = | 123.8 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 13 of the AP series: -56, -129, -202 ... | -932 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 93 terms of the AP series: -27, -72, -117 ... | -195021.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 1871 in Octal is: | 0o3517 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 3868 in Roman Numerals is: | MMMDCCCLXVIII | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 99 in radians is = | 1.73 | degree_to_rad | +| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | +| 88 | Differentiation | differentiate w.r.t x : d(exp(x)+4*x^(-3))/dx | exp(x) - 12/x^4 | differentiation | diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index b5b6d5d..205e0ae 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -92,4 +92,4 @@ from .decimal_to_octal import * from .decimal_to_roman_numerals import * from .degree_to_rad import * from .radian_to_deg import * -from .differentiationFunc import * +from .differentiation import * diff --git a/mathgenerator/funcs/differentiationFunc.py b/mathgenerator/funcs/differentiation.py similarity index 100% rename from mathgenerator/funcs/differentiationFunc.py rename to mathgenerator/funcs/differentiation.py diff --git a/test.py b/test.py index 9625e78..e763dfa 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,7 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(40)) +print(mathgen.genById(88)) # prints each generator in genList """ From 4ed195bbd0ba4edadfc37e62028dbd2458af4fb2 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 12:03:23 -0400 Subject: [PATCH 86/99] Fix readme id 26 error --- README.md | 173 ++++++++++++------------ mathgenerator/funcs/linear_equations.py | 3 +- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 42b6eab..4cfc200 100644 --- a/README.md +++ b/README.md @@ -31,93 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 39+28= | 67 | addition | -| 1 | Subtraction | 46-1= | 45 | subtraction | -| 2 | Multiplication | 70*1= | 70 | multiplication | -| 3 | Division | 79/83= | 0.9518072289156626 | division | -| 4 | Binary Complement 1s | 00= | 11 | binary_complement_1s | -| 5 | Modulo Division | 7%99= | 7 | modulo_division | -| 6 | Square Root | sqrt(36)= | 6 | square_root | -| 7 | Power Rule Differentiation | 1x^3 + 6x^9 + 4x^9 + 2x^3 + 7x^8 | 3x^2 + 54x^8 + 36x^8 + 6x^2 + 56x^7 | power_rule_differentiation | -| 8 | Square | 15^2= | 225 | square | -| 9 | LCM (Least Common Multiple) | LCM of 16 and 10 = | 80 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 13 = | 1 | gcd | -| 11 | Basic Algebra | 7x + 2 = 6 | 4/7 | basic_algebra | -| 12 | Logarithm | log2(16) | 4 | log | -| 13 | Easy Division | 345/15 = | 23 | int_division | -| 14 | Decimal to Binary | Binary of 4= | 100 | decimal_to_binary | -| 15 | Binary to Decimal | 0 | 0 | binary_to_decimal | -| 16 | Fraction Division | (3/10)/(3/5) | 1/2 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[8, 0], [7, 3]] = | [[40,0],[35,15]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 15 6 = | 44.090815370097204 | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 15, 42 and 1 exist? | No | valid_triangle | -| 20 | Midpoint of the two point | (-10,19),(-11,-11)= | (-10.5,4.0) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2-4x-12 | (x-6)(x+2) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 71 and 59 = | 50 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | -5x - 7y = -66, -x + 5y = 6 | x = 9, y = 3 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (-8, -11) and (5, -4) | sqrt(218) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 19 = | 25.50 | pythagorean_theorem | -| 26 | Linear Equations | 17x + -8y = -154 --15x + 13y = 23 | x = -18, y = -19 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 106 | [2, 53] | prime_factors | -| 28 | Fraction Multiplication | (3/9)*(8/4) | 2/3 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 20 sides | 162.0 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 14 objects picked 6 at a time | 3003 | combinations | -| 31 | Factorial | 3! = | 6 | factorial | +| 0 | Addition | 43+23= | 66 | addition | +| 1 | Subtraction | 84-10= | 74 | subtraction | +| 2 | Multiplication | 6*2= | 12 | multiplication | +| 3 | Division | 87/23= | 3.782608695652174 | division | +| 4 | Binary Complement 1s | 1011= | 0100 | binary_complement_1s | +| 5 | Modulo Division | 68%0= | 0 | modulo_division | +| 6 | Square Root | sqrt(81)= | 9 | square_root | +| 7 | Power Rule Differentiation | 7x^1 + 9x^10 + 4x^3 + 7x^6 | 7x^0 + 90x^9 + 12x^2 + 42x^5 | power_rule_differentiation | +| 8 | Square | 19^2= | 361 | square | +| 9 | LCM (Least Common Multiple) | LCM of 9 and 6 = | 18 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 19 and 12 = | 1 | gcd | +| 11 | Basic Algebra | 2x + 1 = 10 | 9/2 | basic_algebra | +| 12 | Logarithm | log2(128) | 7 | log | +| 13 | Easy Division | 50/2 = | 25 | int_division | +| 14 | Decimal to Binary | Binary of 59= | 111011 | decimal_to_binary | +| 15 | Binary to Decimal | 10011 | 19 | binary_to_decimal | +| 16 | Fraction Division | (6/5)/(7/1) | 6/35 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[7, 7], [4, 5]] = | [[7,7],[4,5]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 19 6 19 = | 56.28498911788115 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 29, 34 and 13 exist? | Yes | valid_triangle | +| 20 | Midpoint of the two point | (-8,2),(5,-17)= | (-1.5,-7.5) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2+8x | (x+8)(x) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 64 and 78 = | 38 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | 8x - 3y = -63, 9x + 10y = -111 | x = -9, y = -3 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (-12, -3) and (10, -9) | sqrt(520) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 11 and 18 = | 21.10 | pythagorean_theorem | +| 26 | Linear Equations | 20x + 2y = -42-8x + 7y = 165 | x = -4, y = 19 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 62 | [2, 31] | prime_factors | +| 28 | Fraction Multiplication | (9/8)*(4/7) | 9/14 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 7 sides | 128.57 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 7 at a time | 3432 | combinations | +| 31 | Factorial | 6! = | 720 | factorial | | 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 14m, 4m, 4m is | 256 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 15m and radius = 4m is | 477 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 6m, 1m, 4m is | 24 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 3m and radius = 11m is | 1140 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 22m and radius = 14m is | 1762 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 10m and radius = 14m is | 2052 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 69 and 45 = | [1, 3] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 10x - 4 and y = 6/6x + 10 | (14/9, 104/9) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 18 objects picked 3 at a time = | 4896 | permutation | -| 43 | Cross Product of 2 Vectors | [1, 3, 19] X [-1, 5, 4] = | [-83, -23, 8] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 1/10 and 9/6? | < | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 3365 dollars, 8% rate of interest and for a time period of 2 years is = | 538.4 | simple_interest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>1</td><td>2</td><td>-6</td></tr><tr><td>-10</td><td>-7</td><td>-4</td></tr></table>and<table><tr><td>10</td><td>-7</td><td>0</td></tr><tr><td>-8</td><td>-6</td><td>-8</td></tr><tr><td>4</td><td>4</td><td>-5</td></tr></table> | <table><tr><td>-30</td><td>-43</td><td>14</td></tr><tr><td>-60</td><td>96</td><td>76</td></tr></table> | matrix_multiplication | -| 47 | Cube Root | cuberoot of 353 upto 2 decimal places is: | 7.07 | cube_root | -| 48 | Power Rule Integration | 7x^4 + 10x^3 | (7/4)x^5 + (10/3)x^4 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 52 , 119, 98 = | 91 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 71x^2+167x+59=0 | [-0.43, -1.92] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 2 and 8 = | 2 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/36 | dice_sum_probability | -| 53 | Exponentiation | 6^10 = | 60466176 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [241, 229, 246, 299, 220, 249, 289, 214, 280, 275, 276, 278, 202, 203, 256, 235, 294, 263, 233, 223, 206, 295, 216, 242] with 80% confidence is | (256.54200290575125, 240.45799709424878) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 8^(1/6) _ 38^(1/4) | < | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 13 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144] | fibonacci_series | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 11m, 12m, 5m is | 494 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 9m and radius = 10m is | 1193 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 20m is | 8000 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 19m, 9m, 14m is | 2394 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 15m and radius = 1m is | 47 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 35m and radius = 11m is | 1647 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 15m and radius = 8m is | 1005 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 74 and 18 = | [1, 2] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 5x + 8 and y = -5/5x + 10 | (1/3, 29/3) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 15 objects picked 6 at a time = | 3603600 | permutation | +| 43 | Cross Product of 2 Vectors | [7, -11, -16] X [2, -2, 11] = | [-153, -109, 8] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 2/9 and 3/9? | < | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 7140 dollars, 8% rate of interest and for a time period of 10 years is = | 5712.0 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>5</td><td>4</td></tr><tr><td>6</td><td>-5</td></tr></table>and<table><tr><td>-2</td><td>-5</td><td>10</td><td>5</td></tr><tr><td>-8</td><td>-8</td><td>-6</td><td>2</td></tr></table> | <table><tr><td>-42</td><td>-57</td><td>26</td><td>33</td></tr><tr><td>28</td><td>10</td><td>90</td><td>20</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 417 upto 2 decimal places is: | 7.47 | cube_root | +| 48 | Power Rule Integration | 10x^10 | (10/10)x^11 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 170 , 23, 98 = | 69 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 45x^2+157x+48=0 | [-0.34, -3.15] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 12 and 16 = | 4 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 12 = | 25/216 | dice_sum_probability | +| 53 | Exponentiation | 13^3 = | 2197 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [203, 218, 249, 286, 283, 204, 214, 252, 292, 291, 270, 256, 248, 227, 207, 264, 260, 261, 245, 294, 281, 233, 244, 240, 255, 210, 250, 216, 222, 293, 287, 237, 257, 274, 205] with 90% confidence is | (257.3268184855506, 241.41603865730656) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 89^(1/4) _ 49^(1/2) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 11 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55] | fibonacci_series | | 57 | Trigonometric Values | What is cos(0)? | 1 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 12 sides = | 1800 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[40, 14, 47, 30, 6, 32, 25, 32, 42, 34, 34, 37, 22, 30, 31] | The Mean is 30.4 , Standard Deviation is 102.77333333333331, Variance is 10.137718349477526 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 1m is | 12.566370614359172 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 98 m = | 3942455.8304233127 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 26th Fibonacci number? | 121393 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Profit percent when CP = 171 and SP = 313 is: | 83.04093567251462 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 1011101 | 0x5d | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (11+3j) * (2+18j) = | (-32+204j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [8, 56, 392, 2744, 19208, 134456] ,Find the value of a,common ratio,7th term value, sum upto 8th term | The value of a is 8, common ratio is 7 , 7th term is 941192 , sum upto 8th term is 7686400.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 47 , 92 and 3 = | (47*92*3)^(1/3) = 23.49645336547587 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 94 , 92 and 59 = | 3/((1/94) + (1/92) + (1/59)) = 78.00917337682192 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[304.9779176267893, 837.4224202657908] is: | 891.228276146907 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [673.5350704033146, 195.45799005765386, 92.93464829626352, 116.63589535434215, 594.8238225788838, 345.12804915831896, 421.4756162395643, 718.6449275827789, 134.11947817433213, 573.4174565052257, 96.96537158190588, 188.69415889717357] and [520.2618389520298, 141.25763773504042, 998.0680511901267, 88.96111274282836, 131.27448267605467, 196.35332202572542, 63.657368381112356, 58.100728119799825, 818.3595663049074, 910.4545383236834, 173.11410173656193, 517.355465521104] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 95 and 92 = | 3 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [-4, 20, 2] . [8, -14, -14] = | -340 | vector_dot | -| 73 | Binary 2's Complement | 2's complement of 111101001 = | 10111 | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[65, 7, 75], [69, 31, 73], [67, 15, 8]]) is: | Matrix([[847/102832, -1069/102832, 907/51416], [-4339/102832, 4505/102832, -215/51416], [521/51416, 253/51416, -383/25708]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 20 and angle, 72. Find the area of the sector. | Area of sector = 251.32741 | sector_area | -| 76 | Mean and Median | Given the series of numbers [59, 80, 5, 46, 57, 30, 13, 3, 54, 48]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 39.5 and Arithmetic median of this series is 47.0 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[17, 94], [26, 42]]) = | -1730 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 1069 dollars, 8% rate of interest and for a time period of 3 compounded monthly is = | 1069.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 175= | 0xaf | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 30% of 26? | Required percentage = 7.80% | percentage | -| 81 | Celsius To Fahrenheit | Convert 51 degrees Celsius to degrees Fahrenheit = | 123.8 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 13 of the AP series: -56, -129, -202 ... | -932 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 93 terms of the AP series: -27, -72, -117 ... | -195021.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 1871 in Octal is: | 0o3517 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 3868 in Roman Numerals is: | MMMDCCCLXVIII | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 99 in radians is = | 1.73 | degree_to_rad | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 28, 42, 17, 18, 27, 29, 38, 37, 34, 20, 46, 40, 13, 9] | The Mean is 28.6 , Standard Deviation is 117.17333333333335, Variance is 10.824663197223892 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 9m is | 1017.8760197630929 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 45 m = | 381703.5074111598 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 89th Fibonacci number? | 1779979416004719360 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 611 and SP = 934 is: | 52.864157119476275 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 1 | 0x1 | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-7+0j) * (1+18j) = | (-7-126j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [3, 36, 432, 5184, 62208, 746496] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 3, common ratio is 12 , 11th term is 185752092672 , sum upto 8th term is 117267735.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 69 , 84 , 53 , 42 = | (69*84*53*42)^(1/4) = 59.93263663932908 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 38 , 26 , 56 , 54 = | 4/((1/38) + (1/26) + (1/56) + (1/54)) = 39.54406120126003 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[404.01048129643635, 493.0541616029289, 462.1933998344141, 423.5178469230799] is: | 894.045290119131 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [754.1998988977049, 801.3293889971126, 64.28064667477207, 995.3287765441996, 264.0816063333957, 611.5398134986185, 856.5578548001416, 50.735010026939364, 572.2950776638381, 930.5293279220055, 524.3714207350181, 735.6775022444679, 438.8794763353797, 344.63393543289243] and [657.7394862034466, 411.3411278292859, 992.683482628856, 378.5934722176586, 591.4194475121323, 126.57656661119732, 568.2839501217117, 5.58456959028919, 65.00223534144212, 583.768000413094, 930.1126329066044, 899.527968007742, 902.085497788947, 59.26218061705124] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -73 and 34 = | 107 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [20, 8, -17] . [18, 18, 17] = | 215 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[3, 21, 81], [28, 53, 11], [42, 89, 63]]) is: | Matrix([[590/321, 981/214, -677/214], [-217/214, -1071/428, 745/428], [133/642, 205/428, -143/428]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 15 and angle, 45. Find the area of the sector. | Area of sector = 88.35729 | sector_area | +| 76 | Mean and Median | Given the series of numbers [96, 21, 61, 79, 63, 59, 56, 85, 77, 8]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 60.5 and Arithmetic median of this series is 62.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[79, 23], [15, 44]]) = | 3131 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 2943 dollars, 1% rate of interest and for a time period of 3 compounded monthly is = | 2943.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 937= | 0x3a9 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 41% of 75? | Required percentage = 30.75% | percentage | +| 81 | Celsius To Fahrenheit | Convert -40 degrees Celsius to degrees Fahrenheit = | -40.0 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 52 of the AP series: 50, -43, -136 ... | -4693 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 67 terms of the AP series: -45, -87, -129 ... | -95877.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 200 in Octal is: | 0o310 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 1225 in Roman Numerals is: | MCCXXV | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 263 in radians is = | 4.59 | degree_to_rad | | 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | -| 88 | Differentiation | differentiate w.r.t x : d(exp(x)+4*x^(-3))/dx | exp(x) - 12/x^4 | differentiation | +| 88 | Differentiation | differentiate w.r.t x : d(cot(x)+9*x^3)/dx | 27*x^2 - cot(x)^2 - 1 | differentiation | diff --git a/mathgenerator/funcs/linear_equations.py b/mathgenerator/funcs/linear_equations.py index 73b62f5..b23ce7a 100644 --- a/mathgenerator/funcs/linear_equations.py +++ b/mathgenerator/funcs/linear_equations.py @@ -25,7 +25,8 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): prob = " + ".join(prob) + " = " + str(res) problem.append(prob) - problem = "\n".join(problem) + # problem = "\n".join(problem) + problem = "".join(problem) return problem, solution From e9e4a70d4ddcdc7cf74e2490eb2085e98b87ec82 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 12:04:07 -0400 Subject: [PATCH 87/99] id 26 bug fix --- README.md | 176 ++++++++++++------------ mathgenerator/funcs/linear_equations.py | 2 +- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 4cfc200..23532dc 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,92 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 43+23= | 66 | addition | -| 1 | Subtraction | 84-10= | 74 | subtraction | -| 2 | Multiplication | 6*2= | 12 | multiplication | -| 3 | Division | 87/23= | 3.782608695652174 | division | -| 4 | Binary Complement 1s | 1011= | 0100 | binary_complement_1s | -| 5 | Modulo Division | 68%0= | 0 | modulo_division | -| 6 | Square Root | sqrt(81)= | 9 | square_root | -| 7 | Power Rule Differentiation | 7x^1 + 9x^10 + 4x^3 + 7x^6 | 7x^0 + 90x^9 + 12x^2 + 42x^5 | power_rule_differentiation | -| 8 | Square | 19^2= | 361 | square | -| 9 | LCM (Least Common Multiple) | LCM of 9 and 6 = | 18 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 19 and 12 = | 1 | gcd | -| 11 | Basic Algebra | 2x + 1 = 10 | 9/2 | basic_algebra | -| 12 | Logarithm | log2(128) | 7 | log | -| 13 | Easy Division | 50/2 = | 25 | int_division | -| 14 | Decimal to Binary | Binary of 59= | 111011 | decimal_to_binary | -| 15 | Binary to Decimal | 10011 | 19 | binary_to_decimal | -| 16 | Fraction Division | (6/5)/(7/1) | 6/35 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[7, 7], [4, 5]] = | [[7,7],[4,5]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 19 6 19 = | 56.28498911788115 | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 29, 34 and 13 exist? | Yes | valid_triangle | -| 20 | Midpoint of the two point | (-8,2),(5,-17)= | (-1.5,-7.5) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2+8x | (x+8)(x) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 64 and 78 = | 38 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | 8x - 3y = -63, 9x + 10y = -111 | x = -9, y = -3 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (-12, -3) and (10, -9) | sqrt(520) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 11 and 18 = | 21.10 | pythagorean_theorem | -| 26 | Linear Equations | 20x + 2y = -42-8x + 7y = 165 | x = -4, y = 19 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 62 | [2, 31] | prime_factors | -| 28 | Fraction Multiplication | (9/8)*(4/7) | 9/14 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 7 sides | 128.57 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 14 objects picked 7 at a time | 3432 | combinations | -| 31 | Factorial | 6! = | 720 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 11m, 12m, 5m is | 494 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 9m and radius = 10m is | 1193 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 20m is | 8000 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 19m, 9m, 14m is | 2394 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 15m and radius = 1m is | 47 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 35m and radius = 11m is | 1647 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 15m and radius = 8m is | 1005 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 74 and 18 = | [1, 2] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 5x + 8 and y = -5/5x + 10 | (1/3, 29/3) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 15 objects picked 6 at a time = | 3603600 | permutation | -| 43 | Cross Product of 2 Vectors | [7, -11, -16] X [2, -2, 11] = | [-153, -109, 8] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 2/9 and 3/9? | < | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 7140 dollars, 8% rate of interest and for a time period of 10 years is = | 5712.0 | simple_interest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>5</td><td>4</td></tr><tr><td>6</td><td>-5</td></tr></table>and<table><tr><td>-2</td><td>-5</td><td>10</td><td>5</td></tr><tr><td>-8</td><td>-8</td><td>-6</td><td>2</td></tr></table> | <table><tr><td>-42</td><td>-57</td><td>26</td><td>33</td></tr><tr><td>28</td><td>10</td><td>90</td><td>20</td></tr></table> | matrix_multiplication | -| 47 | Cube Root | cuberoot of 417 upto 2 decimal places is: | 7.47 | cube_root | -| 48 | Power Rule Integration | 10x^10 | (10/10)x^11 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 170 , 23, 98 = | 69 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 45x^2+157x+48=0 | [-0.34, -3.15] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 12 and 16 = | 4 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 12 = | 25/216 | dice_sum_probability | -| 53 | Exponentiation | 13^3 = | 2197 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [203, 218, 249, 286, 283, 204, 214, 252, 292, 291, 270, 256, 248, 227, 207, 264, 260, 261, 245, 294, 281, 233, 244, 240, 255, 210, 250, 216, 222, 293, 287, 237, 257, 274, 205] with 90% confidence is | (257.3268184855506, 241.41603865730656) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 89^(1/4) _ 49^(1/2) | < | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 11 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55] | fibonacci_series | -| 57 | Trigonometric Values | What is cos(0)? | 1 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 5 sides = | 540 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[31, 28, 42, 17, 18, 27, 29, 38, 37, 34, 20, 46, 40, 13, 9] | The Mean is 28.6 , Standard Deviation is 117.17333333333335, Variance is 10.824663197223892 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 9m is | 1017.8760197630929 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 45 m = | 381703.5074111598 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 89th Fibonacci number? | 1779979416004719360 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Profit percent when CP = 611 and SP = 934 is: | 52.864157119476275 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 1 | 0x1 | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (-7+0j) * (1+18j) = | (-7-126j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [3, 36, 432, 5184, 62208, 746496] ,Find the value of a,common ratio,11th term value, sum upto 8th term | The value of a is 3, common ratio is 12 , 11th term is 185752092672 , sum upto 8th term is 117267735.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 69 , 84 , 53 , 42 = | (69*84*53*42)^(1/4) = 59.93263663932908 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 38 , 26 , 56 , 54 = | 4/((1/38) + (1/26) + (1/56) + (1/54)) = 39.54406120126003 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[404.01048129643635, 493.0541616029289, 462.1933998344141, 423.5178469230799] is: | 894.045290119131 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [754.1998988977049, 801.3293889971126, 64.28064667477207, 995.3287765441996, 264.0816063333957, 611.5398134986185, 856.5578548001416, 50.735010026939364, 572.2950776638381, 930.5293279220055, 524.3714207350181, 735.6775022444679, 438.8794763353797, 344.63393543289243] and [657.7394862034466, 411.3411278292859, 992.683482628856, 378.5934722176586, 591.4194475121323, 126.57656661119732, 568.2839501217117, 5.58456959028919, 65.00223534144212, 583.768000413094, 930.1126329066044, 899.527968007742, 902.085497788947, 59.26218061705124] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers -73 and 34 = | 107 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [20, 8, -17] . [18, 18, 17] = | 215 | vector_dot | -| 73 | Binary 2's Complement | 2's complement of 10 = | 10 | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[3, 21, 81], [28, 53, 11], [42, 89, 63]]) is: | Matrix([[590/321, 981/214, -677/214], [-217/214, -1071/428, 745/428], [133/642, 205/428, -143/428]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 15 and angle, 45. Find the area of the sector. | Area of sector = 88.35729 | sector_area | -| 76 | Mean and Median | Given the series of numbers [96, 21, 61, 79, 63, 59, 56, 85, 77, 8]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 60.5 and Arithmetic median of this series is 62.0 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[79, 23], [15, 44]]) = | 3131 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 2943 dollars, 1% rate of interest and for a time period of 3 compounded monthly is = | 2943.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 937= | 0x3a9 | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 41% of 75? | Required percentage = 30.75% | percentage | -| 81 | Celsius To Fahrenheit | Convert -40 degrees Celsius to degrees Fahrenheit = | -40.0 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 52 of the AP series: 50, -43, -136 ... | -4693 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 67 terms of the AP series: -45, -87, -129 ... | -95877.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 200 in Octal is: | 0o310 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 1225 in Roman Numerals is: | MCCXXV | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 263 in radians is = | 4.59 | degree_to_rad | +| 0 | Addition | 31+3= | 34 | addition | +| 1 | Subtraction | 69-64= | 5 | subtraction | +| 2 | Multiplication | 88*1= | 88 | multiplication | +| 3 | Division | 77/8= | 9.625 | division | +| 4 | Binary Complement 1s | 11100= | 00011 | binary_complement_1s | +| 5 | Modulo Division | 40%27= | 13 | modulo_division | +| 6 | Square Root | sqrt(121)= | 11 | square_root | +| 7 | Power Rule Differentiation | 7x^3 | 21x^2 | power_rule_differentiation | +| 8 | Square | 13^2= | 169 | square | +| 9 | LCM (Least Common Multiple) | LCM of 15 and 9 = | 45 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 4 and 20 = | 4 | gcd | +| 11 | Basic Algebra | 10x + 8 = 9 | 1/10 | basic_algebra | +| 12 | Logarithm | log3(9) | 2 | log | +| 13 | Easy Division | 54/3 = | 18 | int_division | +| 14 | Decimal to Binary | Binary of 82= | 1010010 | decimal_to_binary | +| 15 | Binary to Decimal | 11 | 3 | binary_to_decimal | +| 16 | Fraction Division | (7/9)/(9/8) | 56/81 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[3, 8], [4, 7]] = | [[15,40],[20,35]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 4 10 12 = | 18.734993995195193 | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 39, 48 and 2 exist? | No | valid_triangle | +| 20 | Midpoint of the two point | (-17,18),(-10,20)= | (-13.5,19.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-16x+60 | (x-10)(x-6) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 35 and 52 = | 93 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | 4x + 2y = -22, 5x + 6y = -31 | x = -5, y = -1 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (2, -19) and (7, -4) | sqrt(250) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 9 = | 15.81 | pythagorean_theorem | +| 26 | Linear Equations | 18x + -12y = -42, 9x + 7y = 161 | x = 7, y = 14 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 45 | [3, 3, 5] | prime_factors | +| 28 | Fraction Multiplication | (7/5)*(3/1) | 21/5 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 16 sides | 157.5 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 5 at a time | 2002 | combinations | +| 31 | Factorial | 0! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 7m, 2m, 4m is | 100 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 12m and radius = 3m is | 282 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 19m is | 6859 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 8m, 9m, 10m is | 720 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 4m is | 653 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 46m and radius = 1m is | 147 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 35m and radius = 10m is | 3665 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 71 and 25 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -7x + 9 and y = 0/3x - 10 | (19/7, -10) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 20 objects picked 8 at a time = | 5079110400 | permutation | +| 43 | Cross Product of 2 Vectors | [-4, 4, -3] X [-6, 6, 14] = | [74, 74, 0] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 6/1 and 6/2? | > | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 2266 dollars, 8% rate of interest and for a time period of 6 years is = | 1087.68 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>6</td><td>9</td><td>-1</td><td>6</td></tr><tr><td>6</td><td>10</td><td>6</td><td>0</td></tr><tr><td>-8</td><td>-6</td><td>-7</td><td>-9</td></tr></table>and<table><tr><td>9</td><td>10</td><td>8</td></tr><tr><td>-2</td><td>-3</td><td>-4</td></tr><tr><td>-9</td><td>5</td><td>7</td></tr><tr><td>8</td><td>-8</td><td>-1</td></tr></table> | <table><tr><td>93</td><td>-20</td><td>-1</td></tr><tr><td>-20</td><td>60</td><td>50</td></tr><tr><td>-69</td><td>-25</td><td>-80</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 196 upto 2 decimal places is: | 5.81 | cube_root | +| 48 | Power Rule Integration | 6x^4 | (6/4)x^5 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 175 , 22, 60 = | 103 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 64x^2+159x+78=0 | [-0.67, -1.81] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 9 and 17 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 5 = | 4/36 | dice_sum_probability | +| 53 | Exponentiation | 18^1 = | 18 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [277, 237, 229, 258, 291, 278, 274, 242, 267, 287, 288, 293, 208, 273, 255, 259, 263, 269, 265, 210, 281, 276, 256, 238, 271, 297, 202, 252] with 95% confidence is | (269.92602102647436, 251.21683611638275) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 58^(1/2) _ 44^(1/1) | < | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | +| 57 | Trigonometric Values | What is cos(90)? | 0 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 11 sides = | 1620 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 43, 11, 20, 7, 47, 42, 16, 37, 29, 39, 11, 36, 25, 49] | The Mean is 28.2 , Standard Deviation is 200.95999999999998, Variance is 14.17603611733548 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 4m is | 201.06192982974676 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 66 m = | 1204260.4287152681 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 96th Fibonacci number? | 51680708854858489856 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 591 and SP = 796 is: | 34.686971235194584 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 101010111 | 0x157 | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (6+16j) * (15-11j) = | (266+174j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 5, common ratio is 6 , 6th term is 38880 , sum upto 8th term is 1679615.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 64 , 71 , 42 , 69 = | (64*71*42*69)^(1/4) = 60.239890804783805 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 13 and 89 = | 2/((1/13) + (1/89)) = 22.68627450980392 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[776.6691324098483, 606.5799343351656, 285.46422221982624, 372.01270687089004, 86.18433302762118, 939.355471377651, 202.1465319226168, 932.3553335024733, 275.1276478308532, 160.88380854198425] is: | 1758.5739637031488 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [601.4612452378941, 933.4356902778246, 438.03974725076324, 281.0471724516086] and [402.0844562515671, 707.7656850759612, 547.0834759350798, 897.3106790199977] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 67 and 24 = | 43 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [12, -8, 13] . [16, -6, 19] = | 487 | vector_dot | +| 73 | Binary 2's Complement | 2's complement of = | | binary_2s_complement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[52, 89, 11], [44, 72, 61], [17, 87, 7]]) is: | Matrix([[1601/52077, -334/156231, -4637/156231], [-81/17359, -59/52077, 896/52077], [-868/52077, 3011/156231, 172/156231]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 4 and angle, 16. Find the area of the sector. | Area of sector = 2.23402 | sector_area | +| 76 | Mean and Median | Given the series of numbers [90, 44, 84, 5, 79, 31, 78, 89, 56, 34]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 59.0 and Arithmetic median of this series is 67.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[0, 19], [73, 25]]) = | -1387 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 7422 dollars, 10% rate of interest and for a time period of 2 compounded monthly is = | 7422.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 946= | 0x3b2 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 94% of 88? | Required percentage = 82.72% | percentage | +| 81 | Celsius To Fahrenheit | Convert 14 degrees Celsius to degrees Fahrenheit = | 57.2 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 48 of the AP series: 33, 9, -15 ... | -1095 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 12 terms of the AP series: 26, 67, 108 ... | 3018.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 2394 in Octal is: | 0o4532 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 25 in Roman Numerals is: | XXV | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 9 in radians is = | 0.16 | degree_to_rad | | 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | -| 88 | Differentiation | differentiate w.r.t x : d(cot(x)+9*x^3)/dx | 27*x^2 - cot(x)^2 - 1 | differentiation | +| 88 | Differentiation | differentiate w.r.t x : d(sec(x)+6*x^4)/dx | 24*x^3 + tan(x)*sec(x) | differentiation | diff --git a/mathgenerator/funcs/linear_equations.py b/mathgenerator/funcs/linear_equations.py index b23ce7a..7fb71b6 100644 --- a/mathgenerator/funcs/linear_equations.py +++ b/mathgenerator/funcs/linear_equations.py @@ -26,7 +26,7 @@ def linearEquationsFunc(n=2, varRange=20, coeffRange=20): problem.append(prob) # problem = "\n".join(problem) - problem = "".join(problem) + problem = ", ".join(problem) return problem, solution From ee6fe524decc07e2d03aae8f8a558f58285fbe8d Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 13:13:38 -0400 Subject: [PATCH 88/99] fix definite_integral --- README.md | 177 +++++++++--------- mathgenerator/funcs/__init__.py | 2 +- ...teIntegralFunc.py => definite_integral.py} | 7 +- test.py | 4 +- 4 files changed, 95 insertions(+), 95 deletions(-) rename mathgenerator/funcs/{definiteIntegralFunc.py => definite_integral.py} (61%) diff --git a/README.md b/README.md index 23532dc..2bdc428 100644 --- a/README.md +++ b/README.md @@ -31,92 +31,93 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 31+3= | 34 | addition | -| 1 | Subtraction | 69-64= | 5 | subtraction | -| 2 | Multiplication | 88*1= | 88 | multiplication | -| 3 | Division | 77/8= | 9.625 | division | -| 4 | Binary Complement 1s | 11100= | 00011 | binary_complement_1s | -| 5 | Modulo Division | 40%27= | 13 | modulo_division | -| 6 | Square Root | sqrt(121)= | 11 | square_root | -| 7 | Power Rule Differentiation | 7x^3 | 21x^2 | power_rule_differentiation | -| 8 | Square | 13^2= | 169 | square | -| 9 | LCM (Least Common Multiple) | LCM of 15 and 9 = | 45 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 4 and 20 = | 4 | gcd | -| 11 | Basic Algebra | 10x + 8 = 9 | 1/10 | basic_algebra | -| 12 | Logarithm | log3(9) | 2 | log | -| 13 | Easy Division | 54/3 = | 18 | int_division | -| 14 | Decimal to Binary | Binary of 82= | 1010010 | decimal_to_binary | -| 15 | Binary to Decimal | 11 | 3 | binary_to_decimal | -| 16 | Fraction Division | (7/9)/(9/8) | 56/81 | divide_fractions | -| 17 | Integer Multiplication with 2x2 Matrix | 5 * [[3, 8], [4, 7]] = | [[15,40],[20,35]] | multiply_int_to_22_matrix | -| 18 | Area of Triangle | Area of triangle with side lengths: 4 10 12 = | 18.734993995195193 | area_of_triangle | -| 19 | Triangle exists check | Does triangle with sides 39, 48 and 2 exist? | No | valid_triangle | -| 20 | Midpoint of the two point | (-17,18),(-10,20)= | (-13.5,19.0) | midpoint_of_two_points | -| 21 | Factoring Quadratic | x^2-16x+60 | (x-10)(x-6) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 35 and 52 = | 93 | third_angle_of_triangle | -| 23 | Solve a System of Equations in R^2 | 4x + 2y = -22, 5x + 6y = -31 | x = -5, y = -1 | system_of_equations | -| 24 | Distance between 2 points | Find the distance between (2, -19) and (7, -4) | sqrt(250) | distance_two_points | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 13 and 9 = | 15.81 | pythagorean_theorem | -| 26 | Linear Equations | 18x + -12y = -42, 9x + 7y = 161 | x = 7, y = 14 | linear_equations | -| 27 | Prime Factorisation | Find prime factors of 45 | [3, 3, 5] | prime_factors | -| 28 | Fraction Multiplication | (7/5)*(3/1) | 21/5 | fraction_multiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 16 sides | 157.5 | angle_regular_polygon | -| 30 | Combinations of Objects | Number of combinations from 14 objects picked 5 at a time | 2002 | combinations | -| 31 | Factorial | 0! = | 1 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 3m is | 54 m^2 | surface_area_cube | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 7m, 2m, 4m is | 100 m^2 | surface_area_cuboid | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 12m and radius = 3m is | 282 m^2 | surface_area_cylinder | -| 35 | Volum of Cube | Volume of cube with side = 19m is | 6859 m^3 | volume_cube | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 8m, 9m, 10m is | 720 m^3 | volume_cuboid | -| 37 | Volume of cylinder | Volume of cylinder with height = 13m and radius = 4m is | 653 m^3 | volume_cylinder | -| 38 | Surface Area of cone | Surface area of cone with height = 46m and radius = 1m is | 147 m^2 | surface_area_cone | -| 39 | Volume of cone | Volume of cone with height = 35m and radius = 10m is | 3665 m^3 | volume_cone | -| 40 | Common Factors | Common Factors of 71 and 25 = | [1] | common_factors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -7x + 9 and y = 0/3x - 10 | (19/7, -10) | intersection_of_two_lines | -| 42 | Permutations | Number of Permutations from 20 objects picked 8 at a time = | 5079110400 | permutation | -| 43 | Cross Product of 2 Vectors | [-4, 4, -3] X [-6, 6, 14] = | [74, 74, 0] | vector_cross | -| 44 | Compare Fractions | Which symbol represents the comparison between 6/1 and 6/2? | > | compare_fractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2266 dollars, 8% rate of interest and for a time period of 6 years is = | 1087.68 | simple_interest | -| 46 | Multiplication of two matrices | Multiply<table><tr><td>6</td><td>9</td><td>-1</td><td>6</td></tr><tr><td>6</td><td>10</td><td>6</td><td>0</td></tr><tr><td>-8</td><td>-6</td><td>-7</td><td>-9</td></tr></table>and<table><tr><td>9</td><td>10</td><td>8</td></tr><tr><td>-2</td><td>-3</td><td>-4</td></tr><tr><td>-9</td><td>5</td><td>7</td></tr><tr><td>8</td><td>-8</td><td>-1</td></tr></table> | <table><tr><td>93</td><td>-20</td><td>-1</td></tr><tr><td>-20</td><td>60</td><td>50</td></tr><tr><td>-69</td><td>-25</td><td>-80</td></tr></table> | matrix_multiplication | -| 47 | Cube Root | cuberoot of 196 upto 2 decimal places is: | 5.81 | cube_root | -| 48 | Power Rule Integration | 6x^4 | (6/4)x^5 + c | power_rule_integration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 175 , 22, 60 = | 103 | fourth_angle_of_quadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 64x^2+159x+78=0 | [-0.67, -1.81] | quadratic_equation | -| 51 | HCF (Highest Common Factor) | HCF of 9 and 17 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 5 = | 4/36 | dice_sum_probability | -| 53 | Exponentiation | 18^1 = | 18 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [277, 237, 229, 258, 291, 278, 274, 242, 267, 287, 288, 293, 208, 273, 255, 259, 263, 269, 265, 210, 281, 276, 256, 238, 271, 297, 202, 252] with 95% confidence is | (269.92602102647436, 251.21683611638275) | confidence_interval | -| 55 | Comparing surds | Fill in the blanks 58^(1/2) _ 44^(1/1) | < | surds_comparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 9 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21] | fibonacci_series | -| 57 | Trigonometric Values | What is cos(90)? | 0 | basic_trigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 11 sides = | 1620 | sum_of_polygon_angles | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[11, 43, 11, 20, 7, 47, 42, 16, 37, 29, 39, 11, 36, 25, 49] | The Mean is 28.2 , Standard Deviation is 200.95999999999998, Variance is 14.17603611733548 | data_summary | -| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 4m is | 201.06192982974676 m^2 | surface_area_sphere | -| 61 | Volume of Sphere | Volume of sphere with radius 66 m = | 1204260.4287152681 m^3 | volume_sphere | -| 62 | nth Fibonacci number | What is the 96th Fibonacci number? | 51680708854858489856 | nth_fibonacci_number | -| 63 | Profit or Loss Percent | Profit percent when CP = 591 and SP = 796 is: | 34.686971235194584 | profit_loss_percent | -| 64 | Binary to Hexidecimal | 101010111 | 0x157 | binary_to_hex | -| 65 | Multiplication of 2 complex numbers | (6+16j) * (15-11j) = | (266+174j) | multiply_complex_numbers | -| 66 | Geometric Progression | For the given GP [5, 30, 180, 1080, 6480, 38880] ,Find the value of a,common ratio,6th term value, sum upto 8th term | The value of a is 5, common ratio is 6 , 6th term is 38880 , sum upto 8th term is 1679615.0 | geometric_progression | -| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 64 , 71 , 42 , 69 = | (64*71*42*69)^(1/4) = 60.239890804783805 | geometric_mean | -| 68 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 13 and 89 = | 2/((1/13) + (1/89)) = 22.68627450980392 | harmonic_mean | -| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[776.6691324098483, 606.5799343351656, 285.46422221982624, 372.01270687089004, 86.18433302762118, 939.355471377651, 202.1465319226168, 932.3553335024733, 275.1276478308532, 160.88380854198425] is: | 1758.5739637031488 | euclidian_norm | -| 70 | Angle between 2 vectors | angle between the vectors [601.4612452378941, 933.4356902778246, 438.03974725076324, 281.0471724516086] and [402.0844562515671, 707.7656850759612, 547.0834759350798, 897.3106790199977] is: | NaN | angle_btw_vectors | -| 71 | Absolute difference between two numbers | Absolute difference between numbers 67 and 24 = | 43 | absolute_difference | -| 72 | Dot Product of 2 Vectors | [12, -8, 13] . [16, -6, 19] = | 487 | vector_dot | +| 0 | Addition | 29+29= | 58 | addition | +| 1 | Subtraction | 10-8= | 2 | subtraction | +| 2 | Multiplication | 96*0= | 0 | multiplication | +| 3 | Division | 25/95= | 0.2631578947368421 | division | +| 4 | Binary Complement 1s | 100101100= | 011010011 | binary_complement_1s | +| 5 | Modulo Division | 74%50= | 24 | modulo_division | +| 6 | Square Root | sqrt(49)= | 7 | square_root | +| 7 | Power Rule Differentiation | 10x^7 + 7x^5 + 5x^8 | 70x^6 + 35x^4 + 40x^7 | power_rule_differentiation | +| 8 | Square | 9^2= | 81 | square | +| 9 | LCM (Least Common Multiple) | LCM of 19 and 7 = | 133 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 1 and 7 = | 1 | gcd | +| 11 | Basic Algebra | 3x + 2 = 8 | 6 | basic_algebra | +| 12 | Logarithm | log2(128) | 7 | log | +| 13 | Easy Division | 228/12 = | 19 | int_division | +| 14 | Decimal to Binary | Binary of 37= | 100101 | decimal_to_binary | +| 15 | Binary to Decimal | 10100001 | 161 | binary_to_decimal | +| 16 | Fraction Division | (8/2)/(8/2) | 1 | divide_fractions | +| 17 | Integer Multiplication with 2x2 Matrix | 6 * [[3, 7], [10, 6]] = | [[18,42],[60,36]] | multiply_int_to_22_matrix | +| 18 | Area of Triangle | Area of triangle with side lengths: 2 1 19 = | (5.449334243437888e-15+88.99438184514796j) | area_of_triangle | +| 19 | Triangle exists check | Does triangle with sides 48, 16 and 30 exist? | No | valid_triangle | +| 20 | Midpoint of the two point | (2,-5),(12,-7)= | (7.0,-6.0) | midpoint_of_two_points | +| 21 | Factoring Quadratic | x^2-18x+81 | (x-9)(x-9) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 45 and 1 = | 134 | third_angle_of_triangle | +| 23 | Solve a System of Equations in R^2 | -7x - 10y = -133, 7x - 2y = 49 | x = 9, y = 7 | system_of_equations | +| 24 | Distance between 2 points | Find the distance between (-10, 7) and (16, 6) | sqrt(677) | distance_two_points | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 10 and 8 = | 12.81 | pythagorean_theorem | +| 26 | Linear Equations | 18x + -2y = -174, -13x + 6y = 194 | x = -8, y = 15 | linear_equations | +| 27 | Prime Factorisation | Find prime factors of 16 | [2, 2, 2, 2] | prime_factors | +| 28 | Fraction Multiplication | (6/8)*(2/5) | 3/10 | fraction_multiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 17 sides | 158.82 | angle_regular_polygon | +| 30 | Combinations of Objects | Number of combinations from 17 objects picked 3 at a time | 680 | combinations | +| 31 | Factorial | 1! = | 1 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surface_area_cube | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 12m, 11m, 1m is | 310 m^2 | surface_area_cuboid | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 38m and radius = 16m is | 5428 m^2 | surface_area_cylinder | +| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volume_cube | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 17m, 19m, 8m is | 2584 m^3 | volume_cuboid | +| 37 | Volume of cylinder | Volume of cylinder with height = 35m and radius = 19m is | 39694 m^3 | volume_cylinder | +| 38 | Surface Area of cone | Surface area of cone with height = 8m and radius = 19m is | 2364 m^2 | surface_area_cone | +| 39 | Volume of cone | Volume of cone with height = 43m and radius = 13m is | 7609 m^3 | volume_cone | +| 40 | Common Factors | Common Factors of 21 and 65 = | [1] | common_factors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 5/4x - 1 and y = 0/4x - 5 | (-16/5, -5) | intersection_of_two_lines | +| 42 | Permutations | Number of Permutations from 10 objects picked 5 at a time = | 30240 | permutation | +| 43 | Cross Product of 2 Vectors | [12, -16, 4] X [-14, 10, -9] = | [104, 52, -104] | vector_cross | +| 44 | Compare Fractions | Which symbol represents the comparison between 7/10 and 7/5? | < | compare_fractions | +| 45 | Simple Interest | Simple interest for a principle amount of 6138 dollars, 9% rate of interest and for a time period of 8 years is = | 4419.36 | simple_interest | +| 46 | Multiplication of two matrices | Multiply<table><tr><td>-8</td><td>-8</td></tr><tr><td>-2</td><td>-9</td></tr></table>and<table><tr><td>-10</td><td>-8</td></tr><tr><td>9</td><td>-9</td></tr></table> | <table><tr><td>8</td><td>136</td></tr><tr><td>-61</td><td>97</td></tr></table> | matrix_multiplication | +| 47 | Cube Root | cuberoot of 633 upto 2 decimal places is: | 8.59 | cube_root | +| 48 | Power Rule Integration | 2x^5 + 3x^3 + 4x^7 + 9x^1 + 6x^9 | (2/5)x^6 + (3/3)x^4 + (4/7)x^8 + (9/1)x^2 + (6/9)x^10 + c | power_rule_integration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 79 , 44, 37 = | 200 | fourth_angle_of_quadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+182x+98=0 | [-0.86, -1.45] | quadratic_equation | +| 51 | HCF (Highest Common Factor) | HCF of 1 and 20 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 1 dice are rolled at the same time, the probability of getting a sum of 2 = | 1/6 | dice_sum_probability | +| 53 | Exponentiation | 6^9 = | 10077696 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [260, 249, 281, 261, 236, 237, 275, 229, 256, 242, 277, 240, 278, 293, 271, 255, 216, 292, 200, 298, 282, 223] with 99% confidence is | (271.2437114485249, 242.48356127874783) | confidence_interval | +| 55 | Comparing surds | Fill in the blanks 71^(1/5) _ 31^(1/8) | > | surds_comparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 19 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584] | fibonacci_series | +| 57 | Trigonometric Values | What is cos(45)? | 1/√2 | basic_trigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 10 sides = | 1440 | sum_of_polygon_angles | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[13, 22, 36, 17, 9, 39, 50, 14, 32, 40, 37, 48, 47, 28, 47] | The Mean is 31.933333333333334 , Standard Deviation is 182.59555555555553, Variance is 13.51279229306643 | data_summary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 18m is | 4071.5040790523717 m^2 | surface_area_sphere | +| 61 | Volume of Sphere | Volume of sphere with radius 61 m = | 950775.7894726198 m^3 | volume_sphere | +| 62 | nth Fibonacci number | What is the 85th Fibonacci number? | 259695496911123328 | nth_fibonacci_number | +| 63 | Profit or Loss Percent | Profit percent when CP = 353 and SP = 752 is: | 113.03116147308782 | profit_loss_percent | +| 64 | Binary to Hexidecimal | 111101011 | 0x1eb | binary_to_hex | +| 65 | Multiplication of 2 complex numbers | (-19-9j) * (-17-2j) = | (305+191j) | multiply_complex_numbers | +| 66 | Geometric Progression | For the given GP [7, 77, 847, 9317, 102487, 1127357] ,Find the value of a,common ratio,6th term value, sum upto 7th term | The value of a is 7, common ratio is 11 , 6th term is 1127357 , sum upto 7th term is 13641019.0 | geometric_progression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 32 , 5 and 18 = | (32*5*18)^(1/3) = 14.227573217960249 | geometric_mean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 48 , 85 and 79 = | 3/((1/48) + (1/85) + (1/79)) = 66.28916158223076 | harmonic_mean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[743.1109024649227, 951.2861991520674, 821.2679183199273, 831.5922742303677, 972.3005129207023, 775.1712986008336, 869.5254070360901, 34.05779748860371, 495.5299489221041, 516.2458991121815, 620.0871728488738, 12.438787805084894, 967.8138977993306, 627.6791615554401, 129.81896901435886, 566.4442009627315, 521.5300881726977, 741.5947979192599] is: | 2917.827115551868 | euclidian_norm | +| 70 | Angle between 2 vectors | angle between the vectors [341.1766244080324, 386.90517658729595, 306.3074773969527, 542.1138441520038, 149.80203485453225, 85.6719016065689, 875.0827941729921, 292.0422074695527, 312.8929536855103, 408.95388654647445, 119.81564007869672, 177.5529661884936, 360.30983184002406, 111.71502530193955, 29.528755078141455, 478.2846569662712, 855.8978282979257] and [230.45166329807688, 922.2895458023412, 219.89492715268733, 375.8793126730714, 731.2614314505195, 277.5554009411926, 329.1490487358273, 477.7600322879586, 168.93745868538923, 423.6897582803929, 724.5555882496458, 519.6421532094823, 158.0479000313908, 679.3674240323584, 496.6795371750926, 853.4421897526636, 715.2567898992207] is: | NaN | angle_btw_vectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers 53 and -70 = | 123 | absolute_difference | +| 72 | Dot Product of 2 Vectors | [-8, -4, -10] . [-9, -6, -9] = | 186 | vector_dot | | 73 | Binary 2's Complement | 2's complement of = | | binary_2s_complement | -| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[52, 89, 11], [44, 72, 61], [17, 87, 7]]) is: | Matrix([[1601/52077, -334/156231, -4637/156231], [-81/17359, -59/52077, 896/52077], [-868/52077, 3011/156231, 172/156231]]) | invert_matrix | -| 75 | Area of a Sector | Given radius, 4 and angle, 16. Find the area of the sector. | Area of sector = 2.23402 | sector_area | -| 76 | Mean and Median | Given the series of numbers [90, 44, 84, 5, 79, 31, 78, 89, 56, 34]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 59.0 and Arithmetic median of this series is 67.0 | mean_median | -| 77 | Determinant to 2x2 Matrix | Det([[0, 19], [73, 25]]) = | -1387 | int_matrix_22_determinant | -| 78 | Compound Interest | Compound Interest for a principle amount of 7422 dollars, 10% rate of interest and for a time period of 2 compounded monthly is = | 7422.0 | compound_interest | -| 79 | Decimal to Hexadecimal | Binary of 946= | 0x3b2 | decimal_to_hexadeci | -| 80 | Percentage of a number | What is 94% of 88? | Required percentage = 82.72% | percentage | -| 81 | Celsius To Fahrenheit | Convert 14 degrees Celsius to degrees Fahrenheit = | 57.2 | celsius_to_fahrenheit | -| 82 | AP Term Calculation | Find the term number 48 of the AP series: 33, 9, -15 ... | -1095 | arithmetic_progression_term | -| 83 | AP Sum Calculation | Find the sum of first 12 terms of the AP series: 26, 67, 108 ... | 3018.0 | arithmetic_progression_sum | -| 84 | Converts decimal to octal | The decimal number 2394 in Octal is: | 0o4532 | decimal_to_octal | -| 85 | Converts decimal to Roman Numerals | The number 25 in Roman Numerals is: | XXV | decimal_to_roman_numerals | -| 86 | Degrees to Radians | Angle 9 in radians is = | 0.16 | degree_to_rad | -| 87 | Radians to Degrees | Angle 2 in degrees is = | 114.59 | radian_to_deg | -| 88 | Differentiation | differentiate w.r.t x : d(sec(x)+6*x^4)/dx | 24*x^3 + tan(x)*sec(x) | differentiation | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[43, 95, 41], [46, 80, 67], [57, 75, 71]]) is: | Matrix([[131/7038, -367/3519, 617/7038], [553/35190, 358/17595, -199/7038], [-37/1173, 73/1173, -31/1173]]) | invert_matrix | +| 75 | Area of a Sector | Given radius, 40 and angle, 199. Find the area of the sector. | Area of sector = 2778.56417 | sector_area | +| 76 | Mean and Median | Given the series of numbers [44, 64, 22, 37, 63, 56, 27, 62, 98, 72]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 54.5 and Arithmetic median of this series is 59.0 | mean_median | +| 77 | Determinant to 2x2 Matrix | Det([[73, 52], [55, 80]]) = | 2980 | int_matrix_22_determinant | +| 78 | Compound Interest | Compound Interest for a principle amount of 8506 dollars, 8% rate of interest and for a time period of 10 compounded monthly is = | 8506.0 | compound_interest | +| 79 | Decimal to Hexadecimal | Binary of 293= | 0x125 | decimal_to_hexadeci | +| 80 | Percentage of a number | What is 57% of 4? | Required percentage = 2.28% | percentage | +| 81 | Celsius To Fahrenheit | Convert 57 degrees Celsius to degrees Fahrenheit = | 134.60000000000002 | celsius_to_fahrenheit | +| 82 | AP Term Calculation | Find the term number 89 of the AP series: 20, 115, 210 ... | 8380 | arithmetic_progression_term | +| 83 | AP Sum Calculation | Find the sum of first 98 terms of the AP series: -58, -106, -154 ... | -233828.0 | arithmetic_progression_sum | +| 84 | Converts decimal to octal | The decimal number 1716 in Octal is: | 0o3264 | decimal_to_octal | +| 85 | Converts decimal to Roman Numerals | The number 587 in Roman Numerals is: | DLXXXVII | decimal_to_roman_numerals | +| 86 | Degrees to Radians | Angle 245 in radians is = | 4.28 | degree_to_rad | +| 87 | Radians to Degrees | Angle 0 in degrees is = | 0.0 | radian_to_deg | +| 88 | Differentiation | differentiate w.r.t x : d(exp(x)+5*x^(-2))/dx | exp(x) - 10/x^3 | differentiation | +| 89 | Definite Integral of Quadratic Equation | The definite integral within limits 0 to 1 of the equation 39x^2 + 72x + 74 is = | 123.0 | definite_integral | diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 9d67f91..2d0910f 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -93,4 +93,4 @@ from .decimal_to_roman_numerals import * from .degree_to_rad import * from .radian_to_deg import * from .differentiation import * -from .definiteIntegralFunc import * +from .definite_integral import * diff --git a/mathgenerator/funcs/definiteIntegralFunc.py b/mathgenerator/funcs/definite_integral.py similarity index 61% rename from mathgenerator/funcs/definiteIntegralFunc.py rename to mathgenerator/funcs/definite_integral.py index b0e502c..9dc6290 100644 --- a/mathgenerator/funcs/definiteIntegralFunc.py +++ b/mathgenerator/funcs/definite_integral.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator from scipy.integrate import quad @@ -15,11 +14,13 @@ def definiteIntegralFunc(max_coeff=100): result = quad(integrand, 0, 1, args=(a, b, c))[0] S = round(result, 4) - problem = "The definite integral within limits 0 to 1 of the equation " + str(a) + "x^2 + " + str(b) + "x + " + str(c) + " is = " + problem = "The definite integral within limits 0 to 1 of the equation " + \ + str(a) + "x^2 + " + str(b) + "x + " + str(c) + " is = " solution = str(S) return problem, solution -definiteIntegral = Generator("Definite Integral of Quadratic Equation", 110, "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "S", definiteIntegralFunc) +definite_integral = Generator("Definite Integral of Quadratic Equation", 89, + "The definite integral within limits 0 to 1 of quadratic equation ax^2+bx+c is = ", "S", definiteIntegralFunc) diff --git a/test.py b/test.py index e763dfa..74d73ce 100644 --- a/test.py +++ b/test.py @@ -3,13 +3,11 @@ from mathgenerator import mathgen # test your generators here print(mathgen.addition()) -print(mathgen.genById(88)) # prints each generator in genList -""" list = mathgen.getGenList() for item in list: print(item[2]) # print(mathgen.getGenList()) -""" +print(mathgen.genById(89)) From ed77e8b986f680ce94f89cc02990fff474f6aab2 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 13:21:31 -0400 Subject: [PATCH 89/99] isprime fix --- mathgen.py | 43 ------------------- mathgenerator/funcs/__init__.py | 2 +- .../funcs/{isprime.py => is_prime.py} | 4 ++ 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 mathgen.py rename mathgenerator/funcs/{isprime.py => is_prime.py} (80%) diff --git a/mathgen.py b/mathgen.py deleted file mode 100644 index ffb2ebe..0000000 --- a/mathgen.py +++ /dev/null @@ -1,43 +0,0 @@ -import random - - -genList = [] - - -# || Generator class -class Generator: - def __init__(self, title, id, generalProb, generalSol, func): - self.title = title - self.id = id - self.generalProb = generalProb - self.generalSol = generalSol - self.func = func - genList.append([id, title, self]) - - def __str__(self): - return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol - - def __call__(self, **kwargs): - return self.func(**kwargs) - - -def isprime(max_a=100): - a = random.randint(2, max_a) - problem = a - if a == 2: - solution = True - return (problem, solution) - if a % 2 == 0: - solution = False - return (problem, solution) - for i in range(3, a // 2 + 1, 2): - if a % i == 0: - solution = False - return (problem, solution) - solution = True - return (problem, solution) - - -is_prime = Generator('isprime', 74, 'a any positive integer', - 'True/False', isprime) -print(is_prime.func) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bf59c56..56a2fd5 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -94,4 +94,4 @@ from .degree_to_rad import * from .radian_to_deg import * from .differentiation import * from .definite_integral import * -from .isprime import * \ No newline at end of file +from .is_prime import * diff --git a/mathgenerator/funcs/isprime.py b/mathgenerator/funcs/is_prime.py similarity index 80% rename from mathgenerator/funcs/isprime.py rename to mathgenerator/funcs/is_prime.py index 9da7bfb..143f4d3 100644 --- a/mathgenerator/funcs/isprime.py +++ b/mathgenerator/funcs/is_prime.py @@ -16,3 +16,7 @@ def isprime(max_a=100): return (problem, solution) solution = True return (problem, solution) + + +is_prime = Generator('isprime', 90, 'a any positive integer', + 'True/False', isprime) From 4ca54936fb79b2cf6dfb1a1ea7c43b23709adb25 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 13:32:34 -0400 Subject: [PATCH 90/99] Fix imports --- dev-requirements.txt | 1 + mathgenerator/funcs/definite_integral.py | 1 + mathgenerator/mathgen.py | 5 +---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 259022d..0226baf 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,3 +4,4 @@ flake8 autopep8 sympy numpy +scipy diff --git a/mathgenerator/funcs/definite_integral.py b/mathgenerator/funcs/definite_integral.py index 9dc6290..6e8453f 100644 --- a/mathgenerator/funcs/definite_integral.py +++ b/mathgenerator/funcs/definite_integral.py @@ -1,4 +1,5 @@ from .__init__ import * +import scipy from scipy.integrate import quad diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index b724345..2a969fa 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -1,9 +1,6 @@ -import random -import math -import fractions from .funcs import * from .__init__ import getGenList -import scipy + genList = getGenList() From 869207bdb521746472e47ac9d9e9d8f555f74176 Mon Sep 17 00:00:00 2001 From: Mo <58116522+Metropass@users.noreply.github.com> Date: Tue, 20 Oct 2020 13:55:21 -0400 Subject: [PATCH 91/99] Fixed Issue #289 Removed the multiplication, added '+' for proper concatenation --- mathgenerator/funcs/decimal_to_roman_numerals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/decimal_to_roman_numerals.py b/mathgenerator/funcs/decimal_to_roman_numerals.py index 46a1ebd..63b64f2 100644 --- a/mathgenerator/funcs/decimal_to_roman_numerals.py +++ b/mathgenerator/funcs/decimal_to_roman_numerals.py @@ -15,7 +15,7 @@ def decimalToRomanNumeralsFunc(maxDecimal=4000): if last_value <= 3: solution += (roman_dict[divisor] * last_value) elif last_value == 4: - solution += (roman_dict[divisor] * roman_dict[divisor * 5]) + solution += (roman_dict[divisor] + roman_dict[divisor * 5]) elif 5 <= last_value <= 8: solution += (roman_dict[divisor * 5] + (roman_dict[divisor] * (last_value - 5))) elif last_value == 9: From 46c396bc4fb4e669aa6471502401f297c90f67f5 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 14:02:16 -0400 Subject: [PATCH 92/99] cache workflow update --- .github/workflows/tests.yaml | 18 ++++++++++++++++++ setup.py | 6 +++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cc6cf9d..c28d903 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,15 +9,33 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' + + - name: Cache Primes + id: myCacheStep + uses: actions/cache@v2 + env: + cache-name: cache-pip-modules + with: + path: ~/.pip + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Install dependencies + if: steps.myCacheStep.outputs.cache-hit != 'true' run: | python -m pip install -U pip python -m pip install -r dev-requirements.txt + - name: Linter run: make lint + - name: Test run: make test diff --git a/setup.py b/setup.py index 4bfbcd0..10f5f36 100644 --- a/setup.py +++ b/setup.py @@ -8,5 +8,9 @@ setup(name='mathgenerator', author_email='lukew25073@gmail.com', license='MIT', packages=find_packages(), - install_requires=[], + install_requires=[ + sympy, + numpy, + scipy + ], entry_points={}) From d3c6d5d988566e552dfe9192328cf0a2b16835b0 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 14:05:43 -0400 Subject: [PATCH 93/99] fix install requires --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 10f5f36..fbbebfd 100644 --- a/setup.py +++ b/setup.py @@ -9,8 +9,8 @@ setup(name='mathgenerator', license='MIT', packages=find_packages(), install_requires=[ - sympy, - numpy, - scipy + 'sympy', + 'numpy', + 'scipy' ], entry_points={}) From 05711e6bdfda27153b523e095c43c750c66ad2da Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 14:20:54 -0400 Subject: [PATCH 94/99] Change cachestep name --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c28d903..87ced74 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -15,7 +15,7 @@ jobs: with: python-version: '3.x' - - name: Cache Primes + - name: Cache Dependencies id: myCacheStep uses: actions/cache@v2 env: From c165a176d06db1c1e70a7b5fd046c62d889b6d0e Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 14:32:20 -0400 Subject: [PATCH 95/99] cache test --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 74d73ce..2fa65b7 100644 --- a/test.py +++ b/test.py @@ -10,4 +10,4 @@ for item in list: print(item[2]) # print(mathgen.getGenList()) -print(mathgen.genById(89)) +print(mathgen.genById(85)) From 0a9b54ab0e2bdfd2f186a06205da8d24a3871122 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 19:34:23 -0400 Subject: [PATCH 96/99] update cache workflow --- .github/workflows/tests.yaml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 87ced74..d66144a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -15,24 +15,17 @@ jobs: with: python-version: '3.x' - - name: Cache Dependencies - id: myCacheStep - uses: actions/cache@v2 - env: - cache-name: cache-pip-modules + - uses: actions/cache@v1 with: - path: ~/.pip - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/dev-requirements.txt') }} restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- + ${{ runner.os }}-pip- - - name: Install dependencies - if: steps.myCacheStep.outputs.cache-hit != 'true' + - name: Install Dependencies + if: steps.cache.outputs.cache-hit != 'true' run: | - python -m pip install -U pip - python -m pip install -r dev-requirements.txt + pip install -r dev-requirements.txt - name: Linter run: make lint From a6f784a5d078edfd170bb727e161bfef97bd2452 Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 19:54:01 -0400 Subject: [PATCH 97/99] test github actions cache --- .github/workflows/python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 4e1ef42..495e3c3 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -1,5 +1,5 @@ # This workflows will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries +# For more information see https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries name: Upload Python Package From 8cde00c324377d4dfebad9f337b4b23ff96aed17 Mon Sep 17 00:00:00 2001 From: Luke Weiler <lukew25073@gmail.com> Date: Tue, 20 Oct 2020 21:16:27 -0400 Subject: [PATCH 98/99] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fbbebfd..7b022b4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages setup(name='mathgenerator', - version='1.1.3', + version='1.1.4', description='An open source solution for generating math problems', url='https://github.com/todarith/mathgenerator', author='Luke Weiler', From ca8bafabada286696ba27721779f8552e443af9a Mon Sep 17 00:00:00 2001 From: lukew3 <lukew25073@gmail.com> Date: Wed, 21 Oct 2020 13:59:13 -0400 Subject: [PATCH 99/99] fix merge errors --- mathgenerator/funcs/compound_interest.py | 25 +++++++++--------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/mathgenerator/funcs/compound_interest.py b/mathgenerator/funcs/compound_interest.py index 4278d10..8f7d48d 100644 --- a/mathgenerator/funcs/compound_interest.py +++ b/mathgenerator/funcs/compound_interest.py @@ -1,24 +1,17 @@ from .__init__ import * -def compoundInterestFunc(maxPrinciple=10000, - maxRate=10, - maxTime=10, - maxPeriod=10): - p = random.randint(100, maxPrinciple) +def compoundInterestFunc(maxPrinciple=10000, maxRate=10, maxTime=10): + p = random.randint(1000, 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 = " - solution = round(A, 2) + n = random.randint(1, maxTime) + a = p * (1 + r / 100)**n + problem = "Compound interest for a principle amount of " + \ + str(p) + " dollars, " + str(r) + \ + "% rate of interest and for a time period of " + str(n) + " year is = " + solution = round(a, 2) return problem, solution compound_interest = 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) + "Compound Interest", 78, "Compound interest for a principle amount of a dollars, b% rate of interest and for a time period of c years is = ", "d dollars", compoundInterestFunc)
-59 -20 -50 -79 75 96
-56 36 70 47 -79 64
6 0 -8 -53 -23 -83
-42 -84 21 -10 -42 98
-9 -62 -15 -68 -49 -59
-81 -84 3 58 -84 -59
-56 33 73 98 51 -19
-81 -96 -98 61 -32 73
-43 66 83 90 -22 -94]] | [[ 3120, -15765, -13401, -2683, -17993, -3354] - [ 10584, 13902, 11916, -7446, 4430, 554] - [ -1800, 6587, 14343, 6224, 4525, 4853] - [-12452, -10675, -8693, 427, 2955, 17691]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 221 upto 2 decimal places is: | 6.05 | CubeRoot | -| 48 | Power Rule Integration | 4x^5 + 2x^5 + 9x^8 + 9x^5 | (4/5)x^6 + (2/5)x^6 + (9/8)x^9 + (9/5)x^6 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 27 , 155, 116 = | 62 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 53x^2+200x+78=0 | [-0.44, -3.33] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 4 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability | -| 53 | Exponentiation | 9^10 = | 3486784401 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [266, 201, 278, 209, 229, 275, 216, 234, 219, 276, 282, 281, 208, 247, 265, 273, 286, 202, 231, 207, 251, 203, 259, 288, 291, 260, 210, 263, 222] with 99% confidence is | (260.5668079141175, 231.29526105139982) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 15^(1/9) _ 55^(1/1) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeries | -| 57 | Trigonometric Values | What is tan(30)? | 1/√3 | basicTrigonometry | -| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[36, 13, 31, 23, 38, 34, 24, 20, 41, 14, 19, 31, 11, 49, 49] | The Mean is 28.866666666666667 , Standard Deviation is 143.5822222222222, Variance is 11.982579948501167 | dataSummary | -| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 11m is | 1520.5308443374597 m^2 | surfaceAreaSphereGen | -| 60 | Volume of Sphere | Volume of sphere with radius 73 m = | 1629510.5990953872 m^3 | volumeSphere | -| 61 | nth Fibonacci number | What is the 68th Fibonacci number? | 72723460248141 | nthFibonacciNumberGen | -| 62 | Profit or Loss Percent | Profit percent when CP = 825 and SP = 972 is: | 17.81818181818182 | profitLossPercent | -| 63 | Binary to Hexidecimal | 100000 | 0x20 | binaryToHex | -| 64 | Multiplication of 2 complex numbers | (3+14j) * (-3+16j) = | (-233+6j) | complexNumMultiply | -| 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | -| 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | -| 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +") - print(prob) instName = lines[line] func_name = instName[:instName.find('=')].strip() # NOTE: renamed 'def_name' to 'func_name' because it suits it more row = [myGen.id, myGen.title, prob, solu, func_name] - # print(item[1], func_name) + print('added', item[1],'-', func_name, 'to the README.md') line += 1 if line > len(lines): break diff --git a/mathgenerator/funcs/angleBtwVectorsFunc.py b/mathgenerator/funcs/angleBtwVectorsFunc.py index bd2d0b5..b02b496 100644 --- a/mathgenerator/funcs/angleBtwVectorsFunc.py +++ b/mathgenerator/funcs/angleBtwVectorsFunc.py @@ -1,16 +1,21 @@ -from .euclidianNormFunc import euclidianNormFunc -import math from .__init__ import * -def angleBtwVectorsFunc(v1: list, v2: list): - sum = 0 +def angleBtwVectorsFunc(maxEltAmt=20): + s = 0 + v1 = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + v2 = [random.uniform(0, 1000) for i in v1] for i in v1: for j in v2: - sum += i * j + s += i * j - mags = euclidianNormFunc(v1) * euclidianNormFunc(v2) + mags = math.sqrt(sum([i**2 for i in v1])) * math.sqrt(sum([i**2 for i in v2])) problem = f"angle between the vectors {v1} and {v2} is:" - solution = math.acos(sum / mags) + solution = '' + try: + solution = str(math.acos(s / mags)) + except: + print('angleBtwVectorsFunc has some issues with math module, line 16') + solution = 'NaN' # would return the answer in radians return problem, solution diff --git a/mathgenerator/funcs/euclidianNormFunc.py b/mathgenerator/funcs/euclidianNormFunc.py index f66329e..6a414a9 100644 --- a/mathgenerator/funcs/euclidianNormFunc.py +++ b/mathgenerator/funcs/euclidianNormFunc.py @@ -1,7 +1,8 @@ from .__init__ import * -def euclidianNormFunc(v1: list): - problem = f"Euclidian norm or L2 norm of the vector{v1} is:" - solution = sqrt(sum([i**2 for i in v1])) +def euclidianNormFunc(maxEltAmt=20): + vec = [random.uniform(0, 1000) for i in range(random.randint(2,maxEltAmt))] + problem = f"Euclidian norm or L2 norm of the vector{vec} is:" + solution = math.sqrt(sum([i**2 for i in vec])) return problem, solution From 83d0eeb340f1687f5d103b80722eac0efb8abaa1 Mon Sep 17 00:00:00 2001 From: D-T-666 Date: Mon, 19 Oct 2020 18:46:17 +0400 Subject: [PATCH 17/99] =?UTF-8?q?=F0=9F=94=A7=20fixed=20matrixMultiplicati?= =?UTF-8?q?on=20in=20makeReadme.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 156 ++++++++++++++------------ makeReadme.py | 2 + mathgenerator/funcs/meanMedianFunc.py | 2 +- mathgenerator/funcs/sectorAreaFunc.py | 2 +- 4 files changed, 88 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index f2d81dc..dbf463c 100644 --- a/README.md +++ b/README.md @@ -31,76 +31,88 @@ problem, solution = mathgen.genById(0) | Id | Skill | Example problem | Example Solution | Function Name | |------|-----------------------------------|--------------------|-----------------------|--------------------------| [//]: # list start -| 0 | Addition | 33+23= | 56 | addition | -| 1 | Subtraction | 14-1= | 13 | subtraction | -| 2 | Multiplication | 52*1= | 52 | multiplication | -| 3 | Division | 14/26= | 0.5384615384615384 | division | -| 4 | Binary Complement 1s | 0110111= | 1001000 | binaryComplement1s | -| 5 | Modulo Division | 23%70= | 23 | moduloDivision | -| 6 | Square Root | sqrt(121)= | 11 | squareRoot | -| 7 | Power Rule Differentiation | 3x^2 + 3x^5 + 1x^2 + 6x^4 + 6x^3 | 6x^1 + 15x^4 + 2x^1 + 24x^3 + 18x^2 | powerRuleDifferentiation | -| 8 | Square | 18^2= | 324 | square | -| 9 | LCM (Least Common Multiple) | LCM of 17 and 11 = | 187 | lcm | -| 10 | GCD (Greatest Common Denominator) | GCD of 15 and 12 = | 3 | gcd | -| 11 | Basic Algebra | 2x + 3 = 10 | 7/2 | basicAlgebra | -| 12 | Logarithm | log2(32) | 5 | log | -| 13 | Easy Division | 196/14 = | 14 | intDivision | -| 14 | Decimal to Binary | Binary of 61= | 111101 | decimalToBinary | -| 15 | Binary to Decimal | 1 | 1 | binaryToDecimal | -| 16 | Fraction Division | (2/1)/(10/5) | 1 | fractionDivision | -| 17 | Integer Multiplication with 2x2 Matrix | 16 * [[4, 1], [1, 2]] = | [[64,16],[16,32]] | intMatrix22Multiplication | -| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 11 = | 69.62892717829278 | areaOfTriangle | -| 19 | Triangle exists check | Does triangle with sides 35, 14 and 37 exist? | Yes | doesTriangleExist | -| 20 | Midpoint of the two point | (15,5),(9,10)= | (12.0,7.5) | midPointOfTwoPoint | -| 21 | Factoring Quadratic | x^2-12x+35 | (x-7)(x-5) | factoring | -| 22 | Third Angle of Triangle | Third angle of triangle with angles 37 and 54 = | 89 | thirdAngleOfTriangle | -| 23 | Solve a System of Equations in R^2 | -4x - 8y = 60, -9x + 10y = 51 | x = -9, y = -3 | systemOfEquations | -| 24 | Distance between 2 points | Find the distance between (16, 7) and (19, 14) | sqrt(58) | distance2Point | -| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 18 and 8 = | 19.70 | pythagoreanTheorem | -| 26 | Linear Equations | -8x + 15y = -109 -6x + -14y = 90 | x = 8, y = -3 | linearEquations | -| 27 | Prime Factorisation | Find prime factors of 130 | [2, 5, 13] | primeFactors | -| 28 | Fraction Multiplication | (8/9)*(3/2) | 4/3 | fractionMultiplication | -| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 8 sides | 135.0 | angleRegularPolygon | -| 30 | Combinations of Objects | Number of combinations from 11 objects picked 9 at a time | 55 | combinations | -| 31 | Factorial | 2! = | 2 | factorial | -| 32 | Surface Area of Cube | Surface area of cube with side = 17m is | 1734 m^2 | surfaceAreaCubeGen | -| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 8m, 4m, 17m is | 472 m^2 | surfaceAreaCuboidGen | -| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 32m and radius = 18m is | 5654 m^2 | surfaceAreaCylinderGen | -| 35 | Volum of Cube | Volume of cube with side = 11m is | 1331 m^3 | volumeCubeGen | -| 36 | Volume of Cuboid | Volume of cuboid with sides = 14m, 19m, 1m is | 266 m^3 | volumeCuboidGen | -| 37 | Volume of cylinder | Volume of cylinder with height = 16m and radius = 18m is | 16286 m^3 | volumeCylinderGen | -| 38 | Surface Area of cone | Surface area of cone with height = 48m and radius = 20m is | 4523 m^2 | surfaceAreaConeGen | -| 39 | Volume of cone | Volume of cone with height = 29m and radius = 6m is | 1093 m^3 | volumeConeGen | -| 40 | Common Factors | Common Factors of 59 and 57 = | [1] | commonFactors | -| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = -1/4x - 2 and y = 4/5x + 3 | (-100/21, -17/21) | intersectionOfTwoLines | -| 42 | Permutations | Number of Permutations from 13 objects picked 8 at a time = | 51891840 | permutations | -| 43 | Cross Product of 2 Vectors | [4, -11, 9] X [-8, -19, -5] = | [226, -52, -164] | vectorCross | -| 44 | Compare Fractions | Which symbol represents the comparison between 3/7 and 2/4? | < | compareFractions | -| 45 | Simple Interest | Simple interest for a principle amount of 2398 dollars, 9% rate of interest and for a time period of 5 years is = | 1079.1 | simpleInterest | -| 46 | Multiplication of two matrices | Multiply
-91 -4 -1 43 -22 -73 -29
44 24 90 -65 100 31 45
73 -64 55 -9 -21 51 7
5 65 -31 50 -62 -27 -51
55 -88 -83 -5 -41 -26 84]] | [[-17453, 5086, -4551, 4485, 48, -6029, -7477] + [ -6665, 16082, 4879, 4870, -274, -1631, -12411] + [ -3247, 11054, -1129, -539, 3316, 3038, -5504] + [ -2559, 79, -12837, 8081, -11940, -9336, -1370] + [-13874, -6176, -14818, 7900, -9264, -13118, -118]] | matrixMultiplication | +| 47 | Cube Root | cuberoot of 432 upto 2 decimal places is: | 7.56 | CubeRoot | +| 48 | Power Rule Integration | 2x^10 | (2/10)x^11 + c | powerRuleIntegration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 29 , 153, 130 = | 48 | fourthAngleOfQuadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 85x^2+188x+3=0 | [-0.02, -2.2] | quadraticEquationSolve | +| 51 | HCF (Highest Common Factor) | HCF of 5 and 7 = | 1 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 5 = | 4/36 | diceSumProbability | +| 53 | Exponentiation | 13^9 = | 10604499373 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [232, 294, 245, 210, 221, 211, 257, 229, 258, 218, 290, 235, 203, 281, 296, 244, 243, 263, 251, 224, 276, 299, 298, 208, 285, 282, 266, 213, 270, 284, 297, 246, 230, 288, 207, 228, 279, 202, 240, 256] with 80% confidence is | (257.72581618790196, 245.224183812098) | confidenceInterval | +| 55 | Comparing surds | Fill in the blanks 96^(1/7) _ 15^(1/6) | > | surdsComparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 7 numbers is ? | [0, 1, 1, 2, 3, 5, 8] | fibonacciSeries | +| 57 | Trigonometric Values | What is sin(0)? | 0 | basicTrigonometry | +| 58 | Sum of Angles of Polygon | Sum of angles of polygon with 10 sides = | 1440 | sumOfAnglesOfPolygon | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[15, 24, 20, 12, 49, 43, 21, 27, 11, 44, 19, 25, 40, 40, 7] | The Mean is 26.466666666666665 , Standard Deviation is 169.98222222222222, Variance is 13.03772304592417 | dataSummary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 2m is | 50.26548245743669 m^2 | surfaceAreaSphereGen | +| 61 | Volume of Sphere | Volume of sphere with radius 15 m = | 14137.166941154068 m^3 | volumeSphere | +| 62 | nth Fibonacci number | What is the 100th Fibonacci number? | 354224848179263111168 | nthFibonacciNumberGen | +| 63 | Profit or Loss Percent | Loss percent when CP = 273 and SP = 196 is: | 28.205128205128204 | profitLossPercent | +| 64 | Binary to Hexidecimal | 11111101 | 0xfd | binaryToHex | +| 65 | Multiplication of 2 complex numbers | (4-18j) * (-7-7j) = | (-154+98j) | complexNumMultiply | +| 66 | Geometric Progression | For the given GP [5, 20, 80, 320, 1280, 5120] ,Find the value of a,common ratio,7th term value, sum upto 8th term | The value of a is 5, common ratio is 4 , 7th term is 20480 , sum upto 8th term is 109225.0 | geometricprogression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 2 numbers 73 and 84 = | (73*84)^(1/2) = 78.30708780180757 | geometricMean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 3 numbers 48 , 90 and 92 = | 3/((1/48) + (1/90) + (1/92)) = 70.07052186177715 | harmonicMean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[924.2913636750363, 20.503795974707305, 517.3232583455609, 108.40962248839648, 53.90127703299286, 439.08768846258494, 456.9202154814549, 994.1184872614399, 582.1310398602112, 900.2850171703179, 600.8210520400753, 976.4837679476245, 322.81868740893447, 200.87610464653193] is: | 2266.1247066414917 | eucldianNorm | +| 70 | Angle between 2 vectors | angle between the vectors [208.76603907240408, 856.3899288947613, 504.6705923607805, 59.53820731849413, 225.96877896886213, 106.59039269390458, 954.4412959874746, 833.8565561650387] and [137.70718881439137, 398.58328047203594, 697.7790424491039, 94.83157368402372, 84.50274981272999, 643.3388926841467, 27.78410024116851, 405.7876464522183] is: | NaN | angleBtwVectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -11 and 65 = | 76 | absoluteDifference | +| 72 | Dot Product of 2 Vectors | [-6, -17, -7] . [4, -14, -10] = | 284 | vectorDot | +| 73 | Binary 2's Complement | 2's complement of 1 = | 1 | binary2sComplement | diff --git a/makeReadme.py b/makeReadme.py index 796dc00..d5dadc7 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -17,19 +17,16 @@ for item in wList: solu = str(solu).rstrip("\n") # edge case for matrixMultiplication if item[0] == 46: - print(prob) - prob = prob.replace("[[", "
") prob = prob.replace("[", "
") prob = prob.replace(", ", "") prob = prob.replace("]]\n", "
") prob = prob.replace("]\n", "
-50367-26-263
88-3760-1961-56
48-569-87-64-92
-84-50-79-1986-13
02812-1473-49
94-90226-3819
2-1179-7798-77
-877072-3264-99
and
3432-6-3246-2378-81-18
-172449-62-507738-98-64
-23-7843 5-83-5 4-92-16
46-47-9252-25-374451-7
2026703796-73498442
-72-15-80-2458-47-4145-69
|
-8245-1057-423-3535-5692034-63291219-5765
6619 5671073723914001-629110147-73876383
1472-16113318-5565-1257410381 638-236992621
159355983465789913170-6487-48572464210618
359230271220614732120-4126082-6354561
3748-1803-1146020725462-8183242311 947
2400 960229502483 952-19744625-55129372
1132-2067223921884-1227681961949-71485677
| matrixMultiplication | - [ 10584, 13902, 11916, -7446, 4430, 554] - [ -1800, 6587, 14343, 6224, 4525, 4853] - [-12452, -10675, -8693, 427, 2955, 17691]] | matrixMultiplication | -| 47 | Cube Root | cuberoot of 221 upto 2 decimal places is: | 6.05 | CubeRoot | -| 48 | Power Rule Integration | 4x^5 + 2x^5 + 9x^8 + 9x^5 | (4/5)x^6 + (2/5)x^6 + (9/8)x^9 + (9/5)x^6 + c | powerRuleIntegration | -| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 27 , 155, 116 = | 62 | fourthAngleOfQuadrilateral | -| 50 | Quadratic Equation | Zeros of the Quadratic Equation 53x^2+200x+78=0 | [-0.44, -3.33] | quadraticEquationSolve | -| 51 | HCF (Highest Common Factor) | HCF of 7 and 4 = | 1 | hcf | -| 52 | Probability of a certain sum appearing on faces of dice | If 2 dice are rolled at the same time, the probability of getting a sum of 11 = | 2/36 | diceSumProbability | -| 53 | Exponentiation | 9^10 = | 3486784401 | exponentiation | -| 54 | Confidence interval For sample S | The confidence interval for sample [266, 201, 278, 209, 229, 275, 216, 234, 219, 276, 282, 281, 208, 247, 265, 273, 286, 202, 231, 207, 251, 203, 259, 288, 291, 260, 210, 263, 222] with 99% confidence is | (260.5668079141175, 231.29526105139982) | confidenceInterval | -| 55 | Comparing surds | Fill in the blanks 15^(1/9) _ 55^(1/1) | < | surdsComparison | -| 56 | Fibonacci Series | The Fibonacci Series of the first 10 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34] | fibonacciSeries | -| 57 | Trigonometric Values | What is tan(30)? | 1/√3 | basicTrigonometry | +| 0 | Addition | 23+50= | 73 | addition | +| 1 | Subtraction | 68-41= | 27 | subtraction | +| 2 | Multiplication | 51*1= | 51 | multiplication | +| 3 | Division | 37/44= | 0.8409090909090909 | division | +| 4 | Binary Complement 1s | 01= | 10 | binaryComplement1s | +| 5 | Modulo Division | 49%54= | 49 | moduloDivision | +| 6 | Square Root | sqrt(16)= | 4 | squareRoot | +| 7 | Power Rule Differentiation | 1x^6 + 8x^4 + 5x^5 | 6x^5 + 32x^3 + 25x^4 | powerRuleDifferentiation | +| 8 | Square | 2^2= | 4 | square | +| 9 | LCM (Least Common Multiple) | LCM of 13 and 1 = | 13 | lcm | +| 10 | GCD (Greatest Common Denominator) | GCD of 14 and 8 = | 2 | gcd | +| 11 | Basic Algebra | 1x + 6 = 8 | 2 | basicAlgebra | +| 12 | Logarithm | log2(256) | 8 | log | +| 13 | Easy Division | 96/4 = | 24 | intDivision | +| 14 | Decimal to Binary | Binary of 12= | 1100 | decimalToBinary | +| 15 | Binary to Decimal | 010010100 | 148 | binaryToDecimal | +| 16 | Fraction Division | (5/10)/(5/2) | 1/5 | fractionDivision | +| 17 | Integer Multiplication with 2x2 Matrix | 1 * [[2, 6], [6, 6]] = | [[2,6],[6,6]] | intMatrix22Multiplication | +| 18 | Area of Triangle | Area of triangle with side lengths: 15 13 20 = | 97.48846085563153 | areaOfTriangle | +| 19 | Triangle exists check | Does triangle with sides 30, 30 and 47 exist? | Yes | doesTriangleExist | +| 20 | Midpoint of the two point | (-8,11),(2,3)= | (-3.0,7.0) | midPointOfTwoPoint | +| 21 | Factoring Quadratic | x^2-3x-28 | (x+4)(x-7) | factoring | +| 22 | Third Angle of Triangle | Third angle of triangle with angles 59 and 50 = | 71 | thirdAngleOfTriangle | +| 23 | Solve a System of Equations in R^2 | 3x + 7y = -61, 6x + 7y = -52 | x = 3, y = -10 | systemOfEquations | +| 24 | Distance between 2 points | Find the distance between (-10, -6) and (-2, 14) | sqrt(464) | distance2Point | +| 25 | Pythagorean Theorem | The hypotenuse of a right triangle given the other two lengths 17 and 13 = | 21.40 | pythagoreanTheorem | +| 26 | Linear Equations | -2x + 9y = 16 +-15x + 3y = -267 | x = 19, y = 6 | linearEquations | +| 27 | Prime Factorisation | Find prime factors of 94 | [2, 47] | primeFactors | +| 28 | Fraction Multiplication | (8/10)*(10/7) | 8/7 | fractionMultiplication | +| 29 | Angle of a Regular Polygon | Find the angle of a regular polygon with 19 sides | 161.05 | angleRegularPolygon | +| 30 | Combinations of Objects | Number of combinations from 14 objects picked 8 at a time | 3003 | combinations | +| 31 | Factorial | 5! = | 120 | factorial | +| 32 | Surface Area of Cube | Surface area of cube with side = 16m is | 1536 m^2 | surfaceAreaCubeGen | +| 33 | Surface Area of Cuboid | Surface area of cuboid with sides = 9m, 16m, 12m is | 888 m^2 | surfaceAreaCuboidGen | +| 34 | Surface Area of Cylinder | Surface area of cylinder with height = 41m and radius = 11m is | 3593 m^2 | surfaceAreaCylinderGen | +| 35 | Volum of Cube | Volume of cube with side = 3m is | 27 m^3 | volumeCubeGen | +| 36 | Volume of Cuboid | Volume of cuboid with sides = 2m, 8m, 14m is | 224 m^3 | volumeCuboidGen | +| 37 | Volume of cylinder | Volume of cylinder with height = 43m and radius = 15m is | 30394 m^3 | volumeCylinderGen | +| 38 | Surface Area of cone | Surface area of cone with height = 49m and radius = 2m is | 320 m^2 | surfaceAreaConeGen | +| 39 | Volume of cone | Volume of cone with height = 31m and radius = 17m is | 9381 m^3 | volumeConeGen | +| 40 | Common Factors | Common Factors of 55 and 82 = | [1] | commonFactors | +| 41 | Intersection of Two Lines | Find the point of intersection of the two lines: y = 0/4x + 1 and y = 3/5x - 9 | (50/3, 1) | intersectionOfTwoLines | +| 42 | Permutations | Number of Permutations from 11 objects picked 0 at a time = | 1 | permutations | +| 43 | Cross Product of 2 Vectors | [16, -20, -19] X [-16, -13, -11] = | [-27, 480, -528] | vectorCross | +| 44 | Compare Fractions | Which symbol represents the comparison between 6/7 and 8/5? | < | compareFractions | +| 45 | Simple Interest | Simple interest for a principle amount of 7762 dollars, 2% rate of interest and for a time period of 2 years is = | 310.48 | simpleInterest | +| 46 | Multiplication of two matrices | Multiply
18-5697-66-2555-9986
2-4527-87-30-1593-62
83-2555-875-34-71-22
-7594-684-88-386098
20-4874-73-81-2560-93
-23-89-639036301819
-21158935-60-53-8522
-70-76-37-98-73778172
and
-1413
-7896
-1795
7269
6741
8549
-6438
36-44]] | [[ 10147, -6357] + [-14710, -3435] + [ 5164, 3031] + [ -9570, 5773] + [-17790, -529] + [ 19309, -5824] + [ -2162, 2782] + [ -457, -17793]] | matrixMultiplication | +| 47 | Cube Root | cuberoot of 402 upto 2 decimal places is: | 7.38 | CubeRoot | +| 48 | Power Rule Integration | 9x^1 | (9/1)x^2 + c | powerRuleIntegration | +| 49 | Fourth Angle of Quadrilateral | Fourth angle of quadrilateral with angles 171 , 62, 4 = | 123 | fourthAngleOfQuadrilateral | +| 50 | Quadratic Equation | Zeros of the Quadratic Equation 79x^2+159x+79=0 | [-0.89, -1.12] | quadraticEquationSolve | +| 51 | HCF (Highest Common Factor) | HCF of 18 and 16 = | 2 | hcf | +| 52 | Probability of a certain sum appearing on faces of dice | If 3 dice are rolled at the same time, the probability of getting a sum of 10 = | 27/216 | diceSumProbability | +| 53 | Exponentiation | 5^9 = | 1953125 | exponentiation | +| 54 | Confidence interval For sample S | The confidence interval for sample [259, 228, 251, 245, 222, 216, 209, 288, 229, 249, 278, 226, 256, 263, 248, 211, 210, 270, 260, 269] with 99% confidence is | (257.86513442744837, 230.83486557255162) | confidenceInterval | +| 55 | Comparing surds | Fill in the blanks 70^(1/7) _ 61^(1/6) | < | surdsComparison | +| 56 | Fibonacci Series | The Fibonacci Series of the first 16 numbers is ? | [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610] | fibonacciSeries | +| 57 | Trigonometric Values | What is sin(45)? | 1/√2 | basicTrigonometry | | 58 | Sum of Angles of Polygon | Sum of angles of polygon with 3 sides = | 180 | sumOfAnglesOfPolygon | -| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[36, 13, 31, 23, 38, 34, 24, 20, 41, 14, 19, 31, 11, 49, 49] | The Mean is 28.866666666666667 , Standard Deviation is 143.5822222222222, Variance is 11.982579948501167 | dataSummary | -| 59 | Surface Area of Sphere | Surface area of Sphere with radius = 11m is | 1520.5308443374597 m^2 | surfaceAreaSphereGen | -| 60 | Volume of Sphere | Volume of sphere with radius 73 m = | 1629510.5990953872 m^3 | volumeSphere | -| 61 | nth Fibonacci number | What is the 68th Fibonacci number? | 72723460248141 | nthFibonacciNumberGen | -| 62 | Profit or Loss Percent | Profit percent when CP = 825 and SP = 972 is: | 17.81818181818182 | profitLossPercent | -| 63 | Binary to Hexidecimal | 100000 | 0x20 | binaryToHex | -| 64 | Multiplication of 2 complex numbers | (3+14j) * (-3+16j) = | (-233+6j) | complexNumMultiply | -| 65 | Geometric Progression | For the given GP [4, 16, 64, 256, 1024, 4096] ,Find the value of a,common ratio,8th term value, sum upto 7th term | The value of a is 4, common ratio is 4 , 8th term is 65536 , sum upto 7th term is 21844.0 | geometricprogression | -| 66 | Geometric Mean of N Numbers | Geometric mean of 3 numbers 81 , 35 and 99 = | (81*35*99)^(1/3) = 65.47307713912309 | geometricMean | -| 67 | Harmonic Mean of N Numbers | Harmonic mean of 2 numbers 99 and 25 = | 2/((1/99) + (1/25)) = 39.91935483870967 | harmonicMean | +| 59 | Mean,Standard Deviation,Variance | Find the mean,standard deviation and variance for the data[48, 46, 29, 28, 17, 48, 24, 23, 5, 9, 27, 33, 46, 7, 36] | The Mean is 28.4 , Standard Deviation is 201.97333333333336, Variance is 14.211732242528823 | dataSummary | +| 60 | Surface Area of Sphere | Surface area of Sphere with radius = 19m is | 4536.459791783661 m^2 | surfaceAreaSphereGen | +| 61 | Volume of Sphere | Volume of sphere with radius 63 m = | 1047394.4243362226 m^3 | volumeSphere | +| 62 | nth Fibonacci number | What is the 85th Fibonacci number? | 259695496911123328 | nthFibonacciNumberGen | +| 63 | Profit or Loss Percent | Loss percent when CP = 937 and SP = 72 is: | 92.31590181430096 | profitLossPercent | +| 64 | Binary to Hexidecimal | 1001111 | 0x4f | binaryToHex | +| 65 | Multiplication of 2 complex numbers | (-3+2j) * (-6+7j) = | (4-33j) | complexNumMultiply | +| 66 | Geometric Progression | For the given GP [6, 24, 96, 384, 1536, 6144] ,Find the value of a,common ratio,9th term value, sum upto 9th term | The value of a is 6, common ratio is 4 , 9th term is 393216 , sum upto 9th term is 524286.0 | geometricprogression | +| 67 | Geometric Mean of N Numbers | Geometric mean of 4 numbers 54 , 80 , 35 , 39 = | (54*80*35*39)^(1/4) = 49.27811645529654 | geometricMean | +| 68 | Harmonic Mean of N Numbers | Harmonic mean of 4 numbers 2 , 84 , 93 , 16 = | 4/((1/2) + (1/84) + (1/93) + (1/16)) = 6.835767022149303 | harmonicMean | +| 69 | Euclidian norm or L2 norm of a vector | Euclidian norm or L2 norm of the vector[784.3594765936149, 831.2509235672187, 16.078601582030892, 985.0579481288806, 734.7344412338676, 998.0941258783216, 354.94078353536895, 413.5643355103187, 581.4239813447576, 903.949312712381, 806.494025130463] is: | 2432.1700989717465 | eucldianNorm | +| 70 | Angle between 2 vectors | angle between the vectors [689.0197023764115, 694.8793500248185] and [927.4787145023294, 343.6872076155678] is: | NaN | angleBtwVectors | +| 71 | Absolute difference between two numbers | Absolute difference between numbers -23 and 44 = | 67 | absoluteDifference | +| 72 | Dot Product of 2 Vectors | [17, 9, 8] . [18, 9, 4] = | 419 | vectorDot | +| 73 | Binary 2's Complement | 2's complement of 101 = | 11 | binary2sComplement | +| 74 | Inverse of a Matrix | Inverse of Matrix Matrix([[13, 88, 85], [65, 37, 52], [89, 45, 2]]) is: | Matrix([[-1133/167543, 3649/335086, 1431/335086], [2249/167543, -7539/335086, 4849/335086], [-184/167543, 7247/335086, -5239/335086]]) | invertmatrix | +| 75 | Area of a Sector | Given radius, 6 and angle, 328. Find the area of the sector. | Area of sector = 103.04424 | sectorArea | +| 76 | Mean and Median | Given the series of numbers [55, 61, 83, 85, 52, 78, 30, 58, 76, 37]. find the arithmatic mean and mdian of the series | Arithmetic mean of the series is 61.5 and Arithmetic median of this series is 59.5 | meanMedian | diff --git a/makeReadme.py b/makeReadme.py index d5dadc7..7692e35 100644 --- a/makeReadme.py +++ b/makeReadme.py @@ -22,6 +22,8 @@ for item in wList: prob = prob.replace(", ", "") prob = prob.replace("]]\n", "
") prob = prob.replace("]\n", "