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

mathgenerator/funcs/__init__.py

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

mathgenerator/funcs/compoundInterestFunc.py

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

mathgenerator/mathgen.py

@@ -112,3 +112,5 @@ invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is",
 sectorArea=Generator("Area of a Sector", 75,"Area of a sector with radius, r and angle, a ","Area",sectorAreaFunc)
 meanMedian=Generator("Mean and Median", 76,"Mean and median of given set of numbers","Mean, Median",meanMedianFunc)
 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)

setup.py

@@ -10,6 +10,7 @@ setup(
     license='MIT',
     packages=find_packages(),
     install_requires=[
+        
     ],
     entry_points={
     }