Skip to content
This repository has been archived by the owner on May 11, 2021. It is now read-only.

Commit

Permalink
Remove per-problem ensures. Use instead global ones (commit 4269749).
Browse files Browse the repository at this point in the history
  • Loading branch information
@sophiebits
sophiebits committed May 31, 2011
1 parent 9dd3aa6 commit 2522743
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 27 deletions.
4 changes: 2 additions & 2 deletions exercises/absolute_value.html
View file
Expand Up @@ -6,10 +6,10 @@
</head>
<body>
<div class="exercise">
<div class="vars">
<div class="vars" data-ensure="SIGN == &quot;&quot; || INT != 0 || FRAC != 0">
<var id="INT">rand(5) > 0 ? randRange(1, 24) : 0</var>
<var id="FRAC">rand(3) > 0 ? "." + randRange(1, 9) : ""</var>
<var id="SIGN" data-ensure="SIGN == &quot;&quot; || INT != 0 || FRAC != 0">randFromArray(["", "-"])</var>
<var id="SIGN">randFromArray(["", "-"])</var>
</div>

<div class="problems">
Expand Down
14 changes: 7 additions & 7 deletions exercises/age_word_problems.html
View file
Expand Up @@ -120,9 +120,9 @@
</div>

<div id="solve-older-3">
<div class="vars">
<div class="vars" data-ensure="C - A !== A">
<var id="A">randRange(2, 5)</var>
<var id="C" data-ensure="C - A !== A">randRange(A + 2, 9)</var>
<var id="C">randRange(A + 2, 9)</var>
<var id="B">randRange(2, 10) * (C - A)</var>
</div>

Expand Down Expand Up @@ -171,10 +171,10 @@
</div>
</div>

<div id="solve-single-4" data-weight="2">
<div id="solve-single-4" data-ensure="B <= 60" data-weight="2">

This comment has been minimized.

Sign in to view

Copy link
@jeresig

jeresig May 31, 2011

Member

Shouldn't this be on the var block?
<div class="vars">
<var id="A">randRange(3, 20)</var>
<var id="B" data-ensure="B <= 60">randRange(7, 24) * (A - 1)</var>
<var id="B">randRange(7, 24) * (A - 1)</var>
</div>

<div class="question">
Expand All @@ -199,11 +199,11 @@
</div>
</div>

<div id="solve-single-5" data-weight="2">
<div id="solve-single-5" data-weight="2" data-ensure="A <= 80 && B >= 2">

This comment has been minimized.

Sign in to view

Copy link
@jeresig

jeresig May 31, 2011

Member

Shouldn't this be on the var block?
<div class="vars">
<var id="C">randRange(3, 5)</var>
<var id="B" data-ensure="B > 1.5">randRange(1, 10) * (C - 1)</var>
<var id="A" data-ensure="A <= 80">randRange(C * B + 1, 15) * (C - 1)</var>
<var id="B">randRange(1, 10) * (C - 1)</var>
<var id="A">randRange(C * B + 1, 15) * (C - 1)</var>
</div>

<div class="question">
Expand Down
12 changes: 6 additions & 6 deletions exercises/average_word_problems.html
View file
Expand Up @@ -11,10 +11,10 @@

