Merged conflicts.

bfd41939 · Taddeus Kroes · 007c7c36 · bfd41939
Commit bfd41939 authored Jan 23, 2012 by Taddeus Kroes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

src/rules/poly.py src/rules/poly.py +1 -4

No files found.
--- a/src/rules/poly.py
+++ b/src/rules/poly.py
@@ -79,10 +79,7 @@ def combine_polynomes(root, args):
    n0, n1, c0, c1, r, e = args
    # a ^ 1 -> a
-    if e == 1:
+    power = r if e == 1 else r ** e
-        power = r
-    else:
-        power = r ** e
    # replacement: (c0 + c1) * a ^ b
    # a, b and c are from 'left', d is from 'right'.