From 8c7a553dd124f88e393e024c5674dccebc6a59fb Mon Sep 17 00:00:00 2001
From: Brittni Lorton <brittni.lorton@ccd.edu>
Date: Wed, 17 Aug 2022 09:14:02 -0600
Subject: [PATCH] clean up

---
 ...CCCS_Openstax_Calc1_C1-2016-002_3_6_224.pg | 35 ++++++-------------
 ..._Openstax_Calc1_C1-2016-002_4_7_332_334.pg | 20 ++++++-----
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/Contrib/CCCS/CalculusOne/03.6/CCD_CCCS_Openstax_Calc1_C1-2016-002_3_6_224.pg b/Contrib/CCCS/CalculusOne/03.6/CCD_CCCS_Openstax_Calc1_C1-2016-002_3_6_224.pg
index 39562323f3..e58d3ea29e 100644
--- a/Contrib/CCCS/CalculusOne/03.6/CCD_CCCS_Openstax_Calc1_C1-2016-002_3_6_224.pg
+++ b/Contrib/CCCS/CalculusOne/03.6/CCD_CCCS_Openstax_Calc1_C1-2016-002_3_6_224.pg
@@ -8,7 +8,7 @@
 ## DBsection(Chain rule (with trigonometric functions))
 ## Date(05/11/2018)
 ## Institution(Colorado Community College System)
-## Author(Eric Fleming)
+## Author(Eric Fleming-updated to use Composition_Ans by Brittni Lorton August 2022)
 ## MO(1)
 ## KEYWORDS('chain rule', 'trig', 'trigonometric functions', 'tan', 'tangent', 'tan(x)', 'sec', 'secant', 'sec(x)')
 
@@ -40,7 +40,6 @@ $a=random(2,9,1);
 $b=random(2,20,1);
 $c=random(2,20,1);
 
-
 $f=Formula("tan(sec($a x))");
 
 $ans1=Formula("tan(u)");
@@ -50,35 +49,23 @@ $ans3=Formula("$a sec^2(sec($a x)) sec($a x) tan($a x)");
 ###########################
 #  Main text
 
-#BEGIN_PGML
+BEGIN_PGML
 
-#Decompose [`\displaystyle y=[$f]`] into two functions [`y=f(u)`] and [`u=g(x)`] such that [`y=f(g(x))`].  Then find `\frac{dy}{dx}`.
+Decompose [`\displaystyle y=[$f]`] into two functions [`y=f(u)`] and [`u=g(x)`] such that [`y=f(g(x))`].  Then find `\frac{dy}{dx}`.
 
-#[`f(u)=`][_______________] [@ AnswerFormatHelp("formulas") @]*
+[`f(u)=`][_______________] [@ AnswerFormatHelp("formulas") @]*
 
-#[`g(x)=`][_______________] [@ AnswerFormatHelp("formulas") @]*
+[`g(x)=`][_______________] [@ AnswerFormatHelp("formulas") @]*
 
-#`\frac{dy}{dx}=`[_______________] [@ AnswerFormatHelp("formulas") @]*
+END_PGML
 
-#END_PGML
-Context()->texStrings;
-BEGIN_TEXT
-Decompose \( y=$f\) into two functions \(y=f(u)\) and \(u=g(x)\) such that \(y=f(g(x))\).  Then find \( \frac{dy}{dx}\).
-$BR
-$BR
-\( f(u) \) = \{ ans_rule(20) \}
-\{ AnswerFormatHelp("formulas") \}
-$BR
-\( g(x) \) = \{ ans_rule(20) \}
-$BR
-END_TEXT
-Context()->normalStrings;
 COMPOSITION_ANS( $ans1, $ans2, vars=>['u','x'], showVariableHints=>1);
+BEGIN_PGML
+
+`\frac{dy}{dx}=`[_______________]{$ans3} [@ AnswerFormatHelp("formulas") @]*
+
+END_PGML
 
-BEGIN_TEXT
-\(\frac{dy}{dx}= \) \{ans_rule(20)\}
-END_TEXT
-ANS( $ans3->cmp() ); 
 
 ############################
 #  Solution
diff --git a/Contrib/CCCS/CalculusOne/04.7/CCD_CCCS_Openstax_Calc1_C1-2016-002_4_7_332_334.pg b/Contrib/CCCS/CalculusOne/04.7/CCD_CCCS_Openstax_Calc1_C1-2016-002_4_7_332_334.pg
index 198f547942..89904c268c 100644
--- a/Contrib/CCCS/CalculusOne/04.7/CCD_CCCS_Openstax_Calc1_C1-2016-002_4_7_332_334.pg
+++ b/Contrib/CCCS/CalculusOne/04.7/CCD_CCCS_Openstax_Calc1_C1-2016-002_4_7_332_334.pg
@@ -39,22 +39,26 @@ $showPartialCorrectAnswers = 1;
 
 ###########################
 #  Setup
+$ans1=Compute("-b+ax-cx-dx^2");
+$ans2=Compute("(a-c)/(2d)");
 
 do{$a=random(4,20,4);
-$b=random(2,8,2);
-$d=random(5,25,5);
+$b=random(2,8,2);}
+until($a>$b);
+$ans3=Compute(($a-$b)/(2));
+
+do{$d=random(5,25,5);
 $e=random(2,8,2);
 $f=random(1,3,1);
-$g=random(.2,2,.2);
-$ans1=Compute("-b+ax-cx-dx^2");
-$ans2=Compute("(a-c)/(2d)");
-$ans3=Compute(($a-$b)/(2));
+$g=random(.2,2,.2);}
+until($d>$f);
 $ans4=Compute(($d-$f)/(2*$g));
+
+
 $rev1=Compute("$a*x")->reduce;
 $rev2=Compute("$d*x")->reduce;
 $cost1=Compute("$b*x+x^2")->reduce;
-$cost2=Compute("$e+$f*x+$g*x^2")->reduce;}until($ans3>0 and $ans4>0);
-
+$cost2=Compute("$e+$f*x+$g*x^2")->reduce;
 
 ###########################
 #  Main text