From ca8bafabada286696ba27721779f8552e443af9a Mon Sep 17 00:00:00 2001 From: lukew3 Date: Wed, 21 Oct 2020 13:59:13 -0400 Subject: [PATCH] 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)