From 6ccb1a9bc7fa3bad872947be65f853136ba84928 Mon Sep 17 00:00:00 2001 From: Aditya Mahimkar Date: Fri, 16 Oct 2020 11:11:42 +0530 Subject: [PATCH 1/3] Update mathgen.py --- mathgenerator/mathgen.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 9918cd0..7a7205e 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -276,6 +276,13 @@ def factoringFunc(range_x1 = 10, range_x2 = 10): solution = f"(x{x1})(x{x2})" return problem, solution +def thirdAngleOfTriangle(maxAngle=180): + angle1 = random.randint(1, maxAngle) + x1 = random.randint(1, maxAngle) + angle3 = 180 - (angle1 + angle2) + problem = "Third angle = " + + # || Class Instances #Format is: @@ -301,4 +308,4 @@ intMatrix22Multiplication = Generator("Integer Multiplication with 2x2 Matrix", areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side lengths a, b, c = ", "area", areaOfTriangleFunc) doesTriangleExist = Generator("Triangle exists check", 19, "Does triangle with sides a, b and c exist?","Yes/No", isTriangleValidFunc) midPointOfTwoPoint=Generator("Midpoint of the two point", 20,"((X1,Y1),(X2,Y2))=","((X1+X2)/2,(Y1+Y2)/2)",MidPointOfTwoPointFunc) -factoring = Generator("Subtraction", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc) \ No newline at end of file +factoring = Generator("Subtraction", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc) From f73df71c23adc3de39674b04b79e614dad42bde1 Mon Sep 17 00:00:00 2001 From: Aditya Mahimkar Date: Fri, 16 Oct 2020 11:56:03 +0530 Subject: [PATCH 2/3] Update mathgen.py --- mathgenerator/mathgen.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 7a7205e..e74000a 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -276,12 +276,13 @@ def factoringFunc(range_x1 = 10, range_x2 = 10): solution = f"(x{x1})(x{x2})" return problem, solution -def thirdAngleOfTriangle(maxAngle=180): +def thirdAngleOfTriangleFunc(maxAngle=180): angle1 = random.randint(1, maxAngle) x1 = random.randint(1, maxAngle) angle3 = 180 - (angle1 + angle2) problem = "Third angle = " - + solution = angle3 + return problem, solution # || Class Instances @@ -309,3 +310,4 @@ areaOfTriangle = Generator("Area of Triangle", 18, "Area of Triangle with side l doesTriangleExist = Generator("Triangle exists check", 19, "Does triangle with sides a, b and c exist?","Yes/No", isTriangleValidFunc) midPointOfTwoPoint=Generator("Midpoint of the two point", 20,"((X1,Y1),(X2,Y2))=","((X1+X2)/2,(Y1+Y2)/2)",MidPointOfTwoPointFunc) factoring = Generator("Subtraction", 21, "x^2+(x1+x2)+x1*x2", "(x-x1)(x-x2)", factoringFunc) +thirdAngleOfTriangle = Generator("Third Angle of Triangle", 22, "Third Angle of the triangle = ", "angle3", thirdAngleOfTriangleFunc) From 6248336226d4297aa68452a3f154d3ff958c39f5 Mon Sep 17 00:00:00 2001 From: Aditya Mahimkar Date: Fri, 16 Oct 2020 12:06:50 +0530 Subject: [PATCH 3/3] Update mathgen.py --- mathgenerator/mathgen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index e74000a..226d8a9 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -276,11 +276,11 @@ def factoringFunc(range_x1 = 10, range_x2 = 10): solution = f"(x{x1})(x{x2})" return problem, solution -def thirdAngleOfTriangleFunc(maxAngle=180): +def thirdAngleOfTriangleFunc(maxAngle=89): angle1 = random.randint(1, maxAngle) - x1 = random.randint(1, maxAngle) + angle2 = random.randint(1, maxAngle) angle3 = 180 - (angle1 + angle2) - problem = "Third angle = " + problem = "Third angle of triangle = " solution = angle3 return problem, solution