mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 06:25:23 +01:00
made c dependent on a and b
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:
@@ -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"])
|
||||
|
||||
Reference in New Issue
Block a user