Permalink
Browse files

Strip trailing whitespace

  • Loading branch information...
1 parent d9ef48a commit cf021797154870d443c5614d2cb670adee34d584 @spicyj spicyj committed Jun 2, 2011
Showing with 327 additions and 327 deletions.
  1. +1 −1 README.md
  2. +1 −1 exercises/absolute_value.html
  3. +2 −2 exercises/adding_and_subtracting_negative_numbers.html
  4. +1 −1 exercises/addition_1.html
  5. +1 −1 exercises/age_word_problems.html
  6. +15 −15 exercises/arithmetic_word_problems.html
  7. +1 −1 exercises/average_word_problems.html
  8. +10 −10 exercises/direct_and_inverse_variation.html
  9. +2 −2 exercises/divisibility_intro.html
  10. +3 −3 exercises/division_3.html
  11. +1 −1 exercises/equivalent_fractions.html
  12. +4 −4 exercises/evaluating_expressions_1.html
  13. +1 −1 exercises/functions_1.html
  14. +8 −8 exercises/functions_2.html
  15. +5 −5 exercises/greatest_common_divisor.html
  16. +17 −17 exercises/kinematic_equations.html
  17. +2 −2 exercises/least_common_multiple.html
  18. +5 −5 exercises/limits_1.html
  19. +4 −4 exercises/linear_equations_1.html
  20. +13 −13 exercises/mean_median_and_mode.html
  21. +1 −1 exercises/multiplication_1.html
  22. +1 −1 exercises/multiplying_and_dividing_negative_numbers.html
  23. +3 −3 exercises/order_of_operations.html
  24. +4 −4 exercises/percentage_word_problems_1.html
  25. +8 −8 exercises/place_value.html
  26. +6 −6 exercises/prime_numbers.html
  27. +5 −5 exercises/radians_and_degrees.html
  28. +3 −3 exercises/rate_problems_1.html
  29. +1 −1 exercises/recognizing_fractions.html
  30. +7 −7 exercises/simplifying_fractions.html
  31. +3 −3 exercises/special_derivatives.html
  32. +2 −2 exercises/subtracting_decimals.html
  33. +3 −3 exercises/writing_expressions_1.html
  34. +1 −1 khan-exercise.css
  35. +17 −17 khan-exercise.js
  36. +1 −1 utils/angles.js
  37. +23 −23 utils/calculus.js
  38. +25 −25 utils/graph.js
  39. +9 −9 utils/kinematics.js
  40. +35 −35 utils/math-random.js
  41. +2 −2 utils/math-table.js
  42. +38 −38 utils/math.js
  43. +4 −4 utils/mathformat.js
  44. +1 −1 utils/polynomials.js
  45. +7 −7 utils/stat.js
  46. +16 −16 utils/template-inheritance.js
  47. +4 −4 utils/word-problems.js
