Permalink
Browse files

Whitespace :)

  • Loading branch information...
1 parent a897b82 commit c2cb4db0ebe89f33067e0104cc3b7d62edb6964b @sophiebits sophiebits committed Dec 8, 2011
Showing with 1,037 additions and 1,042 deletions.
  1. +3 −3 build/kathjax-config.js
  2. +39 −39 exercises/adding_and_subtracting_decimals_word_problems.html
  3. +2 −2 exercises/adding_and_subtracting_negative_numbers.html
  4. +6 −6 exercises/adding_and_subtracting_polynomials.html
  5. +1 −1 exercises/adding_and_subtracting_radicals.html
  6. +1 −1 exercises/adding_negative_numbers.html
  7. +1 −1 exercises/addition_2.html
  8. +29 −29 exercises/addition_rule_of_probability.html
  9. +2 −2 exercises/age_word_problems.html
  10. +21 −21 exercises/angle_bisector_theorem.html
  11. +2 −2 exercises/angle_types.html
  12. +123 −123 exercises/angles_1.html
  13. +1 −1 exercises/angles_of_a_polygon.html
  14. +3 −3 exercises/arithmetic_word_problems_2.html
  15. +2 −2 exercises/changing_decimals_to_percents.html
  16. +2 −2 exercises/changing_fractions_to_decimals_1.html
  17. +1 −1 exercises/changing_percents_to_decimals.html
  18. +2 −2 exercises/changing_percents_to_fractions.html
  19. +17 −17 exercises/circles_1.html
  20. +3 −3 exercises/circumradius.html
  21. +2 −2 exercises/comparing_absolute_values.html
  22. +1 −1 exercises/complementary_angles.html
  23. +1 −1 exercises/completing_the_square_1.html
  24. +1 −1 exercises/completing_the_square_2.html
  25. +12 −12 exercises/compound_inequalities.html
  26. +10 −10 exercises/congruent_triangles_1.html
  27. +4 −4 exercises/congruent_triangles_2.html
  28. +2 −2 exercises/converting_decimals_to_fractions_1.html
  29. +1 −1 exercises/converting_decimals_to_fractions_2.html
  30. +1 −1 exercises/converting_decimals_to_percents.html
  31. +3 −3 exercises/converting_mixed_numbers_and_improper_fractions.html
  32. +1 −1 exercises/converting_percents_to_decimals.html
  33. +1 −1 exercises/converting_repeating_decimals_to_fractions_1.html
  34. +1 −1 exercises/converting_repeating_decimals_to_fractions_2.html
  35. +3 −3 exercises/decimals_on_the_number_line.html
  36. +1 −1 exercises/distance_formula.html
  37. +246 −246 exercises/distributive_property_with_variables.html
  38. +4 −4 exercises/divisibility_0.5.html
  39. +4 −4 exercises/equivalent_fractions.html
  40. +5 −5 exercises/equivalent_fractions_2.html
  41. +1 −1 exercises/estimation_with_decimals.html
  42. +1 −1 exercises/evaluating_expressions_2.html
  43. +2 −2 exercises/even_and_odd_integers.html
  44. +2 −2 exercises/fractions_cut_and_copy_1.html
  45. +5 −5 exercises/fractions_cut_and_copy_2.html
  46. +7 −7 exercises/fractions_on_the_number_line.html
  47. +1 −1 exercises/graphing_points_2.html
  48. +4 −4 exercises/herons_formula.html
  49. +1 −1 exercises/inequalities_on_a_number_line.html
  50. +3 −3 exercises/interpreting_linear_equations.html
  51. +5 −5 exercises/kinematic_equations.html
  52. +5 −5 exercises/line_relationships.html
  53. +4 −4 exercises/linear_equation_word_problems.html
  54. +1 −1 exercises/measuring_angles.html
  55. +1 −1 exercises/multiplication_0.5.html
  56. +4 −4 exercises/multiplying_expressions_1.html
  57. +11 −11 exercises/multiplying_polynomials.html
  58. +1 −1 exercises/multiplying_radicals.html
  59. +1 −1 exercises/one_step_equations.html
  60. +6 −6 exercises/one_step_equations_0.5.html
  61. +2 −2 exercises/parabola_intuition_1.html
  62. +1 −1 exercises/parabola_intuition_2.html
  63. +1 −1 exercises/plugging_in_values.html
  64. +2 −2 exercises/point_slope_form.html
  65. +24 −24 exercises/polygon_intuition.html
  66. +2 −2 exercises/quadratic_equation.html
  67. +7 −7 exercises/quadratic_inequalities_1.html
  68. +23 −23 exercises/quadrilateral_angles.html
  69. +7 −7 exercises/quadrilateral_types.html
  70. +1 −1 exercises/rate_problems_2.html
  71. +1 −1 exercises/recognizing_percents.html
  72. +2 −2 exercises/recognizing_rays_lines_and_line_segments.html
  73. +3 −3 exercises/rounding_numbers.html
  74. +4 −4 exercises/similar_triangles_1.html
  75. +5 −5 exercises/solutions_to_systems_of_equations.html
  76. +1 −1 exercises/special_derivatives.html
  77. +9 −9 exercises/squares_and_rectangles.html
  78. +2 −2 exercises/systems_of_equations_with_elimination.html
  79. +5 −5 exercises/systems_of_equations_with_elimination_0.5.html
  80. +6 −6 exercises/systems_of_equations_with_substitution.html
  81. +9 −9 exercises/triangle_angles_1.html
  82. +1 −1 exercises/trig_identities_1.html
  83. +2 −2 exercises/trigonometry_2.html
  84. +1 −1 exercises/writing_expressions_2.html
  85. +106 −106 jquery-ui.js
  86. +54 −55 jquery.js
  87. +0 −1 test/exercises/power_rule.js
  88. +3 −3 utils/answer-types.js
  89. +11 −11 utils/convert-values.js
  90. +38 −38 utils/exercise_maker.html
  91. +5 −5 utils/exponents.js
  92. +5 −5 utils/expressions.js
  93. +36 −37 utils/graphie-geometry.js
  94. +0 −1 utils/graphie-helpers-arithmetic.js
  95. +3 −3 utils/graphie-helpers.js
  96. +1 −1 utils/graphie-polygon.js
  97. +2 −2 utils/graphie.js
  98. +2 −3 utils/math-format.js
  99. +6 −6 utils/math.js
  100. +9 −9 utils/polynomials.js
  101. +1 −1 utils/slice-clone.js
  102. +3 −3 utils/spin.js
