Fixed merge conflict.

ceb2f51c · Jayke Meijer · 140259b0 · ceb2f51c · ceb2f51c
Commit ceb2f51c authored Dec 30, 2011 by Jayke Meijer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

report/report.tex report/report.tex +1 -1

src/optimize/__init__.py src/optimize/__init__.py +1 -3

No files found.
--- a/report/report.tex
+++ b/report/report.tex
@@ -303,7 +303,7 @@ Benchmark & Original     & Optimized    & Original & Optimized & Performance \\
 pi        &           94 &              &  1714468 &           &             \\
 acron     &          361 &              &  4435687 &           &             \\
 dhrystone &          752 &              &  2887710 &           &             \\
-whet      &          935 &              &          &           &             \\
+whet      &          935 &              &  2864526 &           &             \\
 slalom    &         4177 &              &  2879140 &           &             \\
 clinpack  &         3523 &              &          &           &             \\
 \hline

--- a/src/optimize/__init__.py
+++ b/src/optimize/__init__.py
@@ -15,14 +15,12 @@ def optimize(program, verbose=0):
    iterations = 0

    while changed:
-<<<<<<< HEAD
        iterations += 1

        if verbose > 1:
            print 'main iteration %d', iterations

-=======
->>>>>>> 98c43ff02c474a62e42ac89ba9fe20be98f9eccd
+
        changed = False

        # Optimize on a global level