mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 06:25:23 +01:00
Added Set operatiosn fucntion, corrected compound interest
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from .__init__ import *
|
||||
|
||||
def compoundInterestFunc(maxPrinciple = 10000, maxRate = 10, maxTime = 10, maxPeriod = ):
|
||||
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)
|
||||
|
||||
18
mathgenerator/funcs/set_operation.py
Normal file
18
mathgenerator/funcs/set_operation.py
Normal file
@@ -0,0 +1,18 @@
|
||||
from .__init__ import *
|
||||
|
||||
|
||||
def set_operation(minval=3,maxval=7,n_a=4,n_b=5):
|
||||
number_variables_a=random.randint(minval,maxval)
|
||||
number_variables_b=random.randint(minval,maxval)
|
||||
a=[]
|
||||
b=[]
|
||||
for i in range(number_variables_a):
|
||||
a.append(random.randint(1,10))
|
||||
for i in range(number_variables_b):
|
||||
b.append(random.randint(1,10))
|
||||
|
||||
a=set(a)
|
||||
b=set(b)
|
||||
problem= "Given the two sets a=" + str(a) + " ,b=" + str(b) + ".Find the Union,intersection,a-b,b-a and symmetric difference"
|
||||
solution="Union is " + str(a.union(b)) + ",Intersection is " + str(a.intersection(b)) + ", a-b is "+str(a.difference(b)) + ",b-a is " + str(b.difference(a))+ ", Symmetric difference is "+ str(a.symmetric_difference(b))
|
||||
return problem,solution
|
||||
@@ -114,3 +114,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)
|
||||
setoperations = Generator("Union,Intersection,Difference of Two Sets", 80, "Union,intersection,difference", "aUb,a^b,a-b,b-a,", set_operation)
|
||||
Reference in New Issue
Block a user