From 7155b3ea45690baaa6e721390b1581be37a5bf5d Mon Sep 17 00:00:00 2001 From: parthb83 Date: Sat, 23 Oct 2021 00:15:33 +0530 Subject: [PATCH] Fixed the coefficient of x issue --- .../algebra/intersection_of_two_lines.py | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/mathgenerator/funcs/algebra/intersection_of_two_lines.py b/mathgenerator/funcs/algebra/intersection_of_two_lines.py index 34fa289..a9a4c5d 100644 --- a/mathgenerator/funcs/algebra/intersection_of_two_lines.py +++ b/mathgenerator/funcs/algebra/intersection_of_two_lines.py @@ -16,17 +16,37 @@ def gen_func(minM=-10, It handles cases where m is fractional. It also ensures that we don't have weird signs such as y = mx + -b. """ - if m[1] == 1: + if m[0] == 0: + m = 0 + elif abs(m[0]) == abs(m[1]): + m = m[0] // m[1] + elif m[1] == 1: m = m[0] else: m = f"{m[0]}/{m[1]}" - base = f"y = {m}x" + base = f"y =" + if m != 0: + if m == 1: + base = f"{base} x" + elif m == -1: + base = f"{base} -x" + else: + base = f"{base} {m}x" if b > 0: - return f"{base} + {b}" + if m == 0: + return f"{base} {b}" + else: + return f"{base} + {b}" elif b < 0: - return f"{base} - {b * -1}" + if m == 0: + return f"{base} -{b * -1}" + else: + return f"{base} - {b * -1}" else: - return base + if m == 0: + return f"{base} 0" + else: + return base def fractionToString(x): """