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

made c dependent on a and b

Browse Source 
Removed maxC as we had to make c dependent on a and b. Also wrapped a round function around the solution to 2 decimal places.
This commit is contained in:
jsun1590
2021-10-09 20:14:12 +08:00
parent 576be175a9
commit 49d83c966d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mathgenerator/funcs/geometry/area_of_triangle.py
View File

@@ -1,10 +1,10 @@
from .__init__ import * from .__init__ import *
def gen_func(maxA=20, maxB=20, maxC=20, format='string'): def gen_func(maxA=20, maxB=20, format='string'):
a = random.randint(1, maxA) a = random.randint(1, maxA)
b = random.randint(1, maxB) b = random.randint(1, maxB)
c = random.randint(1, maxC) c = random.randint(abs(b-a)+1, abs(a+b)-1)
s = (a + b + c) / 2 s = (a + b + c) / 2
area = (s * (s - a) * (s - b) * (s - c))**0.5 area = (s * (s - a) * (s - b) * (s - c))**0.5
@@ -12,7 +12,7 @@ def gen_func(maxA=20, maxB=20, maxC=20, format='string'):
if format == 'string': if format == 'string':
problem = "Area of triangle with side lengths: " + \ problem = "Area of triangle with side lengths: " + \
str(a) + " " + str(b) + " " + str(c) + " = " str(a) + " " + str(b) + " " + str(c) + " = "
solution = str(area) solution = str(round(area, 2))
return problem, solution return problem, solution
elif format == 'latex': elif format == 'latex':
return "Latex unavailable" return "Latex unavailable"
@@ -21,4 +21,4 @@ def gen_func(maxA=20, maxB=20, maxC=20, format='string'):
area_of_triangle = Generator("Area of Triangle", 18, gen_func, area_of_triangle = Generator("Area of Triangle", 18, gen_func,
["maxA=20", "maxB=20", "maxC=20"]) ["maxA=20", "maxB=20"])