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 #361 from jsun1590/main

Browse Source 
Fixed area of triangle function
This commit is contained in:
Luke Weiler
2021-10-09 13:38:04 -04:00
committed by GitHub
parent 904ef2b032 49d83c966d
commit ebec41c26f
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 *
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)
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
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':
problem = "Area of triangle with side lengths: " + \
str(a) + " " + str(b) + " " + str(c) + " = "
solution = str(area)
solution = str(round(area, 2))
return problem, solution
elif format == 'latex':
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,
["maxA=20", "maxB=20", "maxC=20"])
["maxA=20", "maxB=20"])