Enabled Taddeus' power match and rewrite rules.

eb260889 · Sander Mathijs van Veen · 5fc4e7c1 · eb260889
Commit eb260889 authored Jan 08, 2012 by Sander Mathijs van Veen
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

src/rules/__init__.py src/rules/__init__.py +8 -6

No files found.
--- a/src/rules/__init__.py
+++ b/src/rules/__init__.py
-from ..node import OP_ADD, OP_MUL
+from ..node import OP_ADD, OP_MUL, OP_DIV, OP_POW
 from .poly import match_combine_polynomes, match_expand
+from .powers import match_add_exponents, match_subtract_exponents, \
+        match_multiply_exponents, match_duplicate_exponent, \
+        match_remove_negative_exponent, match_exponent_to_root
 RULES = {
        OP_ADD: [match_combine_polynomes],
-        OP_MUL: [match_expand],
+        OP_MUL: [match_expand, match_add_exponents],
-        #OP_MUL: [match_expand, match_add_exponents],
+        OP_DIV: [match_subtract_exponents],
-        #OP_DIV: [match_subtract_exponents],
+        OP_POW: [match_multiply_exponents, match_duplicate_exponent, \
-        #OP_POW: [match_multiply_exponents, match_duplicate_exponent, \
+                 match_remove_negative_exponent, match_exponent_to_root],
-        #         match_remove_negative_exponent, match_exponent_to_root],
        }