From: Hamed <hamed.gorjiara@gmail.com>
Date: Mon, 4 Sep 2017 23:04:55 +0000 (-0700)
Subject: Edit
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c03a7980279026fd542e55df0aca8cd5eaa2c4a5;p=satune.git

Edit
---

diff --git a/src/AST/order.h b/src/AST/order.h
index cc8b45e..d922235 100644
--- 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) { ASSERT(encoding.resolver == NULL); encoding.resolver = _resolver;};
+	void setOrderResolver(OrderResolver *_resolver) { encoding.resolver = _resolver;};
 	void initializeOrderHashtable();
 	void initializeOrderElementsHashtable();
 	void addOrderConstraint(BooleanOrder *constraint);
diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index b52ccf8..50cb29b 100644
--- 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;