Display Fixes and Typos

Author: brittnilorton

Contrib/CCCS/CalculusOne/02.1/CCD_CCCS_Openstax_Calc1_C1-2016-002_02_1_7_9.pg

@@ -36,7 +36,6 @@ install_weighted_grader();
 
 TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
-$refreshCaschedImages = 1;
 
 ###########################
 

Contrib/CCCS/CalculusOne/02.4/CCD_CCCS_Openstax_Calc1_C1-2016-002_04_139_143.pg

@@ -41,6 +41,7 @@ Context()->noreduce('(-x)-y','(-x)+y');
 
 # first function of the form (x^2+x-2)/(x-1)
 $x = non_zero_random(-6, 6, 1);
+$nx = -$x;
 $x0 = non_zero_random(-6, 6, 1);
 $b = $x+$x0;
 $num = Formula("x^2 + $b*x+$x*$x0")->reduce;
@@ -142,6 +143,7 @@ BEGIN_PGML
 
 Determine if the function is continuous at the given point.  If it is discontinuous, classify the discontinuity as jump, removable, infinite, or other.  If it is continuous, choose continuous.
 
+
 #
 END_PGML
 
@@ -151,7 +153,7 @@ if ($aa == 1) {
 BEGIN_PGML
 
 (a)
-[`f(x)=[$f_1]`] ;  at `x=-[$x]`;  the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
+[``f(x)=[$f_1]``] ;  at `x=[$nx]`;  the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
 
 
 (b)
@@ -194,7 +196,7 @@ BEGIN_PGML
 
 
 (c)
-[`f(x)=[$f_1]`] ;  at `x=-[$x]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
+[``f(x)=[$f_1]``] ;  at `x=[$nx]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
 
 
 (d)
@@ -229,7 +231,7 @@ BEGIN_PGML
 
 
 (c)
-[`f(x)=[$f_1]`] ;  at `x=-[$x]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
+[``f(x)=[$f_1]``] ;  at `x=[$nx]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
 
 
 (d)
@@ -261,7 +263,7 @@ BEGIN_PGML
 
 
 (b)
-[``f(x)=[$f_1]``] ;  at `x=-[$x]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
+[``f(x)=[$f_1]``] ;  at `x=[$nx]` the function is: [@ $popup1->menu() @]*   Classification: [@ $popup2->menu() @]* 
 
 
 (c)

Contrib/CCCS/CalculusOne/03.1/CCD_CCCS_Openstax_Calculus_C1-2016-002_3_1_36.pg

@@ -52,7 +52,7 @@ $avea2 = $ave->eval(h=>$a2);
 
 BEGIN_PGML
 
-The position of an object after t seconds is given by `s(t)=t^2-[$a0]t` were `s` is in meters.
+The position of an object after t seconds is given by `s(t)=t^2-[$a0]t` were `s` is in feet.
 
 a. The simplified expression for the average velocity from `t=2` to `t=2+h` is [_______________]{ $ave}  [@ AnswerFormatHelp("formulas") @]*
 

Contrib/CCCS/CalculusOne/03.3/CCD_CCCS_Openstax_Calculus_C1-2016-002_3_3_126_129.pg

@@ -110,7 +110,7 @@ Context()->texStrings;
 
 Scaffold::Begin();
 
-Section::Begin("Part 1 - 1 point");
+Section::Begin("Part 1");
 
 BEGIN_PGML
 
@@ -131,7 +131,7 @@ Section::End();
 
 ######################################################
 
-Section::Begin("Part 2 - 1 point");
+Section::Begin("Part 2");
 
 BEGIN_PGML
 
@@ -154,7 +154,7 @@ Section::End();
 
 ######################################################
 
-Section::Begin("Part 3 - 1 point");
+Section::Begin("Part 3");
 
 BEGIN_PGML
 
@@ -175,7 +175,7 @@ Section::End();
 
 ######################################################
 
-Section::Begin("Part 4 - 1 point");
+Section::Begin("Part 4");
 
 BEGIN_PGML
 

Contrib/CCCS/CalculusOne/03.3/CCD_CCCS_Openstax_Calculus_C1-2016-002_3_3_130.pg

@@ -76,7 +76,7 @@ END_PGML
 
 Scaffold::Begin();
 
-Section::Begin("Part 1 - 1 point");
+Section::Begin("Part 1");
 
 BEGIN_PGML
 
@@ -98,7 +98,7 @@ Section::End();
 
 ######################################################
 
-Section::Begin("Part 2 - 1 point");
+Section::Begin("Part 2");
 
 BEGIN_PGML
 
@@ -122,7 +122,7 @@ Section::End();
 
 ######################################################
 
-Section::Begin("Part 3 - 1 point");
+Section::Begin("Part 3");
 
 BEGIN_PGML
 

Contrib/CCCS/CalculusOne/04.10/CCD_CCCS_Openstax_Calc1_C1-2016-002_4_10_482.pg

@@ -57,7 +57,7 @@ END_PGML
 ############################
 BEGIN_PGML_HINT
 
-This can be done by first simplifying the funciton using a trig identity, or this can be done by using a u-substitution. 
+This can be done by first simplifying the function using a trig identity, or this can be done by using a u-substitution. 
 
 
 

Contrib/CCCS/CalculusOne/05.1/CCD_CCCS_Openstax_Calc1_C1-2016-002_5_1_58.pg

@@ -37,17 +37,17 @@ $showPartialCorrectAnswers = 1;
 ##########################
 #  Setup
 
-Context("Fraction")->variables->are(x=>"Real",y=>"Real");
+Context("Numeric")->variables->are(x=>"Real",y=>"Real");
 parser::Assignment->Allow;
 parser::Assignment->Function("f");
 
 $a = non_zero_random(-10,10,1);
 $b = random(1,9,1);
 $c = non_zero_random(1,5,2);
 $d = non_zero_random(2,4,2);
+$m = Compute("$c/$d");
 
-
-$eqn = Formula("y=$c/$d*x+$b");
+$eqn = Formula("y=$m*x+$b");
 
 
 $video = MODES(
@@ -63,11 +63,13 @@ TeX =>
 
 BEGIN_PGML
 
+[$video]*
+
+
 Find the equation of the line that contains has a slope of [` \dfrac{[$c]}{[$d]} `] and a `y`-intercept of [`(0,[$b])`].  Write the answer in slope-intercept form.
 
 [__________________]{$eqn} [@ AnswerFormatHelp("equation") @]*
 
-[$video]*
 
 END_PGML
 

Contrib/CCCS/CollegeAlgebra/2.2/RRCC_CCCS_Openstax_AlgTrig_AT-1-001-AS_2_2_23.pg

@@ -38,7 +38,7 @@ $showPartialCorrectAnswers = 1;
 ##########################
 #  Setup
 
-Context("Fraction")->variables->are(x=>"Real",y=>"Real");
+Context("Numeric")->variables->are(x=>"Real",y=>"Real");
 parser::Assignment->Allow;
 parser::Assignment->Function("f");
 
@@ -49,27 +49,8 @@ $d = non_zero_random(-4,4,1);
 
 $slope = - $c;
 $intercept = $a*$c+$b;
+$eqn = Formula("y=$slope*x+$intercept")->reduce;
 
-Context("ArbitraryString");
-
-if ($intercept > 0) {
-  $ans1 = "y=" . $slope . "x+" . $intercept;
-  $ans2 = "y=" . $slope . "*x+" . $intercept;
-  $ans3 = "y=(" . $slope . ")x+" . $intercept;
-  $ans4 = "y=(" . $slope . ")*x+" . $intercept;
-} 
-else {
-  $ans1 = "y=" . $slope . "x-" . (-1*$intercept);
-  $ans2 = "y=" . $slope . "*x-" . (-1*$intercept);
-  $ans3 = "y=(" . $slope . ")x-" . (-1*$intercept);
-  $ans4 = "y=(" . $slope . ")*x-" . (-1*$intercept);
-  $ans5 = "y=" . $slope . "x+-" . (-1*$intercept);
-  $ans6 = "y=" . $slope . "*x+-" . (-1*$intercept);
-  $ans7 = "y=(" . $slope . ")x+(-" . (-1*$intercept) . ")";
-  $ans8 = "y=(" . $slope . ")*x+(-" . (-1*$intercept) . ")";
-  $ans9 = "y=(" . $slope . ")x+-" . (-1*$intercept);
-  $ans10 = "y=(" . $slope . ")*x+-" . (-1*$intercept);
-}
 
 $video = MODES(
 HTML=> 
@@ -86,13 +67,17 @@ TeX =>
 
 BEGIN_PGML
 
+[$video]*
+
+
+
 Find an equation of the line perpendicular to [` [$c]*y=x-[$d] `] that passes through the point [`([$a],[$b])`]. 
 
 Write the answer in slope-intercept form, [`y = mx + b `], with all fractions written in lowest terms.
 
-[____________________]{$ans} [@ AnswerFormatHelp("equation") @]*
+[____________________]{$eqn} [@ AnswerFormatHelp("equation") @]*
+
 
-[$video]*
 END_PGML
 BEGIN_TEXT
 $BR
@@ -109,39 +94,7 @@ END_TEXT
 #Solution explanation goes here.
 #END_PGML_SOLUTION
 
-ANS( String($ans1) -> cmp( checker => sub{
-    my ($correct, $student, $ansHash) = @_;
-    $s = $student;
-    $s =~ s/ //g;      # compress all blank space
-    if ($intercept > 0) {
-      if (String($s) == String($ans1) ||
-        String($s) == String($ans2)  ||
-        String($s) == String($ans3) ||
-        String($s) == String($ans4) 
-      ) {
-        return(1);
-      }
-      else {
-        return(0);
-      }
-    }
-   else {   # intercept is negative
-     if (String($s) == String($ans1) ||
-        String($s) == String($ans2) ||
-        String($s) == String($ans3) ||
-        String($s) == String($ans4) ||
-        String($s) == String($ans5) ||
-        String($s) == String($ans6) || 
-        String($s) == String($ans7) ||
-        String($s) == String($ans8) 
-      ) {
-        return(1);
-      }
-      else {
-        return(0);
-      }
-    }
-} ) );
+
 
 COMMENT('Uses PGML.');
 

Contrib/CCCS/CollegeAlgebra/2.2/RRCC_CCCS_Openstax_AlgTrig_AT-1-001-AS_2_2_29.pg

@@ -114,7 +114,7 @@ $gr2[1]->lb('reset');
 $gr2[1]->lb(new Label(4.75,0.25,'x','black','center','middle'));
 $gr2[1]->lb(new Label(0.25,4.75,'y','black','center','middle'));
 
-$u=$r1/2;
+if($r1==0){$u=1;}else{$u=$r1/2;}
 $f2[2] = "(x-$b)/$m for x in <$u,$r2> using color:red and weight:2";
 $gr2[2] = init_graph(-5,-5,5,5,'axes'=>[0,0], 'grid'=>[10,10]);
 $gr2[2]->lb('reset');