From 24231cac4ee7e862548664e9f3d963647f4dfb70 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Tue, 20 Oct 2020 22:46:13 +0530 Subject: [PATCH 1/4] Create curvedSurfaceAreaCylinderFunc.py --- mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py diff --git a/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py new file mode 100644 index 0000000..38b3be4 --- /dev/null +++ b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py @@ -0,0 +1,10 @@ +from .__init__ import * + +def curvedSurfaceAreaCylinderFunc(maxRadius = 49, maxHeight=99): + r = random.randint(1, maxRadius) + h = random.randint(1, maxHeight) + problem = f"What is Curved surface area of a cylinder of radius, {r} and height, {h}?" + csa = float(2*math.pi*r*h) + formatted_float = "{:.5f}".format(csa) + solution = f"CSA of cylinder = {formatted_float}%" + return problem, solution From 70a470366ea170507ea9b5dac540a739a411507a Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Tue, 20 Oct 2020 22:46:40 +0530 Subject: [PATCH 2/4] 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 2d0910f..b76db90 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -94,3 +94,4 @@ from .degree_to_rad import * from .radian_to_deg import * from .differentiation import * from .definite_integral import * +from .curvedSurfaceAreaCylinderFunc import * From 4c50ad0270a68d6bea6f66b3551dbb9d2df4c4c4 Mon Sep 17 00:00:00 2001 From: Souvikdeb2612 <62352386+Souvikdeb2612@users.noreply.github.com> Date: Tue, 20 Oct 2020 22:56:50 +0530 Subject: [PATCH 3/4] Update curvedSurfaceAreaCylinderFunc.py --- mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py index 38b3be4..313692c 100644 --- a/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py +++ b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py @@ -8,3 +8,6 @@ def curvedSurfaceAreaCylinderFunc(maxRadius = 49, maxHeight=99): formatted_float = "{:.5f}".format(csa) solution = f"CSA of cylinder = {formatted_float}%" return problem, solution + + +curvedSurfaceAreaCylinder = Generator("Curved surface area of a cylinder",91,"What is CSA of a cylinder of radius, r and height, h?","csa of cylinder",curvedSurfaceAreaCylinderFunc) From 80933c86d885b9083788cf0556cc745904493205 Mon Sep 17 00:00:00 2001 From: Luke Weiler Date: Wed, 21 Oct 2020 14:27:18 -0400 Subject: [PATCH 4/4] Update curvedSurfaceAreaCylinderFunc.py --- mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py index 313692c..15a254f 100644 --- a/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py +++ b/mathgenerator/funcs/curvedSurfaceAreaCylinderFunc.py @@ -10,4 +10,4 @@ def curvedSurfaceAreaCylinderFunc(maxRadius = 49, maxHeight=99): return problem, solution -curvedSurfaceAreaCylinder = Generator("Curved surface area of a cylinder",91,"What is CSA of a cylinder of radius, r and height, h?","csa of cylinder",curvedSurfaceAreaCylinderFunc) +curvedSurfaceAreaCylinder = Generator("Curved surface area of a cylinder", 95,"What is CSA of a cylinder of radius, r and height, h?","csa of cylinder",curvedSurfaceAreaCylinderFunc)