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 1/3] 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 2/3] 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 3/3] 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)