Skip to content
Snippets Groups Projects
Commit dd9a2e41 authored by Taddeus Kroes's avatar Taddeus Kroes
Browse files

Applied correct commits of master branch.

parent ba89b4c5
No related branches found
No related tags found
No related merge requests found
...@@ -84,8 +84,3 @@ smvv@multivac ~/work/trs $ printf "0/1\n??" | ./main.py ...@@ -84,8 +84,3 @@ smvv@multivac ~/work/trs $ printf "0/1\n??" | ./main.py
<Possibility root="0 / 1" handler=divide_numerics args=(0, 1)> <Possibility root="0 / 1" handler=divide_numerics args=(0, 1)>
Division of 0 by 1 reduces to 0. Division of 0 by 1 reduces to 0.
Division of 0 by 1 reduces to 0. Division of 0 by 1 reduces to 0.
- Should powers have a higher precedence thatn negation while printing?
the current situation: -(x ^ 2) and -x ^ 2 (the latter instead of (-x) ^ 2)
might be desired: -x ^ 2 instead of -(x ^ 2), and explicit parentheses for
(-x) ^ 2
...@@ -34,5 +34,3 @@ class TestLeidenOefenopgaveV12(TestCase): ...@@ -34,5 +34,3 @@ class TestLeidenOefenopgaveV12(TestCase):
'-72x ^ 3 + 96x ^ 2 - x * 32', '-72x ^ 3 + 96x ^ 2 - x * 32',
'-72x ^ 3 + 96x ^ 2 + 32 * -x', '-72x ^ 3 + 96x ^ 2 + 32 * -x',
'-72x ^ 3 + 96x ^ 2 - 32x']) '-72x ^ 3 + 96x ^ 2 - 32x'])
# TODO: Should powers have a higher precedence than negation
# while printing?
...@@ -13,5 +13,4 @@ class TestRulesGoniometry(RulesTestCase): ...@@ -13,5 +13,4 @@ class TestRulesGoniometry(RulesTestCase):
def test_add_quadrants(self): def test_add_quadrants(self):
return return
root = tree('sin(x) ^ 2 + cos(x) ^ 2') self.assertEqual(add_quadrants(None, ()), 1)
self.assertEqual(add_quadrants(root, ()), 1)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment