Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
Clean up the exercise files using the new cleaning utility. (IV)
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Chang committed Apr 17, 2013
1 parent b4bfac8 commit 62dae32
Show file tree
Hide file tree
Showing 39 changed files with 289 additions and 291 deletions.
2 changes: 1 addition & 1 deletion exercises/absolute_value_equations.html
View file
Expand Up @@ -49,7 +49,7 @@
</div>
<p class="input-format">
<code>x = </code> <span class="entry short40"></span>
&#160; or
&nbsp; or
<code>x = </code> <span class="entry short40"></span>
</p>
</div>
Expand Down
186 changes: 93 additions & 93 deletions exercises/angles_1.html
View file

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions exercises/angles_2.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion exercises/combinations_1.html
View file
Expand Up @@ -9,7 +9,7 @@
<div class="problems">
<div id="packing">
<div class="vars" data-ensure="NUM_THINGS&gt;NUM_TAKEN">
<var id="THING">randFromArray(["shirts", "tigers", "books", "Faberg&#233; eggs", "socks", "action figures"])</var>
<var id="THING">randFromArray(["shirts", "tigers", "books", "Fabergé eggs", "socks", "action figures"])</var>
<var id="NUM_THINGS">randRange(5,9)</var>
<var id="NUM_TAKEN">randRange(3,5)</var>
<var id="ANSWER">factorial(NUM_THINGS) / (factorial(NUM_THINGS-NUM_TAKEN) * factorial(NUM_TAKEN))</var>
Expand Down
10 changes: 5 additions & 5 deletions exercises/compound_inequalities.html
View file
Expand Up @@ -10,8 +10,8 @@
}

return {
"&#8804;": "&#8805;",
"&#8805;": "&#8804;",
"≤": "≥",
"≥": "≤",
"<": ">",
">": "<"
}[comp];
Expand All @@ -34,7 +34,7 @@
<var id="ADD_TO_SIMPLIFY">tabulate( function(i) {
return LEFT_INT[i] * ( SIGN[i] === "+" ? -1 : 1 );
}, 2 )</var>
<var id="COMP">randFromArray( [ "&lt;", "&gt;", "&#8804;", "&#8805;" ], 2 )</var>
<var id="COMP">randFromArray( [ "&lt;", "&gt;", "≤", "≥" ], 2 )</var>
<var id="RIGHT_INT">tabulate( function(i) {
return randRange( 1, 6 ) * abs( COEF[i] ) + ( SIGN[i] === "+" ? 1 : -1 ) * LEFT_INT[i];
}, 2 )</var>
Expand All @@ -51,10 +51,10 @@
<var id="FIRST">[ "first", "second" ]</var>
<var id="COLOR">[ "#1F78B4", "#B30000" ]</var>
<var id="INCLUSIVE">tabulate( function(i) {
return COMP_SOLUTION[i] === "&#8804;" || COMP_SOLUTION[i] === "&#8805;";
return COMP_SOLUTION[i] === "≤" || COMP_SOLUTION[i] === "≥";
}, 2 )</var>
<var id="LESS_THAN">tabulate( function(i) {
return COMP_SOLUTION[i] === "&#8804;" || COMP_SOLUTION[i] === "&lt;";
return COMP_SOLUTION[i] === "≤" || COMP_SOLUTION[i] === "&lt;";
}, 2 )</var>
<var id="ALL_NUMBERS">( LESS_THAN[0] &amp;&amp; !LESS_THAN[1] &amp;&amp; SOLUTION[0] &gt;= SOLUTION [1] ) || ( !LESS_THAN[0] &amp;&amp; LESS_THAN[1] &amp;&amp; SOLUTION[0] &lt;= SOLUTION [1] )</var>
<var id="NO_SOLUTION">( LESS_THAN[0] &amp;&amp; !LESS_THAN[1] &amp;&amp; SOLUTION[1] &gt; SOLUTION[0] ) || ( !LESS_THAN[0] &amp;&amp; LESS_THAN[1] &amp;&amp; SOLUTION[0] &gt; SOLUTION[1] ) || ( LESS_THAN[0] !== LESS_THAN[1] &amp;&amp; SOLUTION[0] === SOLUTION[1] &amp;&amp; ( !INCLUSIVE[0] || !INCLUSIVE[1] ) )</var>
Expand Down
6 changes: 3 additions & 3 deletions exercises/congruency_postulates.html
View file
Expand Up @@ -73,10 +73,10 @@
<div class="instruction">
<ul>
<li><label><input name="solution" type="radio" value="Yes"><span class="value">
Yes &#8212; And I've constructed a congruent triangle, and this is the <strong>ONLY</strong> triangle I can construct with these conditions.
Yes — And I've constructed a congruent triangle, and this is the <strong>ONLY</strong> triangle I can construct with these conditions.
</span></label></li>
<li><label><input name="solution" type="radio" value="No"><span class="value">
No &#8212; And I've proven it by constructing an incongruent triangle (a counterexample).
No — And I've proven it by constructing an incongruent triangle (a counterexample).
</span></label></li>
</ul>
</div>
Expand Down Expand Up @@ -132,7 +132,7 @@
<div class="hints">
<p>
To be a congruency postulate, there must be one, <em>and only one</em>, way to make a triangle
that's the same as the original triangle&#8212;except for being moved, rotated, or reflected.
that's the same as the original triangle—except for being moved, rotated, or reflected.
</p>
<p data-if="ANSWER === 'Yes'">
With the constraints of <var>NAME</var>, there is exactly one way to make a triangle.
Expand Down
24 changes: 12 additions & 12 deletions exercises/converting_temperatures.html
View file
Expand Up @@ -17,7 +17,7 @@
<var id="B">A-32</var>
<var id="C">abs(B*5)</var>
</div>
<p class="question">Convert <code><var>A</var>&#176;</code> from Fahrenheit to Celsius. Round to the nearest tenth degree:</p>
<p class="question">Convert <code><var>A</var>°</code> from Fahrenheit to Celsius. Round to the nearest tenth degree:</p>
<div class="solution" data-type="multiple">
<p><span class="sol" data-forms="integer,decimal,mixed,improper" data-inexact="" data-max-error="0.09">
<var>roundTo(1,(A-32)*(5/9))</var>
Expand All @@ -43,15 +43,15 @@
</p>
<p>
<span data-if="C%9==0">
<code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>&#176;</code></span>
<code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>°</code></span>
<span data-else-if="B*5&lt;0">
<br><code>\blue{C} = -</code><code><var>mixedFractionFromImproper(C, 9,'defraction', 'reduce')</var>&#176;</code><br>
<br><code>\blue{C} = -</code><code><var>mixedFractionFromImproper(C, 9,'defraction', 'reduce')</var>°</code><br>
<br>OR<br>
<br><code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>&#176;</code><br></span>
<br><code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>°</code><br></span>
<span data-else="B*5&gt;=0">
<br><code>\blue{C} = <var>mixedFractionFromImproper(B*5, 9,'defraction', 'reduce')</var>&#176;</code><br>
<br><code>\blue{C} = <var>mixedFractionFromImproper(B*5, 9,'defraction', 'reduce')</var>°</code><br>
<br>OR<br>
<br><code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>&#176;</code><br></span>
<br><code>\blue{C} = <var>roundTo(1, (A-32)*(5/9))</var>°</code><br></span>
</p>
</div>
</div>
Expand All @@ -61,7 +61,7 @@
<var id="C">160+(A*9)</var>
</div>
<p class="question">
Convert <code><var>A</var>&#176;</code> from Celsius to Fahrenheit. Round to the nearest tenth degree:
Convert <code><var>A</var>°</code> from Celsius to Fahrenheit. Round to the nearest tenth degree:
</p>
<div class="solution" data-type="multiple">
<p><span class="sol" data-forms="integer,decimal,mixed,improper" data-inexact="" data-max-error="0.09">
Expand Down Expand Up @@ -93,15 +93,15 @@
<br>Simplify:<br>

<span data-if="C%5==0">
<code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>&#176;</code></span>
<code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>°</code></span>
<span data-else-if="C&lt;0">
<br><code>\green{F} = - </code><code><var>mixedFractionFromImproper(abs(C), 5,'defraction', 'reduce')</var>&#176;</code><br>
<br><code>\green{F} = - </code><code><var>mixedFractionFromImproper(abs(C), 5,'defraction', 'reduce')</var>°</code><br>
<br>OR<br>
<br><code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>&#176;</code><br></span>
<br><code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>°</code><br></span>
<span data-else="C&gt;=0">
<code>\green{F} = <var>mixedFractionFromImproper(C, 5,'defraction', 'reduce')</var>&#176;</code>
<code>\green{F} = <var>mixedFractionFromImproper(C, 5,'defraction', 'reduce')</var>°</code>
<br>OR<br>
<br><code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>&#176;</code><br></span>
<br><code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>°</code><br></span>
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/degrees_to_radians.html
View file
Expand Up @@ -13,7 +13,7 @@
<div class="problems">
<div id="degrees-to-radians">
<p class="question">
Convert the angle <var>ANGLE.deg</var>&#176; to radians.
Convert the angle <var>ANGLE.deg</var>° to radians.
</p>

