Merge branch 'master' of https://github.com/Todarith/mathgenerator

mathgenerator/funcs/__init__.py

@@ -80,3 +80,5 @@ from .matrixInversion import *
 from .sectorAreaFunc import*
 from .meanMedianFunc import*
 from .determinantToMatrix22 import *
+from .compoundInterestFunc import *
+from .deciToHexaFunc import *

mathgenerator/funcs/compoundInterestFunc.py

@@ -0,0 +1,11 @@
+from .__init__ import *
+
+def compoundInterestFunc(maxPrinciple = 10000, maxRate = 10, maxTime = 10, maxPeriod = 10):
+    p = random.randint(100, 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)
+    return problem, solution

mathgenerator/funcs/deciToHexaFunc.py

@@ -0,0 +1,10 @@
+from .__init__ import *
+
+
+def deciToHexaFunc(max_dec=1000):
+    a = random.randint(0, max_dec)
+    b = hex(a)
+    problem = "Binary of " + str(a) + "="
+    solution = str(b) 
+
+    return problem, solution