Skip to content
Browse files

Clean up the exercise files using the new cleaning utility. (II)

  • Loading branch information...
1 parent 24e8a35 commit 0f0c6307686be8781cdf452a1bcfdde03da79adb @cbhl cbhl committed Apr 16, 2013
Showing with 2,242 additions and 2,242 deletions.
  1. +2 −2 exercises/absolute_value.html
  2. +8 −8 exercises/absolute_value_equations.html
  3. +3 −3 exercises/absolute_value_of_complex_numbers.html
  4. +4 −4 exercises/adding_and_subtracting_complex_numbers.html
  5. +21 −21 exercises/adding_and_subtracting_decimals_word_problems.html
  6. +3 −3 exercises/adding_and_subtracting_fractions.html
  7. +13 −13 exercises/adding_and_subtracting_negative_numbers.html
  8. +6 −6 exercises/adding_and_subtracting_polynomials.html
  9. +4 −4 exercises/adding_and_subtracting_radicals.html
  10. +10 −10 exercises/adding_and_subtracting_rational_expressions.html
  11. +8 −8 exercises/adding_and_subtracting_rational_expressions_2.html
  12. +4 −4 exercises/adding_decimals.html
  13. +4 −4 exercises/adding_decimals_0.5.html
  14. +5 −5 exercises/adding_decimals_2.html
  15. +4 −4 exercises/adding_fractions.html
  16. +5 −5 exercises/adding_fractions_with_common_denominators.html
  17. +7 −7 exercises/adding_negative_numbers.html
  18. +2 −2 exercises/adding_subtracting_mixed_numbers_0.5.html
  19. +2 −2 exercises/adding_subtracting_mixed_numbers_1.html
  20. +7 −7 exercises/adding_vectors.html
  21. +4 −4 exercises/addition_1.html
  22. +5 −5 exercises/addition_2.html
  23. +6 −6 exercises/addition_3.html
  24. +6 −6 exercises/addition_4.html
  25. +9 −9 exercises/age_word_problems.html
  26. +9 −9 exercises/age_word_problems_alternative.html
  27. +4 −4 exercises/alternate_exterior_angles.html
  28. +1 −1 exercises/alternate_exterior_angles_2.html
  29. +4 −4 exercises/alternate_interior_angles.html
  30. +1 −1 exercises/alternate_interior_angles_2.html
  31. +9 −9 exercises/angle_addition_postulate.html
  32. +6 −6 exercises/angle_bisector_theorem.html
  33. +10 −10 exercises/angle_types.html
  34. +35 −35 exercises/angles_1.html
  35. +18 −18 exercises/angles_2.html
  36. +9 −9 exercises/angles_of_a_polygon.html
  37. +18 −18 exercises/area_1.html
  38. +13 −13 exercises/area_of_a_circle.html
  39. +6 −6 exercises/area_of_parallelograms.html
  40. +13 −13 exercises/area_of_squares_and_rectangles.html
  41. +17 −17 exercises/area_of_triangles_1.html
  42. +10 −10 exercises/areas_of_circles_and_sectors.html
  43. +8 −8 exercises/areas_of_trapezoids_rhombi_and_kites.html
  44. +2 −2 exercises/arithmetic_sequences_1.html
  45. +4 −4 exercises/arithmetic_sequences_2.html
  46. +7 −7 exercises/arithmetic_series.html
  47. +8 −8 exercises/arithmetic_word_problems.html
  48. +26 −26 exercises/arithmetic_word_problems_1.html
  49. +16 −16 exercises/arithmetic_word_problems_2.html
  50. +4 −4 exercises/average_word_problems.html
  51. +4 −4 exercises/axis_of_symmetry.html
  52. +99 −99 exercises/balancing_chemical_equations.html
  53. +4 −4 exercises/basic_set_notation.html
  54. +5 −5 exercises/binomial_expansion.html
  55. +3 −3 exercises/chain_rule_1.html
  56. +9 −9 exercises/circles_and_arcs.html
  57. +8 −8 exercises/coin_flip_sequences.html
  58. +4 −4 exercises/combinations_1.html
  59. +11 −11 exercises/combining_like_terms_1.html
  60. +11 −11 exercises/combining_like_terms_2.html
  61. +4 −4 exercises/comparing_absolute_values.html
  62. +9 −9 exercises/comparing_fractions_1.html
  63. +4 −4 exercises/comparing_fractions_2.html
  64. +5 −5 exercises/comparing_improper_fractions_and_mixed_numbers.html
  65. +1 −1 exercises/complementary_and_supplementary_angles.html
  66. +2 −2 exercises/complementary_angles.html
  67. +6 −6 exercises/completing_the_square_1.html
  68. +7 −7 exercises/completing_the_square_2.html
  69. +6 −6 exercises/complex_number_polar_form_intuition.html
  70. +5 −5 exercises/complex_plane_operations.html
  71. +2 −2 exercises/composite_numbers.html
  72. +2 −2 exercises/compound_inequalities.html
  73. +2 −2 exercises/conditional_statements_2.html
  74. +3 −3 exercises/conditional_statements_and_truth_value.html
  75. +9 −9 exercises/congruency_postulates.html
  76. +6 −6 exercises/congruent_angles.html
  77. +2 −2 exercises/congruent_segments.html
  78. +7 −7 exercises/congruent_triangles_1.html
  79. +3 −3 exercises/congruent_triangles_2.html
  80. +44 −44 exercises/constructions_1.html
  81. +7 −7 exercises/converse_inverse_and_contrapositive.html
  82. +4 −4 exercises/converting_between_point_slope_and_slope_intercept.html
  83. +7 −7 exercises/converting_between_point_slope_and_standard_form.html
  84. +6 −6 exercises/converting_between_slope_intercept_and_standard_form.html
  85. +3 −3 exercises/converting_decimals_to_fractions_1.html
  86. +2 −2 exercises/converting_decimals_to_fractions_2.html
  87. +1 −1 exercises/converting_decimals_to_percents.html
  88. +4 −4 exercises/converting_fractions_to_decimals.html
  89. +3 −3 exercises/converting_mixed_numbers_and_improper_fractions.html
  90. +1 −1 exercises/converting_percents_to_decimals.html
  91. +2 −2 exercises/converting_repeating_decimals_to_fractions_1.html
  92. +8 −8 exercises/converting_repeating_decimals_to_fractions_2.html
  93. +5 −5 exercises/converting_temperatures.html
  94. +3 −3 exercises/corresponding_angles.html
  95. +1 −1 exercises/corresponding_angles_2.html
  96. +7 −7 exercises/counting_1.html
  97. +11 −11 exercises/counting_1_alternative.html
  98. +4 −4 exercises/counting_2.html
  99. +3 −3 exercises/creating_bar_charts_1.html
  100. +10 −10 exercises/creating_box_and_whisker_plots.html
  101. +5 −5 exercises/cube_roots.html
  102. +4 −4 exercises/decimals_on_the_number_line_1.html
  103. +5 −5 exercises/decimals_on_the_number_line_2.html
  104. +9 −9 exercises/defined_and_undefined_matrix_operations.html
  105. +3 −3 exercises/degrees_to_radians.html
  106. +5 −5 exercises/dependent_probability.html
  107. +9 −9 exercises/derivative_intuition.html
  108. +4 −4 exercises/derivatives_1.html
  109. +28 −28 exercises/dice_probability.html
  110. +5 −5 exercises/direct_and_inverse_variation.html
  111. +6 −6 exercises/discount_tax_and_tip_word_problems.html
  112. +16 −16 exercises/distance_between_point_and_line.html
  113. +7 −7 exercises/distance_formula.html
  114. +3 −3 exercises/distributive_property.html
  115. +5 −5 exercises/dividing_complex_numbers.html
  116. +4 −4 exercises/dividing_decimals.html
  117. +6 −6 exercises/dividing_decimals_0.5.html
  118. +5 −5 exercises/dividing_decimals_1.html
  119. +5 −5 exercises/dividing_decimals_2.html
  120. +3 −3 exercises/dividing_fractions.html
  121. +3 −3 exercises/dividing_fractions_0.5.html
  122. +3 −3 exercises/dividing_fractions_alternative.html
  123. +7 −7 exercises/dividing_fractions_word_problems.html
  124. +9 −9 exercises/dividing_polynomials_by_binomials_1.html
  125. +4 −4 exercises/dividing_polynomials_by_binomials_2.html
  126. +10 −10 exercises/dividing_polynomials_by_binomials_3.html
  127. +3 −3 exercises/divisibility.html
  128. +3 −3 exercises/divisibility_0.5.html
  129. +11 −11 exercises/divisibility_intuition.html
  130. +27 −27 exercises/divisibility_tests.html
  131. +5 −5 exercises/division_0.5.html
  132. +3 −3 exercises/division_1.5.html
  133. +5 −5 exercises/division_1.html
  134. +3 −3 exercises/division_2.html
  135. +5 −5 exercises/division_3.html
  136. +3 −3 exercises/division_4.html
  137. +7 −7 exercises/domain_and_range_0.5.html
  138. +22 −22 exercises/domain_of_a_function.html
  139. +31 −31 exercises/empirical_rule.html
  140. +4 −4 exercises/equation_of_a_circle_1.html
  141. +4 −4 exercises/equation_of_a_circle_2.html
  142. +5 −5 exercises/equation_of_a_hyperbola.html
  143. +5 −5 exercises/equation_of_a_line.html
  144. +6 −6 exercises/equation_of_an_ellipse.html
  145. +5 −5 exercises/equivalent_fractions.html
  146. +5 −5 exercises/equivalent_fractions_2.html
  147. +5 −5 exercises/estimation_with_decimals.html
  148. +1 −1 exercises/evaluating_expressions_1.html
  149. +2 −2 exercises/evaluating_expressions_2.html
  150. +8 −8 exercises/even_and_odd_functions.html
  151. +8 −8 exercises/expected_value.html
  152. +19 −19 exercises/exploring_angle_pairs_1.html
  153. +6 −6 exercises/exploring_mean_and_median.html
  154. +3 −3 exercises/exploring_standard_deviation_1.html
  155. +9 −9 exercises/exponent_rules.html
  156. +2 −2 exercises/exponents_1.html
  157. +1 −1 exercises/exponents_2.html
  158. +3 −3 exercises/exponents_2_alternative.html
  159. +1 −1 exercises/exponents_3.html
  160. +2 −2 exercises/exponents_4.html
  161. +2 −2 exercises/expressing_ratios_as_fractions.html
  162. +1 −1 exercises/expressions_with_unknown_variables.html
  163. +1 −1 exercises/expressions_with_unknown_variables_2.html
  164. +7 −7 exercises/factor_expressions_by_grouping.html
  165. +3 −3 exercises/factoring_difference_of_squares_1.html
  166. +4 −4 exercises/factoring_difference_of_squares_2.html
  167. +26 −26 exercises/factoring_difference_of_squares_3.html
  168. +10 −10 exercises/factoring_linear_binomials.html
  169. +4 −4 exercises/factoring_polynomials_1.html
  170. +4 −4 exercises/factoring_polynomials_1_solution_only.html
  171. +4 −4 exercises/factoring_polynomials_1_steps_only.html
  172. +5 −5 exercises/factoring_polynomials_1_video_hint.html
  173. +3 −3 exercises/factoring_polynomials_2.html
  174. +13 −13 exercises/factoring_polynomials_by_grouping_1.html
  175. +3 −3 exercises/factoring_polynomials_with_two_variables.html
  176. +6 −6 exercises/fraction_word_problems_1.html
  177. +8 −8 exercises/fractions_cut_and_copy_1.html
  178. +15 −15 exercises/fractions_cut_and_copy_2.html
  179. +4 −4 exercises/fractions_on_the_number_line_1.html
  180. +7 −7 exercises/fractions_on_the_number_line_2.html
  181. +7 −7 exercises/fractions_on_the_number_line_3.html
  182. +5 −5 exercises/functions_1.html
  183. +2 −2 exercises/functions_2.html
  184. +3 −3 exercises/functions_3.html
  185. +3 −3 exercises/geometric_sequences_1.html
  186. +5 −5 exercises/geometric_sequences_2.html
  187. +2 −2 exercises/geometry_proofs_1.html
  188. +3 −3 exercises/geometry_proofs_2.html
  189. +7 −7 exercises/geometry_proofs_intro.html
  190. +4 −4 exercises/graphing_circles.html
  191. +4 −4 exercises/graphing_circles_2.html
  192. +12 −12 exercises/graphing_inequalities.html
  193. +16 −16 exercises/graphing_inequalities_2.html
  194. +20 −20 exercises/graphing_linear_equations.html
  195. +7 −7 exercises/graphing_parabolas_0.5.html
  196. +10 −10 exercises/graphing_parabolas_1.html
  197. +11 −11 exercises/graphing_parabolas_2.html
  198. +7 −7 exercises/graphing_points.html
  199. +11 −11 exercises/graphing_points_2.html
  200. +15 −15 exercises/graphing_systems_of_equations.html
  201. +23 −23 exercises/graphing_systems_of_inequalities.html
  202. +28 −28 exercises/graphing_systems_of_inequalities_2.html
  203. +4 −4 exercises/graphs_of_inequalities.html
  204. +8 −8 exercises/graphs_of_sine_and_cosine.html
  205. +3 −3 exercises/greatest_common_divisor.html
  206. +5 −5 exercises/greatest_common_divisor_alternative.html
  207. +1 −1 exercises/herons_formula.html
  208. +31 −31 exercises/ideal_stoichiometry.html
  209. +4 −4 exercises/identifying_points_1.html
  210. +5 −5 exercises/identifying_points_2.html
  211. +4 −4 exercises/imaginary_unit_powers.html
  212. +4 −4 exercises/independent_probability.html
  213. +7 −7 exercises/inequalities_on_a_number_line.html
  214. +11 −11 exercises/inscribed_angles_1.html
  215. +14 −14 exercises/inscribed_angles_2.html
  216. +14 −14 exercises/inscribed_angles_3.html
  217. +2 −2 exercises/integer_sums.html
  218. +6 −6 exercises/interesting_perimeter_problems.html
  219. +12 −12 exercises/interpreting_linear_equations.html
  220. +3 −3 exercises/inverse_trig_functions.html
  221. +4 −4 exercises/inverses_of_functions.html
  222. +27 −27 exercises/khan-exercise.html
  223. +15 −15 exercises/khan-site.html
  224. +16 −16 exercises/law_of_cosines.html
  225. +17 −17 exercises/law_of_sines.html
  226. +2 −2 exercises/least_common_multiple.html
  227. +28 −28 exercises/least_common_multiple_and_greatest_common_divisor_word_problems.html
  228. +3 −3 exercises/lhopitals_rule.html
  229. +32 −32 exercises/limiting_reagent_stoichiometry.html
  230. +11 −11 exercises/limits_1.html
  231. +10 −10 exercises/limits_2.html
  232. +12 −12 exercises/line_graph_intuition.html
  233. +24 −24 exercises/line_relationships.html
  234. +10 −10 exercises/linear_equation_word_problems.html
  235. +5 −5 exercises/linear_equations_1.html
  236. +2 −2 exercises/linear_equations_2.html
  237. +4 −4 exercises/linear_equations_3.html
  238. +5 −5 exercises/linear_equations_4.html
  239. +5 −5 exercises/linear_inequalities.html
  240. +3 −3 exercises/logarithms_1.5.html
  241. +2 −2 exercises/logarithms_1.html
  242. +4 −4 exercises/logarithms_2.html
  243. +3 −3 exercises/logical_arguments_deductive_reasoning.html
  244. +5 −5 exercises/markup_and_commission_word_problems.html
  245. +9 −9 exercises/matrix_addition_and_subtraction.html
  246. +2 −2 exercises/matrix_determinant_2x2.html
  247. +3 −3 exercises/matrix_determinant_2x2_video_hint.html
  248. +2 −2 exercises/matrix_determinant_3x3.html
  249. +3 −3 exercises/matrix_determinant_3x3_video_hint.html
  250. +5 −5 exercises/matrix_dimensions.html
  251. +5 −5 exercises/matrix_inverse_2x2.html
  252. +6 −6 exercises/matrix_inverse_3x3.html
  253. +17 −17 exercises/matrix_transpose.html
  254. +3 −3 exercises/mean_median_and_mode.html
  255. +3 −3 exercises/measuring_angles.html
  256. +2 −2 exercises/measuring_segments.html
  257. +16 −16 exercises/midpoint_formula.html
  258. +4 −4 exercises/midpoint_of_a_segment.html
  259. +6 −6 exercises/multiplication_0.5.html
  260. +2 −2 exercises/multiplication_1.5.html
  261. +5 −5 exercises/multiplication_1.html
  262. +2 −2 exercises/multiplication_2.html
  263. +2 −2 exercises/multiplication_3.html
  264. +3 −3 exercises/multiplication_4.html
  265. +11 −11 exercises/multiplying_a_matrix_by_a_matrix.html
  266. +8 −8 exercises/multiplying_a_matrix_by_a_vector.html
  267. +12 −12 exercises/multiplying_and_dividing_complex_number_polar_forms.html
  268. +2 −2 exercises/multiplying_and_dividing_negative_numbers.html
  269. +6 −6 exercises/multiplying_and_dividing_scientific_notation.html
  270. +3 −3 exercises/multiplying_complex_numbers.html
  271. +4 −4 exercises/multiplying_decimals.html
  272. +2 −2 exercises/multiplying_expressions_0.5.html
  273. +2 −2 exercises/multiplying_expressions_1.html
  274. +5 −5 exercises/multiplying_fractions.html
  275. +5 −5 exercises/multiplying_fractions_0.5.html
  276. +17 −17 exercises/multiplying_fractions_word_problems.html
  277. +4 −4 exercises/multiplying_mixed_numbers_1.html
  278. +3 −3 exercises/multiplying_polynomials.html
  279. +5 −5 exercises/multiplying_radicals.html
  280. +25 −25 exercises/multistep_equations_with_distribution.html
  281. +11 −11 exercises/negative_number_word_problems.html
  282. +1 −1 exercises/new_definitions_1.html
  283. +4 −4 exercises/new_definitions_2.html
  284. +4 −4 exercises/number_line.html
  285. +7 −7 exercises/number_line_2.html
  286. +5 −5 exercises/number_line_3.html
  287. +10 −10 exercises/number_properties_terminology_1.html
  288. +13 −13 exercises/one_step_equation_intuition.html
  289. +4 −4 exercises/one_step_equations.html
  290. +3 −3 exercises/one_step_equations_0.5.html
  291. +4 −4 exercises/one_step_inequalities.html
  292. +14 −14 exercises/order_of_operations.html
  293. +3 −3 exercises/ordering_fractions.html
  294. +1 −1 exercises/ordering_improper_fractions_and_mixed_numbers.html
  295. +3 −3 exercises/ordering_negative_numbers.html
  296. +2 −2 exercises/ordering_numbers.html
  297. +10 −10 exercises/parabola_intuition_1.html
  298. +8 −8 exercises/parabola_intuition_2.html
  299. +4 −4 exercises/parabola_intuition_3.html
  300. +1 −1 exercises/parallel_lines_1.html
Sorry, we could not display the entire diff because too many files (444) changed.
View
4 exercises/absolute_value.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Finding absolute values</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div data-ensure='SIGN === "" || INT !== 0 || FRAC !== ""' class="vars">
+ <div class="vars" data-ensure='SIGN === "" || INT !== 0 || FRAC !== ""'>
<var id="INT">rand(5) &gt; 0 ? randRange( 1, 9 ) : 0</var>
<var id="FRAC">rand(3) &gt; 0 ? "." + randRange(1, 9) : ""</var>
<var id="SIGN">randFromArray(["", "-"])</var>
View
16 exercises/absolute_value_equations.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Absolute value equations</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -11,10 +11,10 @@
<div class="vars">
<var id="A">randRange(2, 8)</var>
<var id="B">randRangeNonZero(-10, 10)</var>
- <var data-ensure="C !== A" id="C">
+ <var id="C" data-ensure="C !== A">
randRangeNonZero(-6, 6)
</var>
- <var data-ensure="D !== B" id="D">randRange(2, 10)</var>
+ <var id="D" data-ensure="D !== B">randRange(2, 10)</var>
<var id="E">randRangeNonZero(-10, 10)</var>
<var id="NO_SOLUTION">(D - B) / (A - C) &lt;= 0</var>
<var id="POS_SOLUTION">
@@ -42,9 +42,9 @@
</code>
</p>
- <div data-type="multiple" class="solution">
- <div data-type="set" class="sol">
- <div data-each="SOLUTIONS as SOLUTION" class="set-sol">
+ <div class="solution" data-type="multiple">
+ <div class="sol" data-type="set">
+ <div class="set-sol" data-each="SOLUTIONS as SOLUTION">
<var>SOLUTION</var>
</div>
<p class="input-format">
@@ -56,7 +56,7 @@
<p></p>
<div>
<label>
- <span data-type="checkbox" class="sol">
+ <span class="sol" data-type="checkbox">
<var>NO_SOLUTION</var>
</span>
No solution
@@ -71,7 +71,7 @@
to not be graded. Otherwise it returns true an the
rest of the multiple answer will be checked normally.
-->
- <div required="" data-type="custom" class="sol">
+ <div class="sol" data-type="custom" required="">
<div class="guess">
$("#solutionarea input").eq(0).val() === ""
&amp;&amp;
View
6 exercises/absolute_value_of_complex_numbers.html
@@ -21,7 +21,7 @@
<p>
<code><var>REPRESENTATION</var></code>
</p>
- <div data-type="radical" class="solution">
+ <div class="solution" data-type="radical">
<var>ABS_SQUARE</var>
</div>
<div class="hints">
@@ -54,7 +54,7 @@
</p>
</div>
<div>
- <div data-update="graph" class="graphie">
+ <div class="graphie" data-update="graph">
path([ [0,0], [REAL, IMAG]], {
stroke: KhanUtil.ORANGE
});
@@ -64,7 +64,7 @@
</p>
</div>
<div>
- <div data-update="graph" class="graphie">
+ <div class="graphie" data-update="graph">
path([ [0,0], [REAL, 0], [REAL, IMAG]], {
stroke: KhanUtil.BLUE
});
View
8 exercises/adding_and_subtracting_complex_numbers.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="exercise">
- <div data-ensure="ANSWER_IMAG !== -1" class="vars">
+ <div class="vars" data-ensure="ANSWER_IMAG !== -1">
<var id="A_REAL">randRange( -5, 5 )</var>
<var id="A_IMAG">randRange( -5, 5 )</var>
<var id="B_REAL">randRange( -5, 5 )</var>
@@ -53,12 +53,12 @@
(<var>A_REP_COLORED</var>) <var>OPERATOR</var> (<var>B_REP_COLORED</var>)
</code>
</p>
- <div data-type="multiple" class="solution">
- <span data-inexact="" data-fallback="0" data-forms="integer, decimal" class="sol short50" data-max-error="0.01">
+ <div class="solution" data-type="multiple">
+ <span class="sol short50" data-fallback="0" data-forms="integer, decimal" data-inexact="" data-max-error="0.01">
<var>ANSWER_REAL</var>
</span>
<code>+</code>
- <span data-inexact="" data-fallback="1" data-forms="integer, decimal" class="sol short50" data-max-error="0.01">
+ <span class="sol short50" data-fallback="1" data-forms="integer, decimal" data-inexact="" data-max-error="0.01">
<var>ANSWER_IMAG</var>
</span>
<code>i</code>
View
42 exercises/adding_and_subtracting_decimals_word_problems.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math word-problems spin graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting decimals word problems</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -18,7 +18,7 @@
<var id="fruit_1">truncate_to_max(fruit_1_integer*pow(10,-fruit_1_decimal), 2)</var>
<var id="D">randRange(3,9)*100</var>
<var id="E">randRange(1,9)*10</var>
- <var data-ensure="F+C !== 10" id="F">randRange(1,9)*1</var>
+ <var id="F" data-ensure="F+C !== 10">randRange(1,9)*1</var>
<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>
@@ -32,7 +32,7 @@
<p class="question">How much did <var>person(1)</var> need to pay for <var>his(1)</var> produce?</p></div>
- <div data-forms="dollar" class="solution"><var>fruit_1+fruit_2</var></div>
+ <div class="solution" data-forms="dollar"><var>fruit_1+fruit_2</var></div>
<div class="hints">
<p>To find the total amount <var>person(1)</var> needs to pay, we need to add the price of the <var>plural(fruit(1))</var> and the price of the <var>plural(fruit(2))</var>.</p>
@@ -42,7 +42,7 @@
graph.adder.show();
graph.adder.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( fruit_1_integer, fruit_1_decimal, fruit_2_integer, fruit_2_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( fruit_1_integer, fruit_1_decimal, fruit_2_integer, fruit_2_decimal ) times" data-update="numbers">
graph.adder.showHint();
</div>
@@ -57,7 +57,7 @@
<var id="time_1_integer">randRange(2000,9999)</var>
<var id="time_1_decimal">(2)</var>
<var id="time_1">truncate_to_max(time_1_integer*pow(10,-time_1_decimal), 2)</var>
- <var data-ensure="time_2_integer &lt; time_1_integer" id="time_2_integer">randRange(2000,9999)</var>
+ <var id="time_2_integer" data-ensure="time_2_integer &lt; time_1_integer">randRange(2000,9999)</var>
<var id="time_2_decimal">(2)</var>
<var id="time_2">truncate_to_max(time_2_integer*pow(10,-time_2_decimal), 2)</var>
<var id="time_3_integer">randRange(100,999)</var>
@@ -72,8 +72,8 @@
<p>{After <var>time_3</var> minutes, <var>person(3)</var> agreed to time the runners.|} <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>
<p class="question">How much faster was <var>person(2)</var> than <var>person(1)</var> in seconds?</p>
</div>
- <div data-type="multiple" class="solution">
- <p> <span data-forms="integer, decimal" class="sol"><var>time_1-time_2 </var></span> seconds</p>
+ <div class="solution" data-type="multiple">
+ <p> <span class="sol" data-forms="integer, decimal"><var>time_1-time_2 </var></span> seconds</p>
</div>
<div class="hints">
<p>To find how much faster <var>person(2)</var> was than <var>person(1)</var>, we need to find the difference between their times in seconds.
@@ -83,7 +83,7 @@
graph.subtractor.show();
graph.subtractor.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( time_1_integer, time_1_decimal, time_2_integer, time_2_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( time_1_integer, time_1_decimal, time_2_integer, time_2_decimal ) times" data-update="numbers">
graph.subtractor.showHint();
</div>
<p class="final_answer"><var>person(2)</var> was <var>solution</var> seconds faster than <var>person(1)</var>.</p>
@@ -117,8 +117,8 @@
</div>
- <div data-type="multiple" class="solution">
- <p><span data-forms="integer, decimal" class="sol"><var> weight_1+weight_2 </var></span> pounds</p>
+ <div class="solution" data-type="multiple">
+ <p><span class="sol" data-forms="integer, decimal"><var> weight_1+weight_2 </var></span> pounds</p>
</div>
<div class="hints">
@@ -129,11 +129,11 @@
graph.adder.show();
graph.adder.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( weight_1_integer, weight_1_decimal, weight_2_integer, weight_2_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( weight_1_integer, weight_1_decimal, weight_2_integer, weight_2_decimal ) times" data-update="numbers">
graph.adder.showHint();
</div>
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
<p class="final_answer">Together, the babies weigh <var>solution</var> pounds.</p>
@@ -164,7 +164,7 @@
<p>{On Tuesday,|Last Thursday,|} <var>person(1)</var> walked to <var>an(store(1))</var> store {<var>timeofday(1)</var>|} and{, after browsing for <var>time_1</var> minutes,|} decided to buy a <var>storeItem(1,1)</var> for $<var>price_1</var>. <var>person(1)</var> handed the salesperson $<var>amount_paid</var> for <var>his(1)</var> purchase.</p>
<p class="question">How much change did <var>person(1)</var> receive?</p>
</div>
- <div data-forms="dollar" class="solution"><var>amount_paid-price_1</var></div>
+ <div class="solution" data-forms="dollar"><var>amount_paid-price_1</var></div>
<div class="hints">
<p>To find out how much change <var>person(1)</var> received, we can subtract the price of the <var>storeItem(1,1)</var> from the amount of money <var>he(1)</var> paid.
@@ -174,7 +174,7 @@
graph.subtractor.show();
graph.subtractor.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( amount_paid_integer, amount_paid_decimal, price_1_integer, price_1_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( amount_paid_integer, amount_paid_decimal, price_1_integer, price_1_decimal ) times" data-update="numbers">
graph.subtractor.showHint();
</div>
<p class="final_answer"><var>person(1)</var> received $<var>solution</var> in change.</p>
@@ -200,8 +200,8 @@
<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 data-type="multiple" class="solution">
- <p> <span data-forms="integer, decimal" class="sol"><var>rain_2-rain_1 </var></span> inches</p>
+ <div class="solution" data-type="multiple">
+ <p> <span class="sol" data-forms="integer, decimal"><var>rain_2-rain_1 </var></span> inches</p>
</div>
<div class="hints">
<p>To find the difference in rainfall, we can subtract the amount of rain in <var>person(1)</var>'s town from the amount of rain in <var>person(2)</var>'s town.
@@ -211,7 +211,7 @@
graph.subtractor.show();
graph.subtractor.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( rain_2_integer, rain_2_decimal, rain_1_integer, rain_1_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( rain_2_integer, rain_2_decimal, rain_1_integer, rain_1_decimal ) times" data-update="numbers">
graph.subtractor.showHint();
</div>
<p class="final_answer"><var>person(2)</var>'s town received <var>solution</var> inches more rain than <var>person(1)</var>'s town.</p>
@@ -237,8 +237,8 @@
<p class="question">How many <var>plural(distance(1))</var> is <var>person(1)</var>'s journey in total?</p>
</div>
- <div data-type="multiple" class="solution">
- <p> <span data-forms="integer, decimal" class="sol"><var>distance_1+distance_2</var></span> <var>plural(distance(1))</var></p>
+ <div class="solution" data-type="multiple">
+ <p> <span class="sol" data-forms="integer, decimal"><var>distance_1+distance_2</var></span> <var>plural(distance(1))</var></p>
</div>
<div class="hints">
<p>To find the total distance <var>person(1)</var> travels, we need to add the two distances together.
@@ -248,11 +248,11 @@
graph.adder.show();
graph.adder.showDecimals();
</div>
- <div data-update="numbers" data-each="DecimalAdder.numHintsFor( distance_1_integer, distance_1_decimal, distance_2_integer, distance_2_decimal ) times" class="graphie">
+ <div class="graphie" data-each="DecimalAdder.numHintsFor( distance_1_integer, distance_1_decimal, distance_2_integer, distance_2_decimal ) times" data-update="numbers">
graph.adder.showHint();
</div>
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
<p class="final_answer"><var>person(1)</var> travels <var>solution</var> <var>plural(distance(1))</var> in total.</p>
View
6 exercises/adding_and_subtracting_fractions.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html data-require="math math-format"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting fractions</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div data-ensure="D1 !== D2" class="vars">
+ <div class="vars" data-ensure="D1 !== D2">
<var id="N1">randRangeNonZero( -9, 9 )</var>
<var id="N2">randRangeNonZero( -9, 9 )</var>
<var id="D1">randRangeExclude( 2, 9, [ N1, -N1 ] )</var>
@@ -21,7 +21,7 @@
<div class="question">
<p><code><var>fraction( N1, D1 )</var> + <var>fraction( N2, D2 )</var> = {?}</code></p>
</div>
- <div data-type="rational" class="solution"><var>N1 / D1 + N2 / D2</var></div>
+ <div class="solution" data-type="rational"><var>N1 / D1 + N2 / D2</var></div>
</div>
</div>
View
26 exercises/adding_and_subtracting_negative_numbers.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting negative numbers</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -31,29 +31,29 @@
"right" );
</div>
</div>
- <div data-forms="integer" class="solution"><var>ANSWER</var></div>
+ <div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE = label( [0, -1],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = {?}}",
"right" );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
numberLine( START, END, 1, 1, -2 );
circle( [ 1 + A - START, -2 ], 5/40, { stroke: "none", fill: "#6495ed" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
style({
stroke: "#28AE7B",
arrows: "-&gt;"
}, function(){
path( [ [ 1 + A - START, -2 ], [ 1 + ANSWER - START, -2] ] );
});
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
circle( [ 1 + ANSWER - START, -2 ], 5/40, { stroke: "none", fill: "#FF00AF" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -1],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
@@ -81,29 +81,29 @@
"right" );
</div>
</div>
- <div data-forms="integer" class="solution"><var>ANSWER</var></div>
+ <div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE = label( [0, -1],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{ +" + abs( B ) + "} = {?}}",
"right" );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
numberLine( START, END, 1, 1, -2 );
circle( [ 1 + A - START, -2 ], 5/40, { stroke: "none", fill: "#6495ed" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
style({
stroke: "#28AE7B",
arrows: "-&gt;"
}, function(){
path( [ [ 1 + A - START, -2 ], [ 1 + ANSWER - START, -2] ] );
});
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
circle( [ 1 + ANSWER - START, -2 ], 5/40, { stroke: "none", fill: "#FF00AF" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -1],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{ +" + abs( B ) + "} = "
View
12 exercises/adding_and_subtracting_polynomials.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format polynomials functional"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting polynomials</title>
<script src="../khan-exercise.js"></script>
<script type="text/javascript">
@@ -39,7 +39,7 @@
<var id="COLORS">[ BLUE, ORANGE, GREEN ]</var>
<var id="MAX_DEGREE">7</var>
<var id="NON_ZERO_INDICES">randRangeUniqueNonZero( 0, MAX_DEGREE, randRange(2, 3) ).sort().reverse()</var>
- <var data-ensure="POL_1.add( POL_2 ).getNumberOfTerms() &gt;= 1 &amp;&amp; POL_1.subtract( POL_2 ).getNumberOfTerms() &gt;= 1" id="POL_1, POL_2">tabulate( function() {
+ <var id="POL_1, POL_2" data-ensure="POL_1.add( POL_2 ).getNumberOfTerms() &gt;= 1 &amp;&amp; POL_1.subtract( POL_2 ).getNumberOfTerms() &gt;= 1">tabulate( function() {
var coefs = [];
for ( var i = 0; i &lt;= MAX_DEGREE; i++ ) {
var value = 0;
@@ -67,25 +67,25 @@
<p class="question">Simplify the expression.</p>
<p class="problem"><code>(<var>POL_1</var>) <var>SIGN</var> (<var>POL_2</var>)</code></p>
<p class="solution"><code><var>SOLUTION</var></code></p>
- <ul data-none="true" class="choices">
+ <ul class="choices" data-none="true">
<li><code><var>POL_1.subtract( POL_2 )</var></code></li>
<li data-each="FAKE_ANSWERS as FAKE_ANSWER"><code><var>FAKE_ANSWER</var></code></li>
</ul>
</div>
- <div data-type="add" id="subtract">
+ <div id="subtract" data-type="add">
<div class="vars">
<var id="SIGN">"-"</var>
<var id="SOLUTION">POL_1.subtract( POL_2 )</var>
<var id="FAKE_ANSWERS">getFakeAnswers( SOLUTION )</var>
</div>
- <ul data-none="true" class="choices">
+ <ul class="choices" data-none="true">
<li><code><var>POL_1.add( POL_2 )</var></code></li>
<li data-each="FAKE_ANSWERS as FAKE_ANSWER"><code><var>FAKE_ANSWER</var></code></li>
</ul>
- <div data-apply="appendContents" class="hints">
+ <div class="hints" data-apply="appendContents">
<div id="paren">
<p>Since this is subtraction, when removing the parenthesis we must distribute the minus sign to all terms in the second polynomial.</p>
<var>POL_2 = POL_2.multiply( -1 ), null</var>
View
8 exercises/adding_and_subtracting_radicals.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format expressions"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting radicals</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -18,7 +18,7 @@
</div>
<p class="question">Simplify the following expression:</p>
<p><code>\sqrt{<var>A</var>} + \sqrt{<var>B</var>}</code></p>
- <div data-type="radical" class="solution"><var>pow( A_COEFF + B_COEFF, 2 ) * NUM</var></div>
+ <div class="solution" data-type="radical"><var>pow( A_COEFF + B_COEFF, 2 ) * NUM</var></div>
<div class="hints">
<p>First, try to factor any perfect squares out of the radicals.</p>
<div>
@@ -43,7 +43,7 @@
</div>
<p class="question">Simplify the following expression:</p>
<p><code>\sqrt{<var>A</var>} - \sqrt{<var>B</var>}</code></p>
- <div data-type="radical" class="solution"><var>pow( A_COEFF - B_COEFF, 2 ) * NUM</var></div>
+ <div class="solution" data-type="radical"><var>pow( A_COEFF - B_COEFF, 2 ) * NUM</var></div>
<div class="hints">
<p>First, try to factor any perfect squares out of the radicals.</p>
<div>
@@ -88,7 +88,7 @@
</div>
<p class="question">Simplify the following expression:</p>
<p><code>\sqrt{<var>A</var>}<var>B_SIGN</var>\sqrt{<var>B</var>}<var>C_SIGN</var>\sqrt{<var>C</var>}</code></p>
- <div data-type="radical" class="solution"><var>pow( A_COEFF + B_COEFF + C_COEFF, 2 ) * NUM</var></div>
+ <div class="solution" data-type="radical"><var>pow( A_COEFF + B_COEFF + C_COEFF, 2 ) * NUM</var></div>
<div class="hints">
<p>First, try to factor any perfect squares out of the radicals.</p>
<div>
View
20 exercises/adding_and_subtracting_rational_expressions.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format expressions rational-expressions"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting with like denominators</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
@@ -61,16 +61,16 @@
<var>SIGN</var> \dfrac{<var>NUMERATOR2</var>}{<var>DENOMINATOR</var>}</code>
</p>
- <div data-type="set" class="solution">
- <div data-type="multiple" class="set-sol">
- <span data-type="regex" class="sol"><var>NUMERSOL</var></span>
- <span data-type="regex" class="sol"><var>DENOMSOL</var></span>
+ <div class="solution" data-type="set">
+ <div class="set-sol" data-type="multiple">
+ <span class="sol" data-type="regex"><var>NUMERSOL</var></span>
+ <span class="sol" data-type="regex"><var>DENOMSOL</var></span>
</div>
<div class="input-format">
- <div data-type="multiple" class="entry">
+ <div class="entry" data-type="multiple">
<table>
<tbody><tr>
- <td rowspan="2" class="soln-name">
+ <td class="soln-name" rowspan="2">
<code><var>Y</var> = </code>
</td>
<td class="soln-top">
@@ -79,7 +79,7 @@
</tr>
<tr>
<td class="soln-bot">
- <span data-fallback="1" class="sol short50">a</span>
+ <span class="sol short50" data-fallback="1">a</span>
</td>
</tr>
</tbody></table>
@@ -91,15 +91,15 @@
</div>
</div>
- <div data-type="add" id="subtract">
+ <div id="subtract" data-type="add">
<div class="vars">
<var id="SIGN">"-"</var>
<var id="COEFF2">COEFF1 - NUMERCOEFF</var>
<var id="CONST2">CONST1 - NUMERCONST</var>
<var id="NUMERATOR2">expr(["+", ["*", COEFF2, X], CONST2])</var>
</div>
- <div data-apply="prependContents" class="hints">
+ <div class="hints" data-apply="prependContents">
<div>
<p>Since the expressions have the same denominator we simply subtract the numerators:</p>
<p><code><var>Y</var> = \dfrac{<var>NUMERATOR1</var> - (<var>NUMERATOR2</var>)}{<var>DENOMINATOR</var>}</code></p>
View
16 exercises/adding_and_subtracting_rational_expressions_2.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format expressions rational-expressions"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding and subtracting with like denominators 2</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
@@ -89,16 +89,16 @@
<var>SIGN</var> \dfrac{<var>N2</var>}{<var>D2</var>}</code>
</p>
- <div data-type="set" class="solution">
- <div data-type="multiple" class="set-sol">
- <span data-type="regex" class="sol"><var>NUMERSOL</var></span>
- <span data-type="regex" class="sol"><var>DENOMSOL</var></span>
+ <div class="solution" data-type="set">
+ <div class="set-sol" data-type="multiple">
+ <span class="sol" data-type="regex"><var>NUMERSOL</var></span>
+ <span class="sol" data-type="regex"><var>DENOMSOL</var></span>
</div>
<div class="input-format">
- <div data-type="multiple" class="entry">
+ <div class="entry" data-type="multiple">
<table>
<tbody><tr>
- <td rowspan="2" class="soln-name">
+ <td class="soln-name" rowspan="2">
<code><var>Y</var> = </code>
</td>
<td class="soln-top">
@@ -107,7 +107,7 @@
</tr>
<tr>
<td class="soln-bot">
- <span data-fallback="1" class="sol short50">a</span>
+ <span class="sol short50" data-fallback="1">a</span>
</td>
</tr>
</tbody></table>
View
8 exercises/adding_decimals.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding decimals</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -37,19 +37,19 @@
<div class="problems">
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
- <p data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
+ <p class="solution" data-type="decimal"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
<div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
graph.adder.show();
graph.adder.showDecimals(A_DECIMAL, B_DECIMAL);
</div>
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
8 exercises/adding_decimals_0.5.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding decimals 0.5</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -35,19 +35,19 @@
<div class="problems">
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
- <p data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
+ <p class="solution" data-type="decimal"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></p>
<div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
graph.adder.show();
graph.adder.showDecimals( A_DECIMAL, B_DECIMAL );
</div>
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
10 exercises/adding_decimals_2.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding decimals 2</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -10,7 +10,7 @@
<var id="A">randRange( 100, 999 )</var>
<var id="B">randRange( 100, 999 )</var>
<var id="A_DECIMAL">randRange( 1, 3 )</var>
- <var data-ensure="B_DECIMAL!==A_DECIMAL" id="B_DECIMAL">randRange( 1, 3 )</var>
+ <var id="B_DECIMAL" data-ensure="B_DECIMAL!==A_DECIMAL">randRange( 1, 3 )</var>
<var id="NEW_A">A * ( B_DECIMAL &gt; A_DECIMAL ? pow( 10, B_DECIMAL - A_DECIMAL ) : 1)</var>
<var id="NEW_B">B * ( A_DECIMAL &gt; B_DECIMAL ? pow( 10, A_DECIMAL - B_DECIMAL ) : 1)</var>
<var id="A_DIGITS">
@@ -35,19 +35,19 @@
<div class="problems">
<div>
<p class="question"><code>\Huge{<var>roundTo( A_DECIMAL, A * pow( 10, -A_DECIMAL ) ).toFixed( A_DECIMAL )</var> + <var>roundTo( B_DECIMAL, B * pow( 10, -B_DECIMAL ) ).toFixed( B_DECIMAL )</var> = {?}}</code></p>
- <div data-type="decimal" class="solution"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></div>
+ <div class="solution" data-type="decimal"><var>A / pow( 10, A_DECIMAL ) + B / pow( 10, B_DECIMAL )</var></div>
<div class="graphie" id="numbers">
graph.adder = new Adder( NEW_A, NEW_B, A_DIGITS, B_DIGITS );
DUMMY = Array( graph.adder.getNumHints() );
</div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
graph.adder.show();
graph.adder.showDecimals( A_DECIMAL, B_DECIMAL );
</div>
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
8 exercises/adding_fractions.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html data-require="math math-format"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding fractions</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div data-ensure="SIMP_D1 !== SIMP_D2" class="vars">
+ <div class="vars" data-ensure="SIMP_D1 !== SIMP_D2">
<var id="N1">randRange( 1, 9 )</var>
<var id="D1">randRange( N1 + 1, 13 )</var>
<var id="GCD1">getGCD( N1, D1 )</var>
@@ -25,10 +25,10 @@
<div class="problems">
<div id="add-fractions">
<p class="question"><code><var>fraction( N1, D1 )</var> + <var>fraction( N2, D2 )</var> = {?}</code></p>
- <p data-type="rational" class="solution"><var>N1 / D1 + N2 / D2</var></p>
+ <p class="solution" data-type="rational"><var>N1 / D1 + N2 / D2</var></p>
</div>
- <div data-weight="0" data-type="add-fractions" id="custom-8">
+ <div id="custom-8" data-type="add-fractions" data-weight="0">
<div class="vars">
<var id="N1">1</var>
<var id="D1">2</var>
View
10 exercises/adding_fractions_with_common_denominators.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format graphie graphie-helpers"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding fractions with common denominators</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -17,10 +17,10 @@
<div class="question">
<p><code><var>fraction( N1, D )</var> + <var>fraction( N2, D )</var> = {?}</code></p>
</div>
- <div data-simplify="optional" data-type="rational" class="solution"><var>( N1 + N2 ) / D</var></div>
+ <div class="solution" data-simplify="optional" data-type="rational"><var>( N1 + N2 ) / D</var></div>
</div>
- <div data-weight="0" data-type="add-fractions" id="custom-5">
+ <div id="custom-5" data-type="add-fractions" data-weight="0">
<div class="vars">
<var id="N1">1</var>
<var id="N2">1</var>
@@ -31,11 +31,11 @@
<div class="hints">
<div style="height: 150px;">
- <div style="float: left" class="graphie">
+ <div class="graphie" style="float: left">
init({ range: [ [-3, 3], [-3, 3] ], scale: 25 });
piechart( [ N1, D - N1 ], ["#e00", "#999"], 2 );
</div>
- <div style="float: left;" class="graphie">
+ <div class="graphie" style="float: left;">
init({ range: [ [-3, 3], [-3, 3] ], scale: 25 });
piechart( [ N2, D - N2 ], ["#e00", "#999"], 2 );
</div>
View
14 exercises/adding_negative_numbers.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding negative numbers</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -31,29 +31,29 @@
"right" );
</div>
</div>
- <div data-forms="integer" class="solution"><var>ANSWER</var></div>
+ <div class="solution" data-forms="integer"><var>ANSWER</var></div>
<div class="hints">
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE = label( [0, -2],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = {?}}",
"right" );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
numberLine( START, END, 1, 1, -3 );
circle( [ 1 + A - START, -3 ], 5/40, { stroke: "none", fill: "#6495ed" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
style({
stroke: "#28AE7B",
arrows: "-&gt;"
}, function(){
path( [ [ 1 + A - START, -3 ], [ 1 + ANSWER - START, -3] ] );
});
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
circle( [ 1 + ANSWER - START, -3 ], 5/40, { stroke: "none", fill: "#FF00AF" } );
</div>
- <div data-update="numbers" class="graphie">
+ <div class="graphie" data-update="numbers">
REMOVE.remove();
label( [0, -2],
"\\Huge{\\color{#6495ED}{" + A + "} \\color{#28AE7B}{" + B + "} = "
View
4 exercises/adding_subtracting_mixed_numbers_0.5.html
@@ -38,7 +38,7 @@
<p class="problem">Express your answer as a mixed number simplified to lowest terms.</p>
<p class="question"><code><var>expr(["+", W1 + fraction( N1, D1 ), W2 + fraction( N2, D2 )])</var> = {?}</code></p>
- <div data-type="mixed" class="solution"><var>W1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
+ <div class="solution" data-type="mixed"><var>W1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
<div class="hints">
<div>
@@ -94,7 +94,7 @@
</div>
<p class="problem">Express your answer as a mixed number simplified to lowest terms. </p>
<p class="question"><code><var>expr(["+", W1 + 1, W2 + fraction( N2, D2 )])</var> = {?}</code></p>
- <div data-type="mixed" class="solution"><var>W1 + 1 + W2 + PM * N2 / D2</var></div>
+ <div class="solution" data-type="mixed"><var>W1 + 1 + W2 + PM * N2 / D2</var></div>
<div class="hints">
<div>
<p>Convert <code><var>W1+1</var></code> into<code>=\blue{<var>W1</var>} + \blue{<var>fraction( N1, D1)</var>}</code> before subtracting. So the problem becomes:</p>
View
4 exercises/adding_subtracting_mixed_numbers_1.html
@@ -38,7 +38,7 @@
<p class="problem">Express your answer as a mixed number simplified to lowest terms.</p>
<p class="question"><code><var>expr(["+", W1 + fraction( N1, D1 ), W2 + fraction( N2, D2 )])</var> = {?}</code></p>
- <div data-type="mixed" class="solution"><var>W1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
+ <div class="solution" data-type="mixed"><var>W1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
<div class="hints">
<div>
@@ -108,7 +108,7 @@
</div>
<p class="problem">Express your answer as a mixed number simplified to lowest terms.</p>
<p class="question"><code><var>expr(["+", W1 + 1 + fraction( N1, D1 ), W2 + fraction( N2, D2 )])</var> = {?}</code></p>
- <div data-type="mixed" class="solution"><var>W1 + 1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
+ <div class="solution" data-type="mixed"><var>W1 + 1 + W2 + N1 / D1 + PM * N2 / D2</var></div>
<div class="hints">
<div data-if="GCD1 !== 1 || GCD2 !== 1">
<p>Simplify each fraction.</p>
View
14 exercises/adding_vectors.html
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html data-require="math math-format graphie"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Adding vectors</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div data-ensure="0 &lt; abs( AX + BX ) &amp;&amp; abs( AX + BX ) &lt; 10 &amp;&amp; 0 &lt; abs( AY + BY ) &amp;&amp; abs( AY + BY ) &lt; 10 &amp;&amp; (AX * AY) * (BX * BY) &lt; 0" class="vars">
+ <div class="vars" data-ensure="0 &lt; abs( AX + BX ) &amp;&amp; abs( AX + BX ) &lt; 10 &amp;&amp; 0 &lt; abs( AY + BY ) &amp;&amp; abs( AY + BY ) &lt; 10 &amp;&amp; (AX * AY) * (BX * BY) &lt; 0">
<var id="AX">randRangeNonZero( -9, 9 )</var>
<var id="AY">randRangeNonZero( -9, 9 )</var>
@@ -23,7 +23,7 @@
\vec b &amp;= <var>BX</var> \hat\imath + <var>BY</var> \hat\jmath
\end{align*}</code></p>
- <div id="graph" class="graphie">
+ <div class="graphie" id="graph">
graphInit({
range: 10,
scale: 20,
@@ -44,8 +44,8 @@
label( [BF * BX, BF * BY], "\\vec b", { color: "#28ae7b" } );
</div>
- <div data-type="multiple" class="solution">
- <p><span data-fallback="1" data-forms="integer" class="sol short40"><var>AX + BX</var></span> <code>\hat\imath + {}</code><span data-fallback="1" data-forms="integer" class="sol short40"><var>AY + BY</var></span> <code>\hat\jmath</code></p>
+ <div class="solution" data-type="multiple">
+ <p><span class="sol short40" data-fallback="1" data-forms="integer"><var>AX + BX</var></span> <code>\hat\imath + {}</code><span class="sol short40" data-fallback="1" data-forms="integer"><var>AY + BY</var></span> <code>\hat\jmath</code></p>
</div>
</div>
</div>
@@ -54,13 +54,13 @@
<p>Sum the <code>\hat\imath</code> and <code>\hat\jmath</code> components separately.</p>
<div>
<p><code>\hat a + \hat b = (<var>AX</var> + <var>BX</var>) \hat\imath + (<var>AY</var> + <var>BY</var>) \hat\jmath</code></p>
- <div data-update="graph" class="graphie">
+ <div class="graphie" data-update="graph">
line( [BX, BY], [BX + AX, BY + AY], { stroke: "#6495ed", arrows: "-&gt;" } );
</div>
</div>
<div>
<p><code>\hphantom{\hat a + \hat b} = <var>AX + BX</var>\hat\imath + <var>AY + BY</var>\hat\jmath</code></p>
- <div data-update="graph" class="graphie">
+ <div class="graphie" data-update="graph">
line( [0, 0], [BX + AX, BY + AY], { stroke: "#ffa500", arrows: "-&gt;" } );
</div>
</div>
View
8 exercises/addition_1.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic word-problems"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>1-digit addition</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -24,12 +24,12 @@
"right" );
</div>
</div>
- <div data-forms="integer" class="solution"><var>A + B</var></div>
+ <div class="solution" data-forms="integer"><var>A + B</var></div>
<div class="hints">
- <div style="float: left;" class="graphie">
+ <div class="graphie" style="float: left;">
drawCircles( A, "#6495ED" );
</div>
- <div style="float: left;" class="graphie">
+ <div class="graphie" style="float: left;">
drawCircles( B, "#28AE7B" );
</div>
<p style="clear: left;">There are <var>plural( A, "blue dot" )</var> and <var>plural( B, "green dot" )</var>, for a total of <var>A + B</var> dots.</p>
View
10 exercises/addition_2.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>2-digit addition</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -9,8 +9,8 @@
<div class="vars">
<var id="A_10">randRange( 1, 8 )*10</var>
<var id="A_1">randRange ( 0, 9 )*1</var>
- <var data-ensure="B_10+A_10&lt;100" id="B_10">randRange( 1, 8 )*10</var>
- <var data-ensure="B_1+A_1&lt;10" id="B_1">randRange ( 0, 9 )*1</var>
+ <var id="B_10" data-ensure="B_10+A_10&lt;100">randRange( 1, 8 )*10</var>
+ <var id="B_1" data-ensure="B_1+A_1&lt;10">randRange ( 0, 9 )*1</var>
<var id="A">A_10+A_1</var>
<var id="B">B_10+B_1</var>
@@ -24,11 +24,11 @@
graph.adder.show();
DUMMY = Array( graph.adder.getNumHints() );
</div>
- <div data-forms="integer" class="solution"><var>A + B</var></div>
+ <div class="solution" data-forms="integer"><var>A + B</var></div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
12 exercises/addition_3.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Addition with carrying</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -10,9 +10,9 @@
<var id="A_100">randRange( 1, 8 )*100</var>
<var id="A_10">randRange( 0, 7 )*10</var>
<var id="A_1">randRange ( 1, 9 )*1</var>
- <var data-ensure="B_100+A_100&lt;1000" id="B_100">randRange( 1, 8 )*100</var>
- <var data-ensure="B_10+A_10&lt;100" id="B_10">randRange( 0, 7 )*10</var>
- <var data-ensure="B_1+A_1&gt;=10" id="B_1">randRange ( 1, 9 )*1</var>
+ <var id="B_100" data-ensure="B_100+A_100&lt;1000">randRange( 1, 8 )*100</var>
+ <var id="B_10" data-ensure="B_10+A_10&lt;100">randRange( 0, 7 )*10</var>
+ <var id="B_1" data-ensure="B_1+A_1&gt;=10">randRange ( 1, 9 )*1</var>
<var id="A">A_100+A_10+A_1</var>
<var id="B">B_100+B_10+B_1</var>
<var id="DUMMY">[]</var>
@@ -25,11 +25,11 @@
graph.adder.show();
DUMMY = Array( graph.adder.getNumHints() );
</div>
- <div data-forms="integer" class="solution"><var>A + B</var></div>
+ <div class="solution" data-forms="integer"><var>A + B</var></div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" data-each="DUMMY as dummy" class="graphie">
+ <div class="graphie" data-each="DUMMY as dummy" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
12 exercises/addition_4.html
@@ -1,20 +1,20 @@
<!DOCTYPE html>
<html data-require="math graphie graphie-helpers-arithmetic"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>4-digit addition with carrying</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div data-ensure="A &gt;= B &amp;&amp; (
+ <div class="vars" data-ensure="A &gt;= B &amp;&amp; (
(A_1 + B_1 &gt; 10 &amp;&amp; B &gt;= 10) ||
(A_10 + B_10 &gt; 100 &amp;&amp; B &gt;= 100) ||
- (A_100 + B_100 &gt; 1000 &amp;&amp; B &gt;= 1000))" class="vars">
+ (A_100 + B_100 &gt; 1000 &amp;&amp; B &gt;= 1000))">
<var id="A_1000">randRangeWeighted(0, 9, 0, 0.25) * 1000</var>
<var id="A_100">randRange(0, 9) * 100</var>
<var id="A_10">randRange(0, 9) * 10</var>
<var id="A_1">randRange(0, 9) * 1</var>
- <var data-ensure="B_1000 &lt;= A_1000" id="B_1000">
+ <var id="B_1000" data-ensure="B_1000 &lt;= A_1000">
randRangeWeighted(0, 9, 0, 0.25) * 1000
</var>
<var id="B_100">randRange(0, 9) * 100</var>
@@ -32,12 +32,12 @@
graph.adder.show();
NUM_HINTS = graph.adder.getNumHints();
</div>
- <div data-forms="integer" class="solution"><var>A + B</var></div>
+ <div class="solution" data-forms="integer"><var>A + B</var></div>
</div>
</div>
<div class="hints">
- <div data-update="numbers" data-each="NUM_HINTS times" class="graphie">
+ <div class="graphie" data-each="NUM_HINTS times" data-update="numbers">
graph.adder.showHint();
</div>
</div>
View
18 exercises/age_word_problems.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<html data-require="math math-format word-problems spin"><head>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Age word problems</title>
<script src="../khan-exercise.js"></script>
</head>
@@ -35,7 +35,7 @@
</div>
</div>
- <div data-type="solve-older-1" id="solve-younger-1">
+ <div id="solve-younger-1" data-type="solve-older-1">
<div class="question">
<p><var>person(1)</var> is <var>A</var> years older than
<var>person(2)</var>. <var>Cardinal(B)</var> years ago, <var>person(1)</var>
@@ -82,7 +82,7 @@
</div>
</div>
- <div data-type="solve-older-2" id="solve-younger-2">
+ <div id="solve-younger-2" data-type="solve-older-2">
<div class="question">
<p><var>person(1)</var> is <var>C</var> times as old as
<var>person(2)</var> and is also <var>A</var>
@@ -103,7 +103,7 @@
</div>
<div id="solve-older-3">
- <div data-ensure="C - A !== A &amp;&amp; A * B * (C - 1) &lt; 100 * (C - A)" class="vars">
+ <div class="vars"