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

Commit

Permalink
Remove parentheses
Browse files Browse the repository at this point in the history 
Summary: Use evaluate rather than simplify

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D8861
  • Loading branch information
@petercollingridge
petercollingridge committed May 23, 2014
1 parent 878f431 commit c908496
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 62 deletions.
2 changes: 1 addition & 1 deletion exercises/order_of_operations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div class="problems">
<div id="order-of-operations">
<p class="question">Simplify the following expression.</p>
<p class="question">Evaluate the following expression.</p>
<p class="problem"><code>
<var>A</var> + (<var>B</var> \times <var>C</var>)
</code></p>
Expand Down
148 changes: 87 additions & 61 deletions exercises/order_of_operations_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,35 @@
</head>
<body>
<div class="exercise">
<div class="vars" data-ensure="B - C !== 0">
<div class="vars">
<var id="A">randRange(1, 10)</var>
<var id="B">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>
<var id="C" data-ensure="B !== C">randRange(1, 10)</var>
</div>

<div class="problems">
<div id="order-of-operations">
<p class="question">Simplify the following expression.</p>
<p class="problem"><code><var>A</var> + (<var>B</var> \times <var>C</var>)</code></p>
<p class="question">Evaluate the following expression.</p>
<p class="problem"><code><var>A</var> + <var>B</var> \times <var>C</var></code></p>
<p class="solution" data-forms="integer"><var>A + B * C</var></p>

<div class="hints">
<p><code>= <var>A</var> + (<var>B * C</var>)</code></p>
<p><code>= <var>A</var> + <var>B * C</var></code></p>
<p><code>= <var>A + B * C</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code><var>A</var> + <var>B</var> \times <var>C</var></code></p>
<p class="problem"><code><var>B</var> \times <var>C</var> + <var>A</var></code></p>
<p class="solution" data-forms="integer"><var>A + B * C</var></p>

<div class="hints">
<p><code>= <var>A</var> + <var>B * C</var></code></p>
<p><code>= <var>B * C</var> + <var>A</var></code></p>
<p><code>= <var>A + B * C</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<div class="vars">
<var id="F">randRange(1, 9)</var>
<var id="G">randRange(1, 10 - F)</var>
</div>
<p class="problem"><code><var>A</var> + <var>B</var>^2</code></p>
<p class="solution" data-forms="integer"><var>A + B * B</var></p>

Expand All @@ -54,100 +47,133 @@
</div>

<div data-type="order-of-operations">
<div class="vars">
<var id="F">randRange(1, 9)</var>
<var id="G">randRange(1, 10 - F)</var>
</div>
<p class="problem"><code>(<var>F</var> + <var>G</var>)^2</code></p>
<p class="solution" data-forms="integer"><var>(F + G) * (F + G)</var></p>
<p class="problem"><code><var>A</var>^2 + <var>B</var></code></p>
<p class="solution" data-forms="integer"><var>A * A + B</var></p>

<div class="hints">
<p><code>= (<var>F + G</var>)^2</code></p>
<p><code>= <var>F + G</var>^2</code></p>
<p><code>= <var>(F + G) * (F + G)</var></code></p>
<p><code>= <var>A</var> \times <var>A</var> + <var>B</var></code></p>
<p><code>= <var>A * A</var> + <var>B</var></code></p>
<p><code>= <var>A * A + B</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<div class="vars">
<var id="F">randRange(2, 10)</var>
<var id="G">randRange(2, max(2, floor(100 / (F * F))))</var>
<var id="E">randRange(2, 9)</var>
<var id="D">randRange(2, floor(100 / (E * E)))</var>
</div>
<p class="problem"><code><var>F</var> \times <var>G</var>^2</code></p>
<p class="solution" data-forms="integer"><var>F * G * G</var></p>
<p class="problem"><code><var>D</var> \times <var>E</var>^2</code></p>
<p class="solution" data-forms="integer"><var>D * E * E</var></p>

<div class="hints">
<p><code>= <var>F</var> \times <var>G * G</var></code></p>
<p><code>= <var>F * G * G</var></code></p>
<p><code>= <var>D</var> \times <var>E * E</var></code></p>
<p><code>= <var>D * E * E</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<div class="vars">
<var id="F">randRange(2, 5)</var>
<var id="G">randRange(2, max(2, floor(10 / (F * F))))</var>
<p class="problem"><code><var>A</var> + \dfrac{<var>B * C</var>}{<var>C</var>}</code></p>
<p class="solution" data-forms="integer"><var>A + B</var></p>

<div class="hints">
<p><code>= <var>A</var> + <var>B</var></code></p>
<p><code>= <var>A + B</var></code></p>
</div>
<p class="problem"><code>(<var>F</var> \times <var>G</var>)^2</code></p>
<p class="solution" data-forms="integer"><var>F * F * G * G</var></p>
</div>

<div data-type="order-of-operations">
<p class="problem"><code>\dfrac{<var>A * (B + C)</var> }{<var>B</var> + <var>C</var>}</code></p>
<p class="solution" data-forms="integer"><var>A</var></p>

