From 0494269b3522cb0d8c6dffa933181f9833f93117 Mon Sep 17 00:00:00 2001 From: Steven Clontz Date: Tue, 20 Oct 2026 14:15:44 -0500 Subject: [PATCH 1/3] Fix coterminal angle calculations and formatting --- .../exercises/outcomes/TR/TR2/generator.sage | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage index 653fdf0bb..e8cf5fa69 100644 --- a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage +++ b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage @@ -3,20 +3,26 @@ class Generator(BaseGenerator): def data(self): angle1,angle2 = sample([a/b*2*pi for b in [2,3,4,5,6,8,9] for a in [1..b-1]],2) + degree_task_first = choice([True,False]) + + coterminal1 = angle1+2*pi + coterminal2 = angle1-2*pi + if degree_take_first: + angle1 = latex(angle1*360/(2*pi)) + r"\circ" + coterminal1 = latex(coterminal1*360/(2*pi)) + r"\circ" + coterminal2 = latex(coterminal2*360/(2*pi)) + r"\circ" + else: + angle1 = TBIL.typeset_angle(angle1) + coterminal1 = TBIL.typeset_angle(coterminal1) + coterminal2 = TBIL.typeset_angle(coterminal2) + radius = choice([2..14]) arclength= radius*angle2 - degree_task_first = choice([True,False]) if degree_task_first: - coterminal1=str((angle1+2*pi)*360/(2*pi))+r"^\circ" - coterminal2=str((angle2-2*pi)*360/(2*pi))+r"^\circ" - angle1=latex(angle1*360/(2*pi))+r"^\circ" angle2=TBIL.typeset_angle(angle2) else: - coterminal1 = TBIL.typeset_angle(angle1+2*pi) - coterminal2 = TBIL.typeset_angle(angle1-2*pi) - angle1 = TBIL.typeset_angle(angle1) angle2=latex(angle2*360/(2*pi))+r"^\circ" @@ -27,4 +33,4 @@ class Generator(BaseGenerator): "angle2": angle2, "radius": radius, "arclength": arclength, - } \ No newline at end of file + } From dd7a989ae1e5da86847f54ea2bbe7d9e096d8c13 Mon Sep 17 00:00:00 2001 From: Steven Clontz Date: Tue, 20 Oct 2026 14:18:55 -0500 Subject: [PATCH 2/3] Fix variable name for degree task condition --- source/precalculus/exercises/outcomes/TR/TR2/generator.sage | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage index e8cf5fa69..d9d9de5cc 100644 --- a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage +++ b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage @@ -7,7 +7,7 @@ class Generator(BaseGenerator): coterminal1 = angle1+2*pi coterminal2 = angle1-2*pi - if degree_take_first: + if degree_task_first: angle1 = latex(angle1*360/(2*pi)) + r"\circ" coterminal1 = latex(coterminal1*360/(2*pi)) + r"\circ" coterminal2 = latex(coterminal2*360/(2*pi)) + r"\circ" @@ -19,7 +19,6 @@ class Generator(BaseGenerator): radius = choice([2..14]) arclength= radius*angle2 - if degree_task_first: angle2=TBIL.typeset_angle(angle2) else: From cb9cfe52e16020480b58f7bee70b63b26d47c0a3 Mon Sep 17 00:00:00 2001 From: Steven Clontz Date: Tue, 20 Oct 2026 14:25:41 -0500 Subject: [PATCH 3/3] add missing carets --- source/precalculus/exercises/outcomes/TR/TR2/generator.sage | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage index d9d9de5cc..7fe8fae9b 100644 --- a/source/precalculus/exercises/outcomes/TR/TR2/generator.sage +++ b/source/precalculus/exercises/outcomes/TR/TR2/generator.sage @@ -8,9 +8,9 @@ class Generator(BaseGenerator): coterminal1 = angle1+2*pi coterminal2 = angle1-2*pi if degree_task_first: - angle1 = latex(angle1*360/(2*pi)) + r"\circ" - coterminal1 = latex(coterminal1*360/(2*pi)) + r"\circ" - coterminal2 = latex(coterminal2*360/(2*pi)) + r"\circ" + angle1 = latex(angle1*360/(2*pi)) + r"^\circ" + coterminal1 = latex(coterminal1*360/(2*pi)) + r"^\circ" + coterminal2 = latex(coterminal2*360/(2*pi)) + r"^\circ" else: angle1 = TBIL.typeset_angle(angle1) coterminal1 = TBIL.typeset_angle(coterminal1)