<div class="solution" data-type="multiple">
Expand Down
2 changes: 1 addition & 1 deletion exercises/exponent_rules.html
View file
Expand Up @@ -74,7 +74,7 @@

<p class="question">What is <code><var>expr(["^", ["*", ["^", BASE1, EXP1], ["^", BASE2, EXP2]], EXP3])</var></code>?</p>
<p class="solution" data-type="multiple">
<code><var>BASE1</var></code> <span class="sol short25 exp"><var>EXP1 * EXP3</var></span> &#183; <code><var>BASE2</var></code> <span class="sol short25 exp"><var>EXP2 * EXP3</var></span>
<code><var>BASE1</var></code> <span class="sol short25 exp"><var>EXP1 * EXP3</var></span> · <code><var>BASE2</var></code> <span class="sol short25 exp"><var>EXP2 * EXP3</var></span>
</p>

<div class="hints">
Expand Down
2 changes: 1 addition & 1 deletion exercises/fractions_cut_and_copy_1.html
View file
Expand Up @@ -92,7 +92,7 @@
<p>Cutting the starting block into <code>x</code> pieces is the same as dividing it by <code>x</code>.</p>
<div>
<p>Therefore cutting the starting block into <code><var>N_PARENT_EXPANDED</var></code> pieces is the same as:</p>
<p><code>\dfrac{<var>N_PARENT_EXPANDED</var>}{<var>D</var>} &#247; <var>N_PARENT_EXPANDED</var> =
<p><code>\dfrac{<var>N_PARENT_EXPANDED</var>}{<var>D</var>} ÷ <var>N_PARENT_EXPANDED</var> =
\dfrac{<var>N_PARENT_EXPANDED</var>}{<var>D</var>} \cdot \dfrac{1}{<var>N_PARENT_EXPANDED</var>} = \dfrac{1}{<var>D</var>}</code></p>
</div>
<p>Copying the resulting block <code>y</code> times is the same as multiplying it by <code>y</code>.</p>
Expand Down
6 changes: 3 additions & 3 deletions exercises/fractions_cut_and_copy_2.html
View file
Expand Up @@ -125,14 +125,14 @@
<p>The least common denominator of <code><var>D_OFFSPRING_1</var></code> and <code><var>D_OFFSPRING_2</var></code> (the denominators of the goal blocks) is
<code><var>LCM</var></code>. Therefore you can copy a block <code>\dfrac{1}{<var>LCM</var>}</code> units long to make both goal blocks.</p>
<p>To find the number of slices to cut the starting block into we solve for <code>s</code> in the following equation:</p>
<p><code><var>CODE_PARENT</var> &#247; s = \dfrac{1}{<var>LCM</var>}</code></p>
<p><code><var>CODE_PARENT</var> ÷ s = \dfrac{1}{<var>LCM</var>}</code></p>
<p><code><var>CODE_PARENT</var> = \dfrac{1}{<var>LCM</var>}s</code></p>
<p><code><var>CODE_PARENT</var> \cdot <var>LCM</var> = s</code></p>
<p><code>s = <var>SLICES</var></code></p>
<p>We now have a resulting block that is <code>\dfrac{1}{<var>LCM</var>}</code> units long. Now we simply divide our goal blocks by this value to see how many times we need to copy the resulting block.</p>
<p><code>\color{<var>BLUE</var>}{c1 = \dfrac{<var>N_OFFSPRING_1</var>}{<var>D_OFFSPRING_1</var>} &#247; \dfrac{1}{<var>LCM</var>} =
<p><code>\color{<var>BLUE</var>}{c1 = \dfrac{<var>N_OFFSPRING_1</var>}{<var>D_OFFSPRING_1</var>} ÷ \dfrac{1}{<var>LCM</var>} =
\dfrac{<var>N_OFFSPRING_1</var>}{<var>D_OFFSPRING_1</var>} \cdot <var>LCM</var> = <var>N_OFFSPRING_1 * LCM / D_OFFSPRING_1</var>}</code></p>
<p><code>\color{<var>ORANGE</var>}{c2 = \dfrac{<var>N_OFFSPRING_2</var>}{<var>D_OFFSPRING_2</var>} &#247; \dfrac{1}{<var>LCM</var>} =
<p><code>\color{<var>ORANGE</var>}{c2 = \dfrac{<var>N_OFFSPRING_2</var>}{<var>D_OFFSPRING_2</var>} ÷ \dfrac{1}{<var>LCM</var>} =
\dfrac{<var>N_OFFSPRING_2</var>}{<var>D_OFFSPRING_2</var>} \cdot <var>LCM</var> = <var>N_OFFSPRING_2 * LCM / D_OFFSPRING_2</var>}</code></p>
<p><strong>Therefore the solution is to cut the starting block into <code><var>SLICES</var></code> pieces, copy current block 1 <code><var>N_OFFSPRING_1 * LCM / D_OFFSPRING_1</var></code> times and current block 2 <code><var>N_OFFSPRING_2 * LCM / D_OFFSPRING_2</var></code> times.</strong></p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions exercises/graphing_inequalities.html
View file
Expand Up @@ -18,10 +18,10 @@
<var id="B">SLOPE_FRAC[1] * MULT</var>
<var id="C">SLOPE_FRAC[1] * YINT * MULT</var>
<var id="STD_FORM">randFromArray([ true, false ])</var>
<var id="COMP">randFromArray([ "&lt;", "&gt;", "&#8804;", "&#8805;" ])</var>
<var id="STD_FORM_COMP">B &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "&#8804;": "&#8805;", "&#8805;": "&#8804;" }[ COMP ] : COMP</var>
<var id="LESS_THAN">COMP === "&lt;" || COMP === "&#8804;"</var>
<var id="INCLUSIVE">COMP === "&#8805;" || COMP === "&#8804;"</var>
<var id="COMP">randFromArray([ "&lt;", "&gt;", "≤", "≥" ])</var>
<var id="STD_FORM_COMP">B &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "≤": "≥", "≥": "≤" }[ COMP ] : COMP</var>
<var id="LESS_THAN">COMP === "&lt;" || COMP === "≤"</var>
<var id="INCLUSIVE">COMP === "≥" || COMP === "≤"</var>

