deadvey/mathgenerator
1
0
Fork 0
mirror of https://github.com/DeaDvey/mathgenerator.git synced 2025-11-28 06:25:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #178 from Swayam221/swayam2

Browse Source 
Added geometricMeanFunc and updated README.md
This commit is contained in:
Luke Weiler
2020-10-18 23:14:14 -04:00
committed by GitHub
parent 22b0aaa337 fedd2ce4dc
commit d593718c08
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mathgenerator/mathgen.py
View File

@@ -948,8 +948,8 @@ def volumeSphereFunc(maxRadius = 100):
problem=f"Volume of sphere with radius {r} m = "
ans=(4*math.pi/3)*r*r*r
solution = f"{ans} m^3"
return problem,solution
return problem,solution
def volumeSphereFunc(maxRadius=100):
r = random.randint(1, maxRadius)
@@ -1008,6 +1008,32 @@ def GeomProgrFunc(number_values=6, min_value=2, max_value=12, n_term=7, sum_term
solution="The value of a is {}, common ratio is {} , {}th term is {} , sum upto {}th term is {}".format(a,r,n_term,value_nth_term,sum_term,sum_till_nth_term)
return problem,solution
def geometricMeanFunc(maxValue=100, maxNum=4):
a=random.randint(1,maxValue)
b=random.randint(1,maxValue)
c=random.randint(1,maxValue)
d=random.randint(1,maxValue)
num=random.randint(2,4)
if num==2:
product=a*b
elif num==3:
product=a*b*c
elif num==4:
product=a*b*c*d
ans=product**(1/num)
if num==2:
problem=f"Geometric mean of {num} numbers {a} and {b} = "
solution = f"({a}*{b})^(1/{num}) = {ans}"
elif num==3:
problem=f"Geometric mean of {num} numbers {a} , {b} and {c} = "
solution = f"({a}*{b}*{c})^(1/{num}) = {ans}"
elif num==4:
problem=f"Geometric mean of {num} numbers {a} , {b} , {c} , {d} = "
solution = f"({a}*{b}*{c}*{d})^(1/{num}) = {ans}"
return problem,solution
# || Class Instances
@@ -1134,4 +1160,5 @@ nthFibonacciNumberGen = Generator("nth Fibonacci number", 61, "What is the nth F
profitLossPercent = Generator("Profit or Loss Percent", 62, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)
binaryToHex = Generator("Binary to Hexidecimal", 63, "Hexidecimal of a=", "b", BinaryToHexFunc)
ComplexNumMultiply = Generator("Multiplication of 2 complex numbers", 64, "(x + j) (y + j) = ", "xy + xj + yj -1", multiplyComplexNumbersFunc)
geometricprogression=Generator("Geometric Progression", 65, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", GeomProgrFunc)
geometricprogression=Generator("Geometric Progression", 65, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", GeomProgrFunc)
geometricMean=Generator("Geometric Mean of N Numbers",61,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)