Merge pull request Khan#8047 from smenks13/systemsSubstitution

Systems of equations with substitution: eliminated some data-ensures
rockhymas · Dec 7, 2011 · 664b707 · 664b707
2 parents 51a15a6 + 1f4ed0b
commit 664b707
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/exercises/systems_of_equations_with_substitution.html b/exercises/systems_of_equations_with_substitution.html
@@ -13,17 +13,17 @@
 <body>
 	<div class="exercise">
 		<div class="vars">
+			<var id="X">randRangeNonZero( -10, 10 )</var>
+			<var id="Y" data-ensure="X !== Y">randRangeNonZero( -10, 10 )</var>
 		</div>
 		<div class="problems">
 			<div id="substitution-y">
 				<div class="vars">
-					<var id="X">randRange( 1, 10 )</var>
-					<var id="Y" data-ensure="X !== Y">randRange( 1, 10 )</var>
-					<var id="A1" data-ensure="( abs( A1 * X ) - abs( 6 * Y ) ) < 13">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
-					<var id="B1" data-ensure="abs( A1 * X + B1 * Y ) < 13">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="A1">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="B1">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
 					<var id="C1">A1 * X + B1 * Y</var>
 					<var id="B2">1</var>
-					<var id="A2" data-ensure="abs( A2 * X + B2 * Y ) < 13 && abs( A2 * X + B2 * Y ) !== 0 && ( A1 * B2 ) !== ( A2 * B1 )">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="A2" data-ensure="abs( A2 * X + B2 * Y ) !== 0 && ( A1 * B2 ) !== ( A2 * B1 )">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
 					<var id="C2">A2 * X + B2 * Y</var>
 					<var id="SIGN_1">B1 * C2 &gt; 0 ? "-" : "+"</var>
 					<var id="SIGN_2">A1 * X &gt; 0 ? "-" : "+"</var>
@@ -70,13 +70,11 @@
 			</div>
 			<div id="substitution-x">
 				<div class="vars">
-					<var id="X">randRangeNonZero( -10, 10 )</var>
-					<var id="Y" data-ensure="X !== Y">randRangeNonZero( -10, 10 )</var>
-					<var id="A1" data-ensure="( abs( A1 * X ) - abs( 6 * Y ) ) < 13">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
-					<var id="B1" data-ensure="abs( A1 * X + B1 * Y ) < 13">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="A1">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="B1">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
 					<var id="C1">A1 * X + B1 * Y</var>
 					<var id="A2">1</var>
-					<var id="B2" data-ensure="abs( A2 * X + B2 * Y ) < 13 && abs( A2 * X + B2 * Y ) !== 0 && ( A1 * B2 ) !== ( A2 * B1 )">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
+					<var id="B2" data-ensure="abs( A2 * X + B2 * Y ) !== 0 && ( A1 * B2 ) !== ( A2 * B1 )">randRange( 1, 6 ) * randRangeNonZero( -1, 1 )</var>
 					<var id="C2">A2 * X + B2 * Y</var>
 					<var id="SIGN_1">A1 * C2 &gt; 0 ? "-" : "+"</var>
 					<var id="SIGN_2">B1 * Y &gt; 0 ? "-" : "+"</var>