</div>

Expand Down
16 changes: 8 additions & 8 deletions exercises/graphing_inequalities_2.html
View file
Expand Up @@ -18,24 +18,24 @@
<var id="B">SLOPE_FRAC[1] * MULT</var>
<var id="C">SLOPE_FRAC[1] * YINT * MULT</var>
<var id="STD_FORM">randFromArray([ true, false ])</var>
<var id="COMP">randFromArray([ "&lt;", "&gt;", "&#8804;", "&#8805;" ])</var>
<var id="STD_FORM_COMP">B &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "&#8804;": "&#8805;", "&#8805;": "&#8804;" }[ COMP ] : COMP</var>
<var id="LESS_THAN">COMP === "&lt;" || COMP === "&#8804;"</var>
<var id="INCLUSIVE">COMP === "&#8805;" || COMP === "&#8804;"</var>
<var id="COMP">randFromArray([ "&lt;", "&gt;", "≤", "≥" ])</var>
<var id="STD_FORM_COMP">B &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "≤": "≥", "≥": "≤" }[ COMP ] : COMP</var>
<var id="LESS_THAN">COMP === "&lt;" || COMP === "≤"</var>
<var id="INCLUSIVE">COMP === "≥" || COMP === "≤"</var>
<div data-ensure="sqrt( pow( POINT_1[0] - POINT_2[0], 2 ) + pow( POINT_1[1] - POINT_2[1], 2 ) ) &gt; 4">
<var id="POINT_1">[ randRangeExclude( -9, 9, [ -3, -2, -1, 0 ] ), randRangeExclude( -9, 9, [ -1, -2 ] ) ]</var>
<var id="POINT_2">[ randRangeExclude( -9, 9, [ -3, -2, -1, 0 ] ), randRangeExclude( -9, 9, [ -1, -2 ] ) ]</var>
<var id="POINT_1_SOLUTION">
(((COMP === "&lt;") &amp;&amp; ( POINT_1[1] &lt; SLOPE * POINT_1[0] + YINT ))
|| ((COMP === "&#8804;") &amp;&amp; ( POINT_1[1] &lt;= SLOPE * POINT_1[0] + YINT ))
|| ((COMP === "≤") &amp;&amp; ( POINT_1[1] &lt;= SLOPE * POINT_1[0] + YINT ))
|| ((COMP === "&gt;") &amp;&amp; ( POINT_1[1] &gt; SLOPE * POINT_1[0] + YINT ))
|| ((COMP === "&#8805;") &amp;&amp; ( POINT_1[1] &gt;= SLOPE * POINT_1[0] + YINT )))
|| ((COMP === "≥") &amp;&amp; ( POINT_1[1] &gt;= SLOPE * POINT_1[0] + YINT )))
</var>
<var id="POINT_2_SOLUTION">
(((COMP === "&lt;") &amp;&amp; ( POINT_2[1] &lt; SLOPE * POINT_2[0] + YINT ))
|| ((COMP === "&#8804;") &amp;&amp; ( POINT_2[1] &lt;= SLOPE * POINT_2[0] + YINT ))
|| ((COMP === "≤") &amp;&amp; ( POINT_2[1] &lt;= SLOPE * POINT_2[0] + YINT ))
|| ((COMP === "&gt;") &amp;&amp; ( POINT_2[1] &gt; SLOPE * POINT_2[0] + YINT ))
|| ((COMP === "&#8805;") &amp;&amp; ( POINT_2[1] &gt;= SLOPE * POINT_2[0] + YINT )))
|| ((COMP === "≥") &amp;&amp; ( POINT_2[1] &gt;= SLOPE * POINT_2[0] + YINT )))
</var>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion exercises/graphing_parabolas_0.5.html
View file
Expand Up @@ -201,7 +201,7 @@
<code class="hint_green">x</code> into the equation and plot each value:
</p>
<div class="fake_header plug_in">
<span><code class="hint_green">x</code></span><span>&#160;</span><span><code class="hint_pink">\hphantom{= } \quad y</code></span>
<span><code class="hint_green">x</code></span><span>&nbsp;</span><span><code class="hint_pink">\hphantom{= } \quad y</code></span>
</div>
</div>
<div class="fake_row plug_in" data-each="[ -2, -1, 0, 1, 2 ] as x">
Expand Down
16 changes: 8 additions & 8 deletions exercises/graphing_systems_of_inequalities.html
View file
Expand Up @@ -33,14 +33,14 @@
<var id="C_2">SLOPE_FRAC_2[1] * YINT_2 * MULT_2</var>
<var id="STD_FORM_1">randFromArray([ true, false ])</var>
<var id="STD_FORM_2">randFromArray([ true, false ])</var>
<var id="COMP_1">randFromArray([ "&lt;", "&gt;", "&#8804;", "&#8805;" ])</var>
<var id="COMP_2">randFromArray([ "&lt;", "&gt;", "&#8804;", "&#8805;" ])</var>
<var id="STD_FORM_COMP_1">B_1 &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "&#8804;": "&#8805;", "&#8805;": "&#8804;" }[ COMP_1 ] : COMP_1</var>
<var id="STD_FORM_COMP_2">B_2 &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "&#8804;": "&#8805;", "&#8805;": "&#8804;" }[ COMP_2 ] : COMP_2</var>
<var id="LESS_THAN_1">COMP_1 === "&lt;" || COMP_1 === "&#8804;"</var>
<var id="LESS_THAN_2">COMP_2 === "&lt;" || COMP_2 === "&#8804;"</var>
<var id="INCLUSIVE_1">COMP_1 === "&#8805;" || COMP_1 === "&#8804;"</var>
<var id="INCLUSIVE_2">COMP_2 === "&#8805;" || COMP_2 === "&#8804;"</var>
<var id="COMP_1">randFromArray([ "&lt;", "&gt;", "≤", "≥" ])</var>
<var id="COMP_2">randFromArray([ "&lt;", "&gt;", "≤", "≥" ])</var>
<var id="STD_FORM_COMP_1">B_1 &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "≤": "≥", "≥": "≤" }[ COMP_1 ] : COMP_1</var>
<var id="STD_FORM_COMP_2">B_2 &lt; 0 ? { "&lt;": "&gt;", "&gt;": "&lt;", "≤": "≥", "≥": "≤" }[ COMP_2 ] : COMP_2</var>
<var id="LESS_THAN_1">COMP_1 === "&lt;" || COMP_1 === "≤"</var>
<var id="LESS_THAN_2">COMP_2 === "&lt;" || COMP_2 === "≤"</var>
<var id="INCLUSIVE_1">COMP_1 === "≥" || COMP_1 === "≤"</var>
<var id="INCLUSIVE_2">COMP_2 === "≥" || COMP_2 === "≤"</var>
</div>

<p class="question">
Expand Down

0 comments on commit 62dae32

Please sign in to comment.