Applied newest multiplication sign omission rules to existing unit tests.

external/graph_drawing

@@ -1 +1 @@
-Subproject commit 01cf1342c34b470dfe36d72bb292aab564d28e3e
+Subproject commit c0a73ab43d1ef2ffdb1f1177afb006a983978150

tests/test_leiden_oefenopgave.py

@@ -35,12 +35,12 @@ class TestLeidenOefenopgave(TestCase):
                             '(x ^ 2 + (1 + 1)x + 1 * 1)(x + 1)',
                             '(x ^ 2 + 2x + 1 * 1)(x + 1)',
                             '(x ^ 2 + 2x + 1)(x + 1)',
-                            '(x ^ 2 + 2x)x + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
-                            'xx ^ 2 + x * 2x + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
-                            'x ^ (1 + 2) + x * 2x + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
-                            'x ^ 3 + x * 2x + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
-                            'x ^ 3 + x ^ (1 + 1) * 2 + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
-                            'x ^ 3 + x ^ 2 * 2 + (x ^ 2 + 2x) * 1 + 1x + 1 * 1',
+                            '(x ^ 2 + 2x)x + (x ^ 2 + 2x)1 + 1x + 1 * 1',
+                            'xx ^ 2 + x * 2x + (x ^ 2 + 2x)1 + 1x + 1 * 1',
+                            'x ^ (1 + 2) + x * 2x + (x ^ 2 + 2x)1 + 1x + 1 * 1',
+                            'x ^ 3 + x * 2x + (x ^ 2 + 2x)1 + 1x + 1 * 1',
+                            'x ^ 3 + x ^ (1 + 1)2 + (x ^ 2 + 2x)1 + 1x + 1 * 1',
+                            'x ^ 3 + x ^ 2 * 2 + (x ^ 2 + 2x)1 + 1x + 1 * 1',
                             'x ^ 3 + x ^ 2 * 2 + 1x ^ 2 + 1 * 2x + 1x + 1 * 1',
                             'x ^ 3 + x ^ 2 * 2 + x ^ 2 + 1 * 2x + 1x + 1 * 1',
                             'x ^ 3 + (2 + 1)x ^ 2 + 1 * 2x + 1x + 1 * 1',
@@ -144,7 +144,7 @@ class TestLeidenOefenopgave(TestCase):
                             '(22 - 28) / 77', '-6 / 77'])
 
     def test_4_3(self):
-        self.assertRewrite(['(7/3) * (3/5)',
+        self.assertRewrite(['(7/3)(3/5)',
                             '7 * 3 / (3 * 5)',
                             '21 / (3 * 5)',
                             '21 / 15',

tests/test_leiden_oefenopgave_v12.py

@@ -32,16 +32,16 @@ class TestLeidenOefenopgaveV12(TestCase):
             '(-72x ^ 2 - -48x + 8 * 6x + 8 * -4)x',
             '(-72x ^ 2 + 48x + 8 * 6x + 8 * -4)x',
             '(-72x ^ 2 + 48x + 48x + 8 * -4)x',
-            '(-72x ^ 2 + (1 + 1) * 48x + 8 * -4)x',
+            '(-72x ^ 2 + (1 + 1)48x + 8 * -4)x',
             '(-72x ^ 2 + 2 * 48x + 8 * -4)x',
             '(-72x ^ 2 + 96x + 8 * -4)x',
             '(-72x ^ 2 + 96x - 32)x',
             'x(-72x ^ 2 + 96x) + x * -32',
             'x * -72x ^ 2 + x * 96x + x * -32',
             '-x * 72x ^ 2 + x * 96x + x * -32',
-            '-x ^ (1 + 2) * 72 + x * 96x + x * -32',
+            '-x ^ (1 + 2)72 + x * 96x + x * -32',
             '-x ^ 3 * 72 + x * 96x + x * -32',
-            '-x ^ 3 * 72 + x ^ (1 + 1) * 96 + x * -32',
+            '-x ^ 3 * 72 + x ^ (1 + 1)96 + x * -32',
             '-x ^ 3 * 72 + x ^ 2 * 96 + x * -32',
             '-x ^ 3 * 72 + x ^ 2 * 96 - x * 32',
             '72 * -x ^ 3 + x ^ 2 * 96 - x * 32',