<div class="problems">
<div>
<div class="vars">
<div class="vars" data-ensure="SUM % LENGTH === 0">
<var id="LENGTH">randRange(4, 6)</var>
<var id="SCORES">randRange(75, 98, LENGTH)</var>
<var id="SUM" data-ensure="SUM % LENGTH <= 0.5">(function() {
<var id="SUM">(function() {
var sum = 0;

jQuery.each(SCORES, function( i, elem ) {
Expand All @@ -40,10 +40,10 @@
</div>

<div>
<div class="vars">
<div class="vars" data-ensure="NEW_AVG + COUNT * (NEW_AVG - OLD_AVG) <= 100">
<var id="COUNT">randRange(3, 7)</var>
<var id="OLD_AVG">randRange(77, 88)</var>
<var id="NEW_AVG" data-ensure="NEW_AVG + COUNT * (NEW_AVG - OLD_AVG) <= 100">randRange(OLD_AVG + 2, 99)</var>
<var id="NEW_AVG">randRange(OLD_AVG + 2, 99)</var>
</div>

<div class="question">
Expand All @@ -62,11 +62,11 @@
</div>

<div>
<div class="vars">
<div class="vars" data-ensure="(OLD_AVG * COUNT + 100 * REMAINING) % (COUNT + REMAINING) === 0">
<var id="COUNT">randRange(3, 6)</var>
<var id="REMAINING">randRange(2, COUNT - 2)</var>
<var id="OLD_AVG">randRange(77, 88)</var>
<var id="NEW_AVG" data-ensure="(OLD_AVG * COUNT + 100 * REMAINING) % (COUNT + REMAINING) <= 0.5">(OLD_AVG * COUNT + 100 * REMAINING) / (COUNT + REMAINING)</var>
<var id="NEW_AVG">(OLD_AVG * COUNT + 100 * REMAINING) / (COUNT + REMAINING)</var>
</div>

<div class="question">
Expand Down
4 changes: 2 additions & 2 deletions exercises/order_of_operations.html
View file
Expand Up @@ -5,12 +5,12 @@
<script src="../khan-exercise.js"></script>
</head>
<body>
<div class="exercise">
<div class="exercise" data-ensure="B - C !== 0">

This comment has been minimized.

Sign in to view

Copy link
@jeresig

jeresig May 31, 2011

Member

Shouldn't this be on the var block?
<div class="vars">
<var id="A">randRange(1, 10)</var>
<var id="B">randRange(1, 10)</var>

<var data-ensure="B - C !== 0" id="C">randRange(1, 10)</var>
<var id="C">randRange(1, 10)</var>

<var id="D">randRange(1, 10)</var>
<var id="E">randRange(1, 10)</var>
Expand Down
4 changes: 2 additions & 2 deletions exercises/slope_of_a_line.html
View file
Expand Up @@ -6,12 +6,12 @@
</head>
<body>
<div class="exercise">
<div class="vars">
<div class="vars" data-ensure="Math.pow(Y1 - Y2, 2) + Math.pow(X1 - X2, 2) < 36 && X1 < X2">
<var id="X1">randRange(-9, 9)</var>
<var id="Y1">randRange(-9, 9)</var>

<var id="X2">randRange(-9, 9)</var>
<var id="Y2" data-ensure="Math.pow(Y1 - Y2, 2) + Math.pow(X1 - X2, 2) < 36 && X1 < X2">randRange(-9, 9)</var>
<var id="Y2">randRange(-9, 9)</var>

<var id="M">(Y1 - Y2) / (X1 - X2)</var>
</div>
Expand Down
11 changes: 3 additions & 8 deletions utils/math.js
View file
Expand Up @@ -248,9 +248,7 @@ jQuery.fn.extend({
}

var ensureFailed;
var globalEnsure = vars.data("ensure");
do {
ensureFailed = false;
// Go through the specified variables
vars.children().each(function() {
// And load in their values
Expand All @@ -267,14 +265,11 @@ jQuery.fn.extend({

VARS[ name ] = value;
}

ensureFailed = ensureFailed ||
( (jQuery(this).data("ensure") && !jQuery.getVAR( jQuery(this).data("ensure") ) ) );
});

// check the global ensure
ensureFailed = ensureFailed ||
(globalEnsure && !jQuery.getVAR( globalEnsure ));
// check the ensure
var ensure = vars.data("ensure");
ensureFailed = ensure && !jQuery.getVAR( ensure );
} while (ensureFailed);

return this;
Expand Down

0 comments on commit 2522743

Please sign in to comment.