Merge branch 'master' into helplessThor-deci-hex

mathgenerator/funcs/__init__.py

@@ -77,4 +77,7 @@ from .absoluteDifferenceFunc import *
 from .vectorDotFunc import *
 from .binary2sComplement import *
 from .matrixInversion import *
+from .sectorAreaFunc import*
+from .meanMedianFunc import*
+from .determinantToMatrix22 import *
 from .deciToHexaFunc import *

mathgenerator/funcs/determinantToMatrix22.py

@@ -0,0 +1,12 @@
+from .__init__ import *  
+
+def determinantToMatrix22(maxMatrixVal = 100):
+    a = random.randint(0, maxMatrixVal)
+    b = random.randint(0, maxMatrixVal)
+    c = random.randint(0, maxMatrixVal)
+    d = random.randint(0, maxMatrixVal)
+
+    determinant = a*d - b*c
+    problem = f"Det([[{a}, {b}], [{c}, {d}]]) = "
+    solution = f" {determinant}"
+    return problem, solution

mathgenerator/funcs/meanMedianFunc.py

@@ -0,0 +1,13 @@
+from .__init__ import *
+
+def meanMedianFunc(maxlen = 10):
+    randomlist = random.sample(range(1, 99), maxlen)
+    total = 0
+    for n in randomlist:
+        total = total + n
+    mean = total/10
+    problem = f"Given the series of numbers {randomlist}. find the arithmatic mean and mdian of the series"
+    randomlist.sort()
+    median = (randomlist[4]+randomlist[5])/2
+    solution = f"Arithmetic mean of the series is {mean} and Arithmetic median of this series is {median}"
+    return problem, solution

mathgenerator/funcs/sectorAreaFunc.py

@@ -0,0 +1,10 @@
+from .__init__ import *
+
+def sectorAreaFunc(maxRadius = 49,maxAngle = 359):
+    Radius = random.randint(1, maxRadius)
+    Angle = random.randint(1, maxAngle)
+    problem = f"Given radius, {Radius} and angle, {Angle}. Find the area of the sector."
+    secArea = float((Angle / 360) * math.pi*Radius*Radius)
+    formatted_float = "{:.5f}".format(secArea)
+    solution =  f"Area of sector = {formatted_float}"
+    return problem, solution

mathgenerator/mathgen.py

@@ -109,4 +109,8 @@ absoluteDifference=Generator("Absolute difference between two numbers", 71, "Abs
 vectorDot = Generator("Dot Product of 2 Vectors", 72, "a . b = ", "c", vectorDotFunc)
 binary2sComplement = Generator("Binary 2's Complement", 73, "2's complement of 11010110 =", "101010", binary2sComplementFunc)
 invertmatrix = Generator("Inverse of a Matrix", 74, "Inverse of a matrix A is", "A^(-1)", matrixInversion)
-decimalToHexadeci = Generator("Decimal to Hexadecimal", 78,"Binary of a=", "b", deciToHexaFunc)
+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)