Revert patch to hide symptom of previous bugs

diff --git a/src/AST/order.h b/src/AST/order.h
index d922235adf09f3e12f373127489e512a6335e5b0..cc8b45e4adc7774e6b3510ef66fa80309a82ebbd 100644 (file)
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -19,7 +19,7 @@ public:
        Order *clone(CSolver *solver, CloneMap *map);
        Vector<BooleanOrder *> constraints;
        OrderEncoding encoding;
-       void setOrderResolver(OrderResolver *_resolver) { encoding.resolver = _resolver;};
+       void setOrderResolver(OrderResolver *_resolver) { ASSERT(encoding.resolver == NULL); encoding.resolver = _resolver;};
        void initializeOrderHashtable();
        void initializeOrderElementsHashtable();
        void addOrderConstraint(BooleanOrder *constraint);

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