From 38b0e428ab62994bc76ddaa6c4cf3456f048d82f Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:21:16 -0400 Subject: [PATCH 1/6] updated repo --- mathgenerator/funcs/perimeter_of_polygons.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 mathgenerator/funcs/perimeter_of_polygons.py diff --git a/mathgenerator/funcs/perimeter_of_polygons.py b/mathgenerator/funcs/perimeter_of_polygons.py new file mode 100644 index 0000000..f401491 --- /dev/null +++ b/mathgenerator/funcs/perimeter_of_polygons.py @@ -0,0 +1,14 @@ +from .__init__ import * +from ..__init__ import Generator + + +def perimeterOfPolygonFunc(maxSides=12, maxLength=120)->"cm": + size_of_sides = random.randint(3,maxSides) + sides = [] + for x in range(size_of_sides): + sides.append(random.randint(1,maxLength)) + problem = "The perimeter of a " + str(size_of_sides) + " sided polygon with lengths of " + str(sides) + "cm is: " + solution = 0 + for y in range(len(sides)): + solution += sides[y] + return problem, solution From ff36197bbbd994ab1550ccfe221ca0d607dcfb59 Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:28:18 -0400 Subject: [PATCH 2/6] Fixed init.py --- mathgenerator/funcs/perimeter_of_polygons.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/perimeter_of_polygons.py b/mathgenerator/funcs/perimeter_of_polygons.py index f401491..443dd0c 100644 --- a/mathgenerator/funcs/perimeter_of_polygons.py +++ b/mathgenerator/funcs/perimeter_of_polygons.py @@ -2,7 +2,7 @@ from .__init__ import * from ..__init__ import Generator -def perimeterOfPolygonFunc(maxSides=12, maxLength=120)->"cm": +def perimeter_of_polygons(maxSides=12, maxLength=120)->"cm": size_of_sides = random.randint(3,maxSides) sides = [] for x in range(size_of_sides): From 47abb3926128d5e110e62ba7f54b55bcf3df03ab Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:30:37 -0400 Subject: [PATCH 3/6] Fixed init.py, again --- 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 bf59c56..bbe9a87 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -94,4 +94,5 @@ 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 .isprime import * +from .perimeter_of_polygons import * From fda8aa5969e0ebb3fd88f94abb23e24fe234a208 Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:31:46 -0400 Subject: [PATCH 4/6] Fixed conflicts --- mathgenerator/funcs/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bbe9a87..4ab8ace 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -94,5 +94,5 @@ from .degree_to_rad import * from .radian_to_deg import * from .differentiation import * from .definite_integral import * -from .isprime import * +from .is_prime import * from .perimeter_of_polygons import * From 5c5caf3c872294414733d0501acd8f5b668efd60 Mon Sep 17 00:00:00 2001 From: Metropass Date: Tue, 20 Oct 2020 13:38:39 -0400 Subject: [PATCH 5/6] Fixed Lint --- mathgenerator/funcs/perimeter_of_polygons.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mathgenerator/funcs/perimeter_of_polygons.py b/mathgenerator/funcs/perimeter_of_polygons.py index 443dd0c..e74dcf4 100644 --- a/mathgenerator/funcs/perimeter_of_polygons.py +++ b/mathgenerator/funcs/perimeter_of_polygons.py @@ -3,10 +3,10 @@ from ..__init__ import Generator def perimeter_of_polygons(maxSides=12, maxLength=120)->"cm": - size_of_sides = random.randint(3,maxSides) + size_of_sides = random.randint(3, maxSides) sides = [] for x in range(size_of_sides): - sides.append(random.randint(1,maxLength)) + sides.append(random.randint(1, maxLength)) problem = "The perimeter of a " + str(size_of_sides) + " sided polygon with lengths of " + str(sides) + "cm is: " solution = 0 for y in range(len(sides)): From 0c17fc74b03e43ba8959ed12765f4f7ebc9e8906 Mon Sep 17 00:00:00 2001 From: Mo <58116522+Metropass@users.noreply.github.com> Date: Tue, 20 Oct 2020 14:01:29 -0400 Subject: [PATCH 6/6] Fixed Linter for the Function Definition --- mathgenerator/funcs/perimeter_of_polygons.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/perimeter_of_polygons.py b/mathgenerator/funcs/perimeter_of_polygons.py index e74dcf4..7aa9458 100644 --- a/mathgenerator/funcs/perimeter_of_polygons.py +++ b/mathgenerator/funcs/perimeter_of_polygons.py @@ -2,7 +2,7 @@ from .__init__ import * from ..__init__ import Generator -def perimeter_of_polygons(maxSides=12, maxLength=120)->"cm": +def perimeterOfPolygons(maxSides=12, maxLength=120): size_of_sides = random.randint(3, maxSides) sides = [] for x in range(size_of_sides):