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

Merge pull request #206 from sakshi-kst/master

Browse Source 
Profit/ Loss Percentage calculator function added
This commit is contained in:
Luke Weiler
2020-10-18 22:46:48 -04:00
committed by GitHub
parent fa4d9665c5 4654ea3e6b
commit f8c63cbd92
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mathgenerator/mathgen.py
View File

@@ -946,6 +946,12 @@ def surfaceAreaSphere(maxSide=20, unit='m'):
solution = f"{ans} {unit}^2" solution = f"{ans} {unit}^2"
return problem, solution return problem, solution
def volumeSphereFunc(maxRadius = 100):
r=random.randint(1,maxRadius)
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
def volumeSphereFunc(maxRadius=100): def volumeSphereFunc(maxRadius=100):
r = random.randint(1, maxRadius) r = random.randint(1, maxRadius)
@@ -962,6 +968,18 @@ def nthFibonacciNumber(maxN = 100):
solution = f"{ans}" solution = f"{ans}"
return problem, solution return problem, solution
def profitLossPercentFunc(maxCP = 1000, maxSP = 1000):
cP = random.randint(1, maxCP)
sP = random.randint(1, maxSP)
diff = abs(sP-cP)
if (sP-cP >= 0):
profitOrLoss = "Profit"
else:
profitOrLoss = "Loss"
percent = diff/cP * 100
problem = f"{profitOrLoss} percent when CP = {cP} and SP = {sP} is: "
solution = percent
# || Class Instances # || Class Instances
@@ -1084,3 +1102,5 @@ surfaceAreaSphereGen = Generator(
volumeSphere = Generator("Volume of Sphere", 60, volumeSphere = Generator("Volume of Sphere", 60,
"Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc) "Volume of sphere with radius r m = ", "(4*pi/3)*r*r*r", volumeSphereFunc)
nthFibonacciNumberGen = Generator("nth Fibonacci number", 61, "What is the nth Fibonacci number", "Fn", nthFibonacciNumber) nthFibonacciNumberGen = Generator("nth Fibonacci number", 61, "What is the nth Fibonacci number", "Fn", nthFibonacciNumber)
profitLossPercent = Generator("Profit or Loss Percent", 61, "Profit/ Loss percent when CP = cp and SP = sp is: ", "percent", profitLossPercentFunc)