From c55fb9c0818438f406eb7285daeb97b3df6a0946 Mon Sep 17 00:00:00 2001 From: Riei-Joaquim <39650571+Riei-Joaquim@users.noreply.github.com> Date: Mon, 19 Oct 2020 01:01:14 -0300 Subject: [PATCH 01/12] Update mathgen.py --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 0e813a6..ea044d5 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -156,3 +156,4 @@ complexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + geometricprogression=Generator("Geometric Progression", 65, "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",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc) harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc) +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 20, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) From fab946e09cb153c2631098f44de2f4139f8b3980 Mon Sep 17 00:00:00 2001 From: Riei-Joaquim <39650571+Riei-Joaquim@users.noreply.github.com> Date: Mon, 19 Oct 2020 01:07:54 -0300 Subject: [PATCH 02/12] Create determinantToMatrix22.cpp --- mathgenerator/funcs/determinantToMatrix22.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mathgenerator/funcs/determinantToMatrix22.cpp diff --git a/mathgenerator/funcs/determinantToMatrix22.cpp b/mathgenerator/funcs/determinantToMatrix22.cpp new file mode 100644 index 0000000..a92ac76 --- /dev/null +++ b/mathgenerator/funcs/determinantToMatrix22.cpp @@ -0,0 +1,12 @@ +from .__init__ import * + +def determinantToMatrix22(maxMatrixVal = 100): + a = random.randint(0, maxMatrixVal) + b = random.randint(0, maxMatrixVal) + c = random.randint(0, maxMatrixVal) + d = random.randint(0, maxMatrixVal) + + determinant = a*d - b*c + problem = f"Det([[{a}, {b}], [{c}, {d}]]) = " + solution = f" {determinant}" + return problem, solution From 2bb6fe90167fa1684fff5a49c38a0e5a2b26d708 Mon Sep 17 00:00:00 2001 From: Riei-Joaquim <39650571+Riei-Joaquim@users.noreply.github.com> Date: Mon, 19 Oct 2020 01:15:47 -0300 Subject: [PATCH 03/12] 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..cd6cc90 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 .determinantToMatrix22 import * From bd6bea9aa93e2b3603df5b47cfb9ca881571e071 Mon Sep 17 00:00:00 2001 From: Riei-Joaquim <39650571+Riei-Joaquim@users.noreply.github.com> Date: Mon, 19 Oct 2020 01:21:09 -0300 Subject: [PATCH 04/12] Update mathgen.py --- mathgenerator/mathgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index ea044d5..e45a24a 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -156,4 +156,4 @@ complexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + geometricprogression=Generator("Geometric Progression", 65, "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",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc) harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc) -intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 20, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) +intMatrix22determinant = Generator("Determinant to 2x2 Matrix", 68, "Det([[a,b],[c,d]]) =", " a * d - b * c", determinantToMatrix22) From 1e252fec0fe3f98ef77ac0968009a2a4692d696e Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:03:54 +0530 Subject: [PATCH 05/12] Added function for area of Sector --- mathgenerator/funcs/sectorAreaFunc.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mathgenerator/funcs/sectorAreaFunc.py diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py new file mode 100644 index 0000000..a4337b4 --- /dev/null +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -0,0 +1,12 @@ +.__init__ import * + +import random +import math +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}" + return problem, solution From 587f786d3e7ebe8a984b3813569b6f85f7e0c300 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:06:04 +0530 Subject: [PATCH 06/12] 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..aab32a8 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 .sectorAreaFunc import* From 20b93b90ff52c4feceb1351e5e8695c0304b08a0 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:09:28 +0530 Subject: [PATCH 07/12] Update mathgen.py --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 0e813a6..96b8ecb 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -156,3 +156,4 @@ complexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + geometricprogression=Generator("Geometric Progression", 65, "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",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc) harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc) +sectorArea=Generator("Area of a Sector",68,"Area of a sector with radius, r and angle, a ","Area",sectorAreaFunc) From 94e35c24e6c392d4e5e4318bd4c1fb843686a369 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:44:34 +0530 Subject: [PATCH 08/12] Update sectorAreaFunc.py --- mathgenerator/funcs/sectorAreaFunc.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/mathgenerator/funcs/sectorAreaFunc.py b/mathgenerator/funcs/sectorAreaFunc.py index a4337b4..aaf4573 100644 --- a/mathgenerator/funcs/sectorAreaFunc.py +++ b/mathgenerator/funcs/sectorAreaFunc.py @@ -1,7 +1,5 @@ .__init__ import * -import random -import math def sectorAreaFunc(maxRadius = 49,maxAngle = 359): Radius = random.randint(1, maxRadius) Angle = random.randint(1, maxAngle) From d33de18627aa6db74a4ba8ff5d0644e9a07f58f1 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:45:49 +0530 Subject: [PATCH 09/12] Created mean and median functions --- mathgenerator/funcs/meanMedianFunc.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 mathgenerator/funcs/meanMedianFunc.py diff --git a/mathgenerator/funcs/meanMedianFunc.py b/mathgenerator/funcs/meanMedianFunc.py new file mode 100644 index 0000000..5f06a1c --- /dev/null +++ b/mathgenerator/funcs/meanMedianFunc.py @@ -0,0 +1,13 @@ +.__init__ import * + +def meanMedianFunc(maxlen = 10): + randomlist = random.sample(range(1, 99), maxlen) + total = 0 + for n in randomlist: + total = total + n + 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 + solution = f"Arithmetic mean of the series is {mean} and Arithmetic median of this series is {median}" + return problem, solution From 5e18c82b7be446e30a095a869ece911d0f7787c6 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:46:30 +0530 Subject: [PATCH 10/12] 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 aab32a8..576abee 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -72,3 +72,4 @@ from .geomProgrFunc import * from .geometricMeanFunc import * from .harmonicMeanFunc import * from .sectorAreaFunc import* +from .meanMedianFunc import* From f8cc8b3976f2fa0caf9ca25b5ad2cd260d9bd6b2 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:48:35 +0530 Subject: [PATCH 11/12] Update mathgen.py --- mathgenerator/mathgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 96b8ecb..98a605b 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -157,3 +157,4 @@ geometricprogression=Generator("Geometric Progression", 65, "Initial value,Commo geometricMean=Generator("Geometric Mean of N Numbers",66,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc) harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc) sectorArea=Generator("Area of a Sector",68,"Area of a sector with radius, r and angle, a ","Area",sectorAreaFunc) +meanMedian=Generator("Mean and Median",69,"Mean and median of given set of numbers","Mean, Median",meanMedianFunc) From f723fb18818277415d6781fd98627f137d8a6d3b Mon Sep 17 00:00:00 2001 From: lukew3 Date: Mon, 19 Oct 2020 10:46:32 -0400 Subject: [PATCH 12/12] Fix build issues --- .../{determinantToMatrix22.cpp => determinantToMatrix22.py} | 0 mathgenerator/funcs/meanMedianFunc.py | 2 +- mathgenerator/funcs/sectorAreaFunc.py | 2 +- setup.py | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename mathgenerator/funcs/{determinantToMatrix22.cpp => determinantToMatrix22.py} (100%) diff --git a/mathgenerator/funcs/determinantToMatrix22.cpp b/mathgenerator/funcs/determinantToMatrix22.py similarity index 100% rename from mathgenerator/funcs/determinantToMatrix22.cpp rename to mathgenerator/funcs/determinantToMatrix22.py 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) diff --git a/setup.py b/setup.py index 0b546c2..8a88d21 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ setup( license='MIT', packages=find_packages(), install_requires=[ + ], entry_points={ }