<div class="hints">
<p><code>= (<var>F * G</var>)^2</code></p>
<p><code>= <var>F * G</var>^2</code></p>
<p><code>= <var>F * G * F * G</var></code></p>
<p><code>= \dfrac{ <var>A * (B + C)</var> }{<var>B + C</var>}</code></p>
<p><code>= <var>A</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code><var>A</var> \times (<var>B</var> + <var>C</var>)</code></p>
<p class="solution" data-forms="integer"><var>A * (B + C)</var></p>
<p class="problem"><code>\dfrac{<var>A * B</var> + <var>A * C</var>}{<var>B + C</var>}</code></p>
<p class="solution" data-forms="integer"><var>A</var></p>

<div class="hints">
<p><code>= <var>A</var> \times <var>B + C</var></code></p>
<p><code>= <var>A * (B + C)</var></code></p>
<p><code>= \dfrac{ <var>A * (B + C)</var> }{<var>B + C</var>}</code></p>
<p><code>= <var>A</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code><var>A</var> + \left(\dfrac{<var>B * C</var>}{<var>C</var>}\right)</code></p>
<p class="solution" data-forms="integer"><var>A + B</var></p>
<div class="vars">
<var id="E">randRange(1, 10)</var>
<var id="D">randRange(1, 10)</var>
</div>

<p class="problem"><code><var>A</var> \times <var>B</var> + <var>C</var> \times \dfrac{<var>D * E</var>}{<var>E</var>}</code></p>
<p class="solution" data-forms="integer"><var>A * B + C * D</var></p>

<div class="hints">
<p><code>= <var>A</var> + (<var>B</var>)</code></p>
<p><code>= <var>A</var> + <var>B</var></code></p>
<p><code>= <var>A + B</var></code></p>
<p><code>= <var>A</var> \times <var>B</var> + <var>C</var> \times <var>D</var></code></p>
<p><code>= <var>A * B</var> + <var>C</var> \times <var>D</var></code></p>
<p><code>= <var>A * B</var> + <var>C * D</var></code></p>
<p><code>= <var>A * B + C * D</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code><var>A</var> + \dfrac{<var>B * C</var>}{<var>C</var>}</code></p>
<p class="solution" data-forms="integer"><var>A + B</var></p>
<div class="vars">
<var id="D">randRange(2, 10)</var>
<var id="E">randRange(1, D)</var>
</div>

<p class="problem"><code><var>D</var> - <var>E</var> + <var>C</var></code></p>
<p class="solution" data-forms="integer"><var>D - E + C</var></p>

<div class="hints">
<p><code>= <var>A</var> + <var>B</var></code></p>
<p><code>= <var>A + B</var></code></p>
<p><code>= <var>D - E</var> + <var>C</var></code></p>
<p><code>= <var>D - E + C</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code>\dfrac{ <var>(A * (B + C))</var> }{<var>B</var> + <var>C</var>}</code></p>
<p class="solution" data-forms="integer"><var>A</var></p>
<div class="vars">
<var id="D">randRange(1, 4)</var>
<var id="E">randRange(1, floor(9 / D))</var>
<var id="F">randRange(D * E + 1, 10)</var>
</div>

<p class="problem"><code><var>F</var> - <var>D</var> \times <var>E</var></code></p>
<p class="solution" data-forms="integer"><var>F - D * E</var></p>

<div class="hints">
<p><code>= \dfrac{ <var>(A * (B + C))</var> }{(<var>(B + C)</var>)}</code></p>
<p><code>= \dfrac{ <var>(A * (B + C))</var> }{<var>B + C</var>}</code></p>
<p><code>= <var>A</var></code></p>
<p><code>= <var>F</var> - <var>D * E</var></code></p>
<p><code>= <var>F - D * E</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<p class="problem"><code><var>A</var> \times <var>B</var> + <var>C</var> \times \dfrac{<var>(D * E)</var>}{<var>E</var>}</code></p>
<p class="solution" data-forms="integer"><var>(A * B) + (C * D)</var></p>
<div class="vars">
<var id="D">randRange(1, min(10, A * B))</var>
</div>

<p class="problem"><code><var>A</var> \times <var>B</var> - <var>D</var></code></p>
<p class="solution" data-forms="integer"><var>A * B - D</var></p>

<div class="hints">
<p><code>= <var>A</var> \times <var>B</var> + <var>C</var> \times <var>D</var></code></p>
<p><code>= <var>(A * B)</var> + <var>C</var> \times <var>D</var></code></p>
<p><code>= <var>(A * B)</var> + <var>(C * D)</var></code></p>
<p><code>= <var>(A * B) + (C * D)</var></code></p>
<p><code>= <var>A* B</var> - <var>D</var></code></p>
<p><code>= <var>A * B - D</var></code></p>
</div>
</div>

<div data-type="order-of-operations">
<div class="vars">
<var id="E">randRange(1, 3)</var>
<var id="D">randRange(E * E + 1, 10)</var>
</div>
<p class="problem"><code><var>D</var> - <var>E</var>^2</code></p>
<p class="solution" data-forms="integer"><var>D - E * E</var></p>

<div class="hints">
<p><code>= <var>D</var> - <var>E * E</var></code></p>
<p><code>= <var>D - E * E</var></code></p>
</div>
</div>
</div>
Expand Down

0 comments on commit c908496

Please sign in to comment.