View
@@ -62,7 +62,7 @@ MathJax.Ajax.timeout = 60 * 1000;
MathJax.Ajax.loadError = (function( oldLoadError ) {
return function( file ) {
Khan.warnTimeout();
- // Otherwise will receive unresponsive script error when finally finish loading
+ // Otherwise will receive unresponsive script error when finally finish loading
MathJax.Ajax.loadComplete = function( file ) { };
oldLoadError.call( this, file );
};
@@ -84,9 +84,9 @@ MathJax.Message.Init = (function( oldInit ) {
}
}
}
-
+
oldInit.call( this, styles );
};
})( MathJax.Message.Init );
-MathJax.Hub.Startup.onload();
+MathJax.Hub.Startup.onload();
@@ -9,7 +9,7 @@
<div class="exercise">
<div class="problems">
<div>
-
+
<div class="vars">
<var id="A">randRange(5,9)*100</var>
<var id="B">randRange(1,9)*10</var>
@@ -23,16 +23,16 @@
<var id="fruit_2_integer">D+E+F</var>
<var id="fruit_2_decimal">(2)</var>
<var id="fruit_2">truncate_to_max(fruit_2_integer*pow(10,-fruit_2_decimal), 2)</var>
- <var id="solution">truncate_to_max((fruit_1+fruit_2),2)</var>
+ <var id="solution">truncate_to_max((fruit_1+fruit_2),2)</var>
<var id="DUMMY">[]</var>
</div>
- <div class="question spin">
+ <div class="question spin">
<p>{On a sunny morning|On a beautiful afternoon}, <var>person(1)</var> rode <var>his(1)</var> bicycle to a farm that sold bags of <var>plural(fruit(1))</var> for $<var>fruit_1</var> each and bags of <var>plural(fruit(2))</var> for $<var>fruit_2</var> each.</p>
<p><var>person(1)</var> decided to buy a bag of <var>plural(fruit(1))</var> and a bag of <var>plural(fruit(2))</var> {before heading home|because those were <var>his(1)</var> favorite kinds of fruit|}.</p>
<p class="question">How much did <var>person(1)</var> need to pay for <var>his(1)</var> produce?</p></div>
-
-
+
+
<div class="solution"><var>fruit_1+fruit_2</var></div>
<div class="hints">
@@ -46,13 +46,13 @@
<div class="graphie" data-update="numbers" data-each="DecimalAdder.numHintsFor( fruit_1_integer, fruit_1_decimal, fruit_2_integer, fruit_2_decimal ) times">
graph.adder.showHint();
</div>
-
+
<p class="solution"><var>person(1)</var> needs to pay $<var>solution</var>.</p>
</div>
</div>
-
+
<div>
-
+
<div class="vars">
<var id="meters">randRange(1, 3)*100</var>
<var id="time_1_integer">randRange(2000,9999)</var>
@@ -65,9 +65,9 @@
<var id="time_3_decimal">(2)</var>
<var id="time_3">truncate_to_max(time_3_integer*pow(10,-time_3_decimal), 2)</var>
<var id="DUMMY">[]</var>
- <var id="solution">truncate_to_max((time_1-time_2),2)</var>
+ <var id="solution">truncate_to_max((time_1-time_2),2)</var>
</div>
-
+
<div class="question spin">
<p>{On Monday|Last week}, <var>person(1)</var> and <var>person(2)</var> decided to see how fast they could sprint <var>meters</var> meters. They asked their friend <var>person(3)</var> to time them with a stopwatch.</p>
<p>{After <var>time_3</var> minutes, <var>person(3)</var> agreed to time the runners</var>.|} <var>person(1)</var> sprinted first and ran <var>meters</var> meters in <var>time_1</var> seconds. When it was <var>person(2)</var>'s turn, <var>he(2)</var> sped off and completed the run in <var>time_2</var> seconds.</p>
@@ -89,10 +89,10 @@
<p class="solution"><var>person(2)</var> was <var>solution</var> seconds faster than <var>person(1)</var>.</p>
</div>
</div>
-
+
<div>
-
-
+
+
<div class="vars">
<var id="G">randRange(2,6)*100</var>
<var id="H">randRange(1,9)*10</var>
@@ -108,16 +108,16 @@
<var id="weight_2">truncate_to_max(weight_2_integer*pow(10,-weight_2_decimal), 2)</var>
<var id="height_1">randRange(16.5,22.5)</var>
<var id="height_2">randRange(16.5,22.5)</var>
- <var id="solution">truncate_to_max((weight_1+weight_2),2)</var>
+ <var id="solution">truncate_to_max((weight_1+weight_2),2)</var>
<var id="DUMMY">[]</var>
</div>
<div class="question spin">
<p>{Last Monday|On Saturday}, <var>person(1)</var>'s parents gave birth to twins and named them <var>person(2)</var> and <var>person(3)</var>. When they were first born, <var>person(2)</var> weighed <var>weight_1</var> pounds{ and was <var>height_1</var> inches tall|}, and <var>person(3)</var> weighed <var>weight_2</var> pounds {and was <var>height_2</var> inches tall|}.</p>
<p class="question">How much did the babies weigh in total?</p>
-
- </div>
-
+
+ </div>
+
<div class="solution"><var>weight_1+weight_2</var></div>
<div class="hints">
@@ -131,17 +131,17 @@
<div class="graphie" data-update="numbers" data-each="DecimalAdder.numHintsFor( weight_1_integer, weight_1_decimal, weight_2_integer, weight_2_decimal ) times">
graph.adder.showHint();
</div>
-
+
<div class="graphie" data-update="numbers" data-each="DUMMY as dummy">
graph.adder.showHint();</div>
<p class="solution">Together, the babies weigh <var>solution</var> pounds.</p>
</div>
</div>
-
-
+
+
<div>
-
-
+
+
<div class="vars">
<var id="M">randRange(1,9)*100</var>
<var id="N">randRange(1,9)*10</var>
@@ -156,7 +156,7 @@
<var id="price_1_decimal">(2)</var>
<var id="price_1">truncate_to_max(price_1_integer*pow(10,-price_1_decimal), 2)</var>
<var id="time_1">randRange(3, 30)</var>
- <var id="solution">truncate_to_max((amount_paid-price_1),2)</var>
+ <var id="solution">truncate_to_max((amount_paid-price_1),2)</var>
<var id="DUMMY">[]</var>
</div>
@@ -180,10 +180,10 @@
<p class="solution"><var>person(1)</var> received $<var>solution</var> in change.</p>
</div>
</div>
-
+
<div>
-
-
+
+
<div class="vars">
<var id="rain_1_integer">randRange(101,999)</var>
<var id="rain_1_decimal">(2)</var>
@@ -193,11 +193,11 @@
<var id="rain_2">truncate_to_max(rain_2_integer*pow(10,-rain_2_decimal), 2)</var>
<var id="snow_1">randRange(2.1,15.89)</var>
<var id="DUMMY">[]</var>
- <var id="solution">truncate_to_max((rain_2-rain_1),2)</var>
+ <var id="solution">truncate_to_max((rain_2-rain_1),2)</var>
</div>
<div class="question spin">
- <p>During a recent rainstorm, <var>rain_1</var> inches of rain fell in <var>person(1)</var>'s hometown, and <var>rain_2</var> inches of rain fell in <var>person(2)</var>'s hometown. {During the same storm, <var>snow_1</var> inches of snow fell in <var>person(3)</var>'s hometown.|}</p>
+ <p>During a recent rainstorm, <var>rain_1</var> inches of rain fell in <var>person(1)</var>'s hometown, and <var>rain_2</var> inches of rain fell in <var>person(2)</var>'s hometown. {During the same storm, <var>snow_1</var> inches of snow fell in <var>person(3)</var>'s hometown.|}</p>
<p class="question">How much more rain fell in <var>person(2)</var>'s town than in <var>person(1)</var>'s town?</p>
</div>
<div class="solution"><var>rain_2-rain_1</var></div>
@@ -216,26 +216,26 @@
<p class="solution"><var>person(2)</var>'s town received <var>solution</var> inches more rain than <var>person(1)</var>'s town.</p>
</div>
</div>
-
-
+
+
<div>
-
+
<div class="vars">
<var id="distance_1_integer">randRange(100,2000)</var>
<var id="distance_1_decimal">(2)</var>
<var id="distance_1">truncate_to_max(distance_1_integer*pow(10,-distance_1_decimal), 2)</var>
<var id="distance_2_integer" data-ensure="distance_1_integer>distance_2_integer">randRange(100,2000)</var>
<var id="distance_2_decimal">(2)</var>
<var id="distance_2">truncate_to_max(distance_2_integer*pow(10,-distance_2_decimal), 2)</var>
- <var id="solution">truncate_to_max((distance_1+distance_2),2)</var>
+ <var id="solution">truncate_to_max((distance_1+distance_2),2)</var>
<var id="time_1">randRange(20.2,52.17)</var>
<var id="DUMMY">[]</var>
</div>
<div class="question spin">
<p>{To get to school each morning|To get to work each morning|To visit <var>his(1)</var> grandmother}, <var>person(1)</var> takes <var>an(vehicle(1))</var> <var>distance_1</var> <var>plural(distance(1))</var> and <var>an(vehicle(2))</var> <var>distance_2</var> <var>plural(distance(1))</var>. {In total, the journey takes <var>time_1</var> minutes.|}</p>
<p class="question">How many <var>plural(distance(1))</var> is <var>person(1)</var>'s journey in total?</p>
- </div>
+ </div>
<div class="solution"><var>distance_1+distance_2</var></div>
<div class="hints">
@@ -249,17 +249,17 @@
<div class="graphie" data-update="numbers" data-each="DecimalAdder.numHintsFor( distance_1_integer, distance_1_decimal, distance_2_integer, distance_2_decimal ) times">
graph.adder.showHint();
</div>
-
+
<div class="graphie" data-update="numbers" data-each="DUMMY as dummy">
graph.adder.showHint();</div>
<p class="solution"><var>person(1)</var> travels <var>solution</var> <var>plural(distance(1))</var> in total.</p>
</div>
</div>
</div>
-
-
-
-
+
+
+
+
</body>
-
+
</html>
@@ -57,7 +57,7 @@
<div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -1],
- "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
+ "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
+ "\\color{#FF00AF}{" + ANSWER + "}}",
"right" );
</div>
@@ -107,7 +107,7 @@
<div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -1],
- "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{ +" + abs( B ) + "} = "
+ "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{ +" + abs( B ) + "} = "
+ "\\color{#FF00AF}{" + ANSWER + "}}",
"right" );
</div>
@@ -8,23 +8,23 @@
function getFakeAnswers( solution ) {
var answers = [];
for ( var i = 0; i < solution.getNumberOfTerms(); i++ ) {
- var coefs = [];
+ var coefs = [];
for ( var j = 0; j < solution.getNumberOfTerms(); j++ ) {
var term = solution.getCoefAndDegreeForTerm( j );
if ( i === j ) {
coefs[ term.degree ] = KhanUtil.randRangeNonZero( -7, 7 );
} else {
- coefs[ term.degree ] = term.coef;
+ coefs[ term.degree ] = term.coef;
}
}
-
+
for ( var j = 0; j < coefs.length; j++ ) {
if ( coefs[ j ] === undefined ) {
coefs[ j ] = 0;
}
- }
+ }
answers.push( new KhanUtil.Polynomial(0, solution.maxDegree, coefs, solution.variable) );
}
@@ -48,7 +48,7 @@
if ( i === NON_ZERO_INDICES[ j ] ) {
value = randRangeNonZero( -7, 7 );
break;
- }
+ }
}
coefs[ i ] = value;
}
@@ -61,7 +61,7 @@
<div id="add">
<div class="vars">
<var id="SIGN">"+"</var>
- <var id="SOLUTION">POL_1.add( POL_2 )</var>
+ <var id="SOLUTION">POL_1.add( POL_2 )</var>
<var id="FAKE_ANSWERS">getFakeAnswers( SOLUTION )</var>
</div>
@@ -108,4 +108,4 @@
</div>
</div>
</body>
-</html>
+</html>
@@ -57,7 +57,7 @@
<div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -2],
- "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
+ "\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
+ "\\color{#FF00AF}{" + ANSWER + "}}",
"right" );
</div>
@@ -12,7 +12,7 @@
<var id="A_1">randRange ( 0, 9 )*1</var>
<var id="B_10" data-ensure="B_10+A_10<100">randRange( 1, 8 )*10</var>
<var id="B_1" data-ensure="B_1+A_1<10">randRange ( 0, 9 )*1</var>
-
+
<var id="A">A_10+A_1</var>
<var id="B">B_10+B_1</var>
<var id="DUMMY">[]</var>
Oops, something went wrong.

0 comments on commit c2cb4db

Please sign in to comment.