Browse files

dded the word"degrees" to the solution box. Properly indented code and

made sentences gramatically correct. Chenged file name to
converting_temperatures.html
  • Loading branch information...
1 parent f01701e commit d4cf84cfff4d055e21f2a0fce06e4f32b32c23ea @kushmaheshwari kushmaheshwari committed Feb 27, 2013
Showing with 34 additions and 35 deletions.
  1. +34 −35 exercises/{converting_fahrenheit_to_celsius.html → converting_temperatures.html}
View
69 ...ses/converting_fahrenheit_to_celsius.html → exercises/converting_temperatures.html
@@ -2,43 +2,44 @@
<html data-require="math math-format">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Converting Temperatures (Fahrenheit vs Celsius)</title>
+ <title>Converting Temperatures</title>
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
- <div class="problems">
+ <div class="vars">
+ <var id="A">randRange(-100, 100)</var>
+ </div>
+ <div class="problems">
<div id="FahrenheittoCelsius">
<div class="vars">
- <var id="A1">randRange(-10, 10)</var>
- <var id="A">randRange(-100, 100)</var>
<var id="B">A-32</var>
<var id="C">abs(B*5)</var>
- </div>
-
-
- <p class="question">
- Convert <code><var>A</var>&deg;</code> Fahrenheit to Celsius. Round to the nearest tenth degree.
- </p>
-
- <div class="solution" data-forms="integer, decimal, improper, mixed" data-inexact data-max-error="0.09"><var>roundTo(1, (A-32)*(5/9))</var></div>
+ </div>
+ <p class="question">Convert <code><var>A</var>&deg;</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>
+ </span> degrees
+ </p>
+ </div>
<div class="hints">
<p>
- <br>The formula to convert fahrenheit to celsius is</br>
- <code>\blue{C} = <var>fraction( 5, 9 )</var>(\green{F} - 32)</code>
- </P>
+ <br>The formula to convert from Fahrenheit to Celsius is:</br>
+ <code>\blue{C} = <var>fraction( 5, 9 )</var>(\green{F} - 32)</code>
+ </p>
<p>
- <br>To find the celsius value, insert the fahrenheit value for the variable <code>\green{F}</code></br>
+ <br>To find the Celsius value, insert the Fahrenheit value for the variable <code>\green{F}.</code></br>
<code>\blue{C} = <var>fraction( 5, 9 )</var> (\green{<var>(A)</var>} - 32)</code>
</p>
<p>
- <br>Solve the inside of the parentheses</br>
+ <br>Solve the inside of the parentheses:</br>
<code>\blue{C} = <var>fraction(5, 9)</var> (<var>A-32</var>)</code>
</p>
<p>
- <br>Solve the equation</br>
+ <br>Solve the equation:</br>
<code>\blue{C} = <var>fraction(B * 5, 9)</var></code>
</p>
<p>
@@ -57,40 +58,40 @@
</div>
<div id="CelsiustoFahreheit">
<div class="vars">
- <var id="A">randRange(-100, 100)</var>
<var id="B">A*9</var>
<var id="C">160+(A*9)</var>
- </div>
-
-
+ </div>
<p class="question">
- Convert <code><var>A</var>&deg;</code> Celsius to Fahrenheit. Round to the nearest tenth degree.
-
+ Convert <code><var>A</var>&deg;</code> from Celsius to Fahrenheit. Round to the nearest tenth degree:
</p>
-
- <div class="solution" data-forms="integer, decimal, mixed, improper" data-inexact data-max-error="0.09"><var>roundTo(1, (9/5*A)+32)</var></div>
+ <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, (9/5*A)+32)</var>
+ </span> degrees
+ </p>
+ </div>
<div class="hints">
<p>
- <br>The formula to convert celsius to fahrenheit is</br>
- <code>\green{F} = <var>fraction( 9, 5 )</var>(\blue{C}) + 32</code>
- </P>
+ <br>The formula to convert from Celsius to Fahrenheit is:</br>
+ <code>\green{F} = <var>fraction( 9, 5 )</var>(\blue{C}) + 32</code>
+ </p>
<p>
- <br>To find the fahrenheit value, insert the celsius value for the variable <code>\blue{C}</code></br>
+ <br>To find the Fahrenheit value, insert the Celsius value for the variable <code>\blue{C}.</code></br>
<code>\green{F} = <var>fraction( 9, 5 )</var> (\blue{<var>(A)</var>}) + 32</code>
</p>
<p>
- <br>Multiply</br>
+ <br>Multiply:</br>
<code>\green{F} = <var>fraction(B, 5)</var> + 32</code>
</p>
<p>
- <br>Add</br>
+ <br>Add:</br>
<span data-if="B!=0">
<code>\green{F} = <var>fraction(C, 5)</var></code></span>
<span data-if="B==0">
<code>\green{F} = 0 + 32</code></span>
</p>
<p>
- <br>Simplify</br>
+ <br>Simplify:</br>
<span data-if="C%5==0">
<code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>&deg;</code></span>
@@ -102,8 +103,6 @@
<code>\green{F} = <var>mixedFractionFromImproper(C, 5,'defraction', 'reduce')</var>&deg;</code>
<br>OR</br>
<br><code>\green{F} = <var>roundTo(1, (9/5*A)+32)</var>&deg;</code></br></span>
-
-
</p>
</div>
</div>

0 comments on commit d4cf84c

Please sign in to comment.