View
@@ -21,4 +21,4 @@ The process for writing exercises is rather well documented. More information ab
* [How to Get Involved](https://github.com/Khan/khan-exercises/wiki/Getting-Involved)
* [How to Write Exercises](https://github.com/Khan/khan-exercises/wiki/Exercise-Markup)
-* [How to Test Exercises](https://github.com/Khan/khan-exercises/wiki/Testing-Exercises)
+* [How to Test Exercises](https://github.com/Khan/khan-exercises/wiki/Testing-Exercises)
@@ -27,4 +27,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -13,15 +13,15 @@
<div class="problems">
<div id="original">
- <p class="question"><var>A</var> + <var>B</var></p>
+ <p class="question"><var>A</var> + <var>B</var></p>
<div class="solution"><var>A+B</var></div>
<div class="hints">
<p data-if="B < 0 ">+(<var>B</var>) = -<var>B*-1</var></p>
<p><var>A</var> + <var>B</var> = <var>A+B</var></p>
</div>
</div>
<div>
- <p class="question"><var>A</var> - <var>B</var></p>
+ <p class="question"><var>A</var> - <var>B</var></p>
<div class="solution"><var>A-B</var></div>
<div class="hints">
<p data-if="B < 0 ">-(<var>B</var>) = +<var>B*-1</var></p>
@@ -19,4 +19,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -187,4 +187,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -20,13 +20,13 @@
</div>
<div class="question">
- <var>person(1)</var> is putting <var>plural( item(1) )</var> into <var>plural( group(1) )</var>.
-
- If <var>he(1)</var> puts <var>plural( ITEMS_PER_GROUP, item(1) )</var>
+ <var>person(1)</var> is putting <var>plural( item(1) )</var> into <var>plural( group(1) )</var>.
+
+ If <var>he(1)</var> puts <var>plural( ITEMS_PER_GROUP, item(1) )</var>
in each <var>group(1)</var> <var>he(1)</var> will <var>groupVerb(1)</var>
<var>plural( GROUPS, group(1) )</var> and have
<var>plural( ITEMS_LEFT, item(1) )</var> left over.
-
+
If <var>he(1)</var> instead puts
<var>plural( NEW_ITEMS_PER_GROUP, item(1) )</var> in each
<var>group(1)</var>, how many <var>plural( group(1) )</var> of
@@ -37,20 +37,20 @@
<div class="hints">
<p>
- <var>plural( GROUPS, group(1) )</var> of
+ <var>plural( GROUPS, group(1) )</var> of
<var>plural( ITEMS_PER_GROUP, item(1) )</var> each results in
<code><var>GROUPS</var> \times <var>ITEMS_PER_GROUP</var> = <var>ITEMS_IN_GROUPS</var></code>
<var>plural( item )</var>.
</p>
-
+
<p>
- <var>plural( ITEMS_IN_GROUPS, item(1) )</var> plus
- <var>ITEMS_LEFT</var> left over equals
+ <var>plural( ITEMS_IN_GROUPS, item(1) )</var> plus
+ <var>ITEMS_LEFT</var> left over equals
<var>TOTAL_ITEMS</var> total <var>plural( item(1) )</var>.
</p>
-
+
<p>
- <var>plural( TOTAL_ITEMS, item(1) )</var>
+ <var>plural( TOTAL_ITEMS, item(1) )</var>
divided into groups of <var>NEW_ITEMS_PER_GROUP</var> is
<code><var>TOTAL_ITEMS</var> \div <var>NEW_ITEMS_PER_GROUP</var> = <var>NEW_GROUPS</var></code>
<var>plural( group(1) )</var>.
@@ -59,7 +59,7 @@
</div>
<div>
-
+
<div class="vars">
<var id="ITEM_1_COUNT">randRange( 4, 12 )</var>
<var id="ITEM_1_COST">randRange( 4, 12 )</var>
@@ -70,7 +70,7 @@
<div class="question">
<var>person(1)</var> bought <var>plural( ITEM_1_COUNT, storeItem(1, 1) )</var>,
- all costing the same amount, from the <var>store(1)</var> store.
+ all costing the same amount, from the <var>store(1)</var> store.
<var>He(1)</var> also bought a <var>storeItem(1, 2)</var> for <var>plural( ITEM_2_COST, "dollar" )</var>.
@@ -85,7 +85,7 @@
<p>
Of the <var>plural( TOTAL_SPENT, "dollar" )</var>, <var>he(1)</var> spent
<var>plural( ITEM_2_COST, "dollar" )</var> on a <var>storeItem(1, 2)</var>, so <var>he(1)</var> must have spent
- a total of <code><var>TOTAL_SPENT</var> - <var>ITEM_2_COST</var> = <var>TOTAL_SPENT_ON_1</var></code>
+ a total of <code><var>TOTAL_SPENT</var> - <var>ITEM_2_COST</var> = <var>TOTAL_SPENT_ON_1</var></code>
dollars on <var>plural( storeItem(1, 1) )</var>.
</p>
@@ -112,8 +112,8 @@
<div class="question">
When <var>person(1)</var> places <var>plural( ITEMS, item(1) )</var> in each
<var>group(1)</var> <var>he(1)</var> ends up with <var>plural( GROUPS, group(1) )</var>.
-
- If <var>he(1)</var> wants <var>plural( NEW_GROUPS, group(1) )</var>,
+
+ If <var>he(1)</var> wants <var>plural( NEW_GROUPS, group(1) )</var>,
how many <var>plural( item(1) )</var> should <var>he(1)</var> put in each <var>group(1)</var>?
</div>
@@ -81,4 +81,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -15,7 +15,7 @@
<var id="MULTIPLIER_IS_FRACTIONAL">rand(2)</var>
<var id="MULTIPLIER_VALUE">randRange(2, 9)</var>
-
+
<var id="MULTIPLIER_INVERSE">MULTIPLIER_IS_FRACTIONAL ? MULTIPLIER_VALUE : "\\frac{1}{"+MULTIPLIER_VALUE+"}"</var>
<var id="MULTIPLIER">MULTIPLIER_IS_FRACTIONAL ? "\\frac{1}{"+MULTIPLIER_VALUE+"}" : MULTIPLIER_VALUE</var>
</div>
@@ -30,7 +30,7 @@
<li><code><var>V1</var></code> and <code><var>V2</var></code> are in direct variation</li>
</ul>
</div>
-
+
<p class="problem"><var>STATEMENT</var>.</p>
<p class="question">Which of these equations could represent the relationship between <code><var>V1</var></code> and <code><var>V2</var></code>?</p>
<p class="solution"><code>
@@ -72,10 +72,10 @@
</code></li>
</ul>
</div>
-
+
<div data-type="direct-variation" id="v1-over-v2">
<p class="solution"><code>\frac{<var>V1</var>}{<var>V2</var>} = <var>MULTIPLIER</var></code></p>
-
+
<div class="hints">
<p>If you divide each side of this expression by <code><var>V2</var></code>, you get <code>\frac{<var>V1</var>}{<var>V2</var>} = k</code> for some constant <code>k</code>.</p>
<p><code>\frac{<var>V1</var>}{<var>V2</var>} = <var>MULTIPLIER</var></code> fits this pattern, with <code>k = <var>MULTIPLIER</var></code>.</p>
@@ -84,13 +84,13 @@
<div data-type="direct-variation" id="inverse-k">
<p class="solution"><code><var>MULTIPLIER</var> \cdot <var>V1</var> = <var>V2</var></code></p>
-
+
<div class="hints">
<p>If you divide each side of this expression by <code>k</code>, you get <code>\frac{1}{k} \cdot <var>V1</var> = <var>V2</var></code>.</p>
<p><code><var>MULTIPLIER</var> \cdot <var>V1</var> = <var>V2</var></code> fits this pattern, with <code>k = <var>MULTIPLIER_INVERSE</var></code>.</p>
</div>
</div>
-
+
<div id="inverse-variation">
<div class="vars">
<ul id="STATEMENT">
@@ -100,7 +100,7 @@
<li><code><var>V1</var></code> and <code><var>V2</var></code> are in inverse variation</li>
</ul>
</div>
-
+
<p class="problem"><var>STATEMENT</var>.</p>
<p class="question">Which of these equations could represent the relationship between <code><var>V1</var></code> and <code><var>V2</var></code>?</p>
<p class="solution"><code><var>V1</var> = <var>MULTIPLIER</var> \cdot \frac{1}{<var>V2</var>}</code></p>
@@ -146,7 +146,7 @@
<div data-type="inverse-variation" id="v1-v2-over-k">
<p class="solution"><code><var>V1</var> \cdot <var>V2</var> = <var>MULTIPLIER</var></code></p>
-
+
<div class="hints">
<p>If you multiply each side of this expression by <code><var>V2</var></code>, you get <code><var>V1</var> \cdot <var>V2</var> = k</code> for some constant <code>k</code>.</p>
<p><code><var>V1</var> \cdot <var>V2</var> = <var>MULTIPLIER</var></code> fits this pattern, with <code>k = <var>MULTIPLIER</var></code>.</p>
@@ -155,7 +155,7 @@
<div data-type="inverse-variation" id="k-over-a">
<p class="solution"><code><var>MULTIPLIER</var> \cdot \frac{1}{<var>V1</var>} = <var>V2</var></code></p>
-
+
<div class="hints">
<div class="transform">
<p>If you divide each side of this expression by <code>k</code>, you get <code>\frac{<var>V1</var>}{k} = \frac{1}{<var>V2</var>}</code>.</p>
@@ -167,4 +167,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -17,7 +17,7 @@
var factorization = getPrimeFactorization( NUMBER ),
num_factors = round( factorization.length / 2 ),
answer = 1;
-
+
for (var i = 0; i &lt; num_factors && factorization.length; i++) {
var index = floor( random() * factorization.length );
answer *= factorization[index];
@@ -38,7 +38,7 @@
<p class="solution"><var>ANSWER</var></p>
</div>
</div>
-
+
<div class="hints">
<p>In other words, we are looking for a number between <var>LOW</var> and <var>HIGH</var> such that <var>NUMBER</var> is divisible by it.</p>
<div>
@@ -19,19 +19,19 @@
<var id="REMAINDER">0</var>
<var id="DIVIDEND">DIVISOR*randRange(101,999)</var>
<var id="TABLE">createLongDivisionTable(DIVIDEND,DIVISOR)</var>
- </div>
+ </div>
<div class="problem">
<var>DIVIDEND</var> / <var>DIVISOR</var> = ?
</div>
- <p class="question">What is the quotient?</p>
+ <p class="question">What is the quotient?</p>
<div class="solution"><var>DIVIDEND / DIVISOR</var></div>
</div>
<div data-type="original">
<div class="vars">
<var id="REMAINDER">randRange(1,DIVISOR-1)</var>
<var id="DIVIDEND">DIVISOR*randRange(101,999)+REMAINDER</var>
<var id="TABLE">createLongDivisionTable(DIVIDEND,DIVISOR)</var>
- </div>
+ </div>
<p class="question">What is the remainder?</p>
<div class="solution"><var>REMAINDER</var></div>
</div>
@@ -66,4 +66,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -8,21 +8,21 @@
<div class="exercise">
<div class="vars">
<var id="X">randRange( 1, 10 )</var>
- <var id="COEFF">
+ <var id="COEFF">
if ( randRange( 0, 1 ) ) {
return randRange( 3, 10 );
} else {
return -1 * randRange( 3, 10 );
}
</var>
- <var id="CONSTANT">
+ <var id="CONSTANT">
if ( randRange( 0, 1 ) ) {
return randRange( 3, 10 );
} else {
return -1 * randRange( 3, 10 );
}
</var>
-
+
<var id="SOLUTION">(X * COEFF) + CONSTANT</var>
</div>
@@ -46,4 +46,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -36,7 +36,7 @@
}
return functionPath;
</var>
-
+
<var id="CORRECT_X">randRange(-9, 9)</var>
<var id="CORRECT_Y">FUNCTION_PATH[CORRECT_X + 11][1]</var>
</div>
View
@@ -26,7 +26,7 @@
for( var i = -10; i < 11; i++ ) {
if (Math.abs( randRangeNonZero( -10, 10 ) < 2 ) && functionPath[i+10][1] < 8 ) {
functionPath.push([ i, functionPath[i+10][1]+1 ]);
-
+
} else if (Math.abs( randRangeNonZero( -10, 10 ) < 2 ) && functionPath[i+10][1] > -8 ) {
functionPath.push([ i, functionPath[i+10][1]-1 ]);
@@ -53,13 +53,13 @@
for( var i = -10; i < 11; i++ ) {
if (Math.abs( randRangeNonZero( -10, 10 ) < 2 ) && gPath[i+10][1] < 8 ) {
gPath.push([i, gPath[i+10][1]+1]);
-
- } else if (Math.abs( randRangeNonZero( -10, 10 ) < 3 ) && gPath[i+10][1] > -8 ) {
+
+ } else if (Math.abs( randRangeNonZero( -10, 10 ) < 3 ) && gPath[i+10][1] > -8 ) {
gPath.push([i, gPath[i+10][1]-1]);
-
+
} else if (Math.abs( randRangeNonZero( -10, 10 ) < 2 ) && gPath[i+10][1] < 7 ) {
gPath.push([i, gPath[i+10][1]+2]);
-
+
} else if (Math.abs( randRangeNonZero( -10, 10 ) < 3 ) && gPath[i+10][1] > -7 ) {
gPath.push([i, gPath[i+10][1]-2]);
@@ -72,7 +72,7 @@
<var id="F_COEF">randRangeNonZero(-10, 10)</var>
<var id="G_COEF">randRangeNonZero(-10, 10)</var>
-
+
<var id="CORRECT_X">randRange(-9, 9)</var>
<var id="CORRECT_Y">FUNCTION_PATH[CORRECT_X + 11][1]</var>
@@ -98,7 +98,7 @@
text( G_PATH[ G_PATH.length - 2 ], "g(x)", "above" );
path( G_PATH )
</div>
-
+
<p class="solution"><var>F_COEF * CORRECT_Y + G_COEF * CORRECT_GY</var></p>
</div>
</div>
@@ -108,7 +108,7 @@
<div class="graph update" data-style="font-size: 25; stroke: orange; stroke-dash-array: 5,5; font-fill: orange;">
line( [ CORRECT_X, 0 ], FUNCTION_PATH[ CORRECT_X+11 ] );
</div>
-
+
<div class="graph update" data-style="marker: dot; marker-fill: orange;">
line( [ 0, CORRECT_Y ], FUNCTION_PATH[ CORRECT_X+11 ] );
text( [-10, 9], "f("+CORRECT_X+")="+CORRECT_Y, right );
@@ -11,26 +11,26 @@
<var id="A_START">randRange( 1, 10 )</var>
<var id="B_START">randRange( 1, 10 )</var>
<var id="FACTOR">randRange( 1, 5 )</var>
-
+
<var id="A">A_START * FACTOR</var>
<var id="B">B_START * FACTOR</var>
<var id="GCD">getGCD( A, B )</var>
<var id="A_FACTORS">toSentence(getFactors( A ))</var>
<var id="B_FACTORS">toSentence(getFactors( B ))</var>
</div>
-
+
<div class="problems">
<div>
<div class="question">
<p>What is the greatest common divisor (or factor) of <var>A</var> and <var>B</var>?</p>
<p>Another way to say this is: </p>
<p>GCD(<var>A</var>, <var>B</var>) = ?</p>
</div>
-
+
<p class="solution"><var>GCD</var></p>
</div>
</div>
-
+
<div class="hints">
<p>The greatest common divisor is the largest number that is a factor (or divisor) of both <var>A</var> and <var>B</var>.</p>
<p>The factors (or divisors) of <var>A</var> are <var>A_FACTORS</var>.</p>
@@ -41,4 +41,4 @@
</div>
</div>
</body>
-</html>
+</html>
Oops, something went wrong.

0 comments on commit cf02179

Please sign in to comment.