Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

[satune.git] / src / ASTTransform / integerencoding.cc

diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index 25ef990ee38bca14e5f2aee152382b073eb58e30..1bc1dc3fc3180bded5d5ffdb4649fd02dc36c1ba 100644 (file)
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@ -20,7 +20,8 @@ void IntegerEncodingTransform::doTransform() {
        SetIteratorOrder * orderit=orders->iterator();
        while(orderit->hasNext()) {
                Order *order = orderit->next();
-               if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &onoff))
+               if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &onoff) &&
+                       order->encoding.resolver == NULL)
                        integerEncode(order);
        }
        delete orders;