Skip to content

Commit

Permalink
Change "percent" answer type to interpret answer key as a decimal; ac…
Browse files Browse the repository at this point in the history 
…cept percent in independent_probability Fix Khan#37553

Test Plan: Ran `grep percent exercises/* | grep data-forms` to find all exercises using the percent data-form and tested several questions of each such problem type

Reviewers: alpert

Reviewed By: alpert

Differential Revision: http://phabricator.khanacademy.org/D1046
  • Loading branch information
@beneater
beneater committed Jan 21, 2013
1 parent 71001a7 commit 83ab06d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion exercises/converting_decimals_to_percents.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</div>
<p>Express the decimal as a percent.</p>
<p class="question"><code><var>DECIMAL</var></code></p>
<p class="solution" data-forms="percent"><var>PERCENT</var></p>
<p class="solution" data-forms="percent"><var>DECIMAL</var></p>
<div class="hints">
<div>
<p>Rewrite the decimal as a fraction with a denominator of 100.</p>
Expand Down
4 changes: 2 additions & 2 deletions exercises/empirical_rule.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<code><var>roundTo( 1, MEAN + STDDEV * Z )</var></code> years.
</p>

<div class="solution" data-forms="percent"><var>ANSWER</var></div>
<div class="solution" data-forms="percent"><var>ANSWER / 100</var></div>

<div class="hints">
<p>We can try to estimate using the empirical rule, also known as the 68-95-99.7 percent rule.</p>
Expand Down Expand Up @@ -396,7 +396,7 @@
<code><var>roundTo( 1, MEAN + STDDEV * Z1 )</var></code> and <code><var>roundTo( 1, MEAN + STDDEV * Z2 )</var></code> years.
</p>

<div class="solution" data-forms="percent"><var>AREA</var></div>
<div class="solution" data-forms="percent"><var>AREA / 100</var></div>

<div class="hints" data-apply="appendContents">
<div id="hintGoal">
Expand Down
4 changes: 2 additions & 2 deletions exercises/independent_probability.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
If you flip a coin and roll a 6-sided die, what is the probability that you will flip a <var>HT</var> and roll <var>RESULT_DESC</var>?
</p>

<div class="solution" data-forms="proper, decimal"><var>0.5 * RESULT_POSSIBLE.length / 6</var></div>
<div class="solution" data-forms="proper, decimal, percent"><var>0.5 * RESULT_POSSIBLE.length / 6</var></div>

<div class="hints">
<p>
Expand Down Expand Up @@ -408,7 +408,7 @@
If both fire their cannons at the same time, what is the probability that <var>QUESTION</var>?
</p>

<div class="solution" data-forms="proper, decimal"><var>ANSWER</var></div>
<div class="solution" data-forms="proper, decimal, percent"><var>ANSWER</var></div>

<div class="hints">
<p>
Expand Down
4 changes: 2 additions & 2 deletions exercises/percentage_word_problems_1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>
<p class="question">
<var>person(1)</var> has <var>BANK_MORE</var> dollars in the bank today. Yesterday, <var>he(1)</var> had <var>BANK_FEWER</var> dollars in the bank. By what percentage did <var>person(1)</var>'s bank account increase over the past day? (Round your answer to the nearest hundredth of a percent.)</p>
<p class="solution" data-forms="percent"><var>round(((BANK_MORE - BANK_FEWER) * 10000) / BANK_FEWER) / 100</var></p>
<p class="solution" data-forms="percent"><var>roundTo(4, (BANK_MORE - BANK_FEWER) / BANK_FEWER)</var></p>
<div class="hints">
<p>The bank account grew by <code><var>BANK_MORE</var> - <var>BANK_FEWER</var> = <var>BANK_MORE - BANK_FEWER</var></code> dollars </p>
<p><code>\frac{<var>BANK_MORE - BANK_FEWER</var>}{<var>BANK_FEWER</var>} \approx <var>round(((BANK_MORE - BANK_FEWER) * 10000) / BANK_FEWER) / 100</var>\%</code></p>
Expand All @@ -51,7 +51,7 @@
<div id="bank-percentages-loss" data-type="bank-percentages">
<p class="question">
<var>person(1)</var> has <var>BANK_FEWER</var> dollars in the bank today. Yesterday, <var>he(1)</var> had <var>BANK_MORE</var> dollars in the bank. By what percentage did <var>person(1)</var>'s bank account decrease over the past day? (Round your answer to the nearest hundredth of a percent.)</p>
<p class="solution" data-forms="percent"><var>round(((BANK_MORE - BANK_FEWER) * 10000) / BANK_MORE) / 100</var></p>
<p class="solution" data-forms="percent"><var>roundTo(4, (BANK_MORE - BANK_FEWER) / BANK_MORE)</var></p>
<div class="hints">
<p>The bank account decreased by <code><var>BANK_MORE</var> - <var>BANK_FEWER</var> = <var>BANK_MORE - BANK_FEWER</var></code> dollars </p>
<p><code>\frac{<var>BANK_MORE - BANK_FEWER</var>}{<var>BANK_MORE</var>} \approx <var>round(((BANK_MORE - BANK_FEWER) * 10000) / BANK_MORE) / 100</var>\%</code></p>
Expand Down
4 changes: 2 additions & 2 deletions exercises/z_scores_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<div class="fake_row reading" data-each="ROWS as i, row">
<span><var>row</var></span><span data-each="ZGRID[i] as j, zgrid"><var>zgrid</var></span>
</div>
<div class="solution" data-inexact data-max-error="0.01" data-forms="percent">
<span><var>roundTo(2, ANSWER * 100)</var></span>
<div class="solution" data-inexact data-max-error="0.0001" data-forms="percent">
<span><var>roundTo(4, ANSWER)</var></span>
</div>

<div class="hints">
Expand Down
4 changes: 2 additions & 2 deletions exercises/z_scores_3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<div class="fake_row reading" data-each="ROWS as i, row">
<span><var>row</var></span><span data-each="ZGRID[i] as j, zgrid"><var>zgrid</var></span>
</div>
<div class="solution" data-inexact data-max-error="0.01" data-forms="percent">
<span><var>roundTo( 2, ANSWER * 100 )</var></span>
<div class="solution" data-inexact data-max-error="0.0001" data-forms="percent">
<span><var>roundTo(4, ANSWER)</var></span>
</div>

<div class="hints">
Expand Down
10 changes: 10 additions & 0 deletions utils/answer-types.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,15 @@ Khan.answerTypes = $.extend(Khan.answerTypes, {
}, $(solution).data());
var acceptableForms = options.forms.split(/\s*,\s*/);

// If percent is an acceptable form, make sure it's the last one
// in the list so we don't prematurely complain about not having
// a percent sign when the user entered the correct answer in a
// different form (such as a decimal or fraction)
if (_.contains(acceptableForms, "percent")) {
acceptableForms = _.without(acceptableForms, "percent");
acceptableForms.push("percent");
}

// Take text looking like a fraction, and turn it into a number
var fractionTransformer = function(text) {
text = text
Expand Down Expand Up @@ -374,6 +383,7 @@ Khan.answerTypes = $.extend(Khan.answerTypes, {
var transformed = forms.decimal(text);
$.each(transformed, function(ix, t) {
t.exact = hasPercentSign;
t.value = t.value / 100;
});
return transformed;
},
Expand Down

0 comments on commit 83ab06d

Please sign in to comment.