X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=448fb9a7304e6b38a4b891883d151ff805d6a5d2;hp=d0d2c0612497800a6ee891a42f229163443b2797;hb=3c33c8ed7c4600da543b2a82bcffd5aca86f0eb9;hpb=cac96bb8e95553aa23fe1f32744a8ed96f811103

diff --git a/src/csolver.cc b/src/csolver.cc
index d0d2c06..448fb9a 100644
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -21,14 +21,30 @@
 #include "preprocess.h"
 #include "serializer.h"
 #include "deserializer.h"
-#include "naiveencoder.h"
+#include "encodinggraph.h"
+#include "ordergraph.h"
+#include "orderedge.h"
+#include "orderanalysis.h"
+#include "elementopt.h"
+#include "varorderingopt.h"
+#include <time.h>
+#include <stdarg.h>
+#include "alloyinterpreter.h"
+#include "smtinterpreter.h"
+#include "mathsatinterpreter.h"
+#include "smtratinterpreter.h"
 
 CSolver::CSolver() :
 	boolTrue(BooleanEdge(new BooleanConst(true))),
 	boolFalse(boolTrue.negate()),
 	unsat(false),
+	booleanVarUsed(false),
+	incrementalMode(false),
+	optimizationsOff(false),
 	tuner(NULL),
-	elapsedTime(0)
+	elapsedTime(0),
+	satsolverTimeout(NOTIMEOUT),
+	interpreter(NULL)
 {
 	satEncoder = new SATEncoder(this);
 }
@@ -36,6 +52,7 @@ CSolver::CSolver() :
 /** This function tears down the solver and the entire AST */
 
 CSolver::~CSolver() {
+	//serialize();
 	uint size = allBooleans.getSize();
 	for (uint i = 0; i < size; i++) {
 		delete allBooleans.get(i);
@@ -48,7 +65,8 @@ CSolver::~CSolver() {
 
 	size = allElements.getSize();
 	for (uint i = 0; i < size; i++) {
-		delete allElements.get(i);
+		Element *el = allElements.get(i);
+		delete el;
 	}
 
 	size = allTables.getSize();
@@ -65,16 +83,79 @@ CSolver::~CSolver() {
 	for (uint i = 0; i < size; i++) {
 		delete allOrders.get(i);
 	}
-
 	size = allFunctions.getSize();
 	for (uint i = 0; i < size; i++) {
 		delete allFunctions.get(i);
 	}
 
+	if (interpreter != NULL) {
+		delete interpreter;
+	}
+
 	delete boolTrue.getBoolean();
 	delete satEncoder;
 }
 
+void CSolver::resetSolver() {
+	//serialize();
+	uint size = allBooleans.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allBooleans.get(i);
+	}
+
+	size = allSets.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allSets.get(i);
+	}
+
+	size = allElements.getSize();
+	for (uint i = 0; i < size; i++) {
+		Element *el = allElements.get(i);
+		delete el;
+	}
+
+	size = allTables.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allTables.get(i);
+	}
+
+	size = allPredicates.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allPredicates.get(i);
+	}
+
+	size = allOrders.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allOrders.get(i);
+	}
+	size = allFunctions.getSize();
+	for (uint i = 0; i < size; i++) {
+		delete allFunctions.get(i);
+	}
+	delete boolTrue.getBoolean();
+	allBooleans.clear();
+	allSets.clear();
+	allElements.clear();
+	allTables.clear();
+	allPredicates.clear();
+	allOrders.clear();
+	allFunctions.clear();
+	constraints.reset();
+	encodedConstraints.reset();
+	activeOrders.reset();
+	boolMap.reset();
+	elemMap.reset();
+
+	boolTrue = BooleanEdge(new BooleanConst(true));
+	boolFalse = boolTrue.negate();
+	unsat = false;
+	booleanVarUsed = false;
+	elapsedTime = 0;
+	tuner = NULL;
+	satEncoder->resetSATEncoder();
+
+}
+
 CSolver *CSolver::clone() {
 	CSolver *copy = new CSolver();
 	CloneMap map;
@@ -87,23 +168,24 @@ CSolver *CSolver::clone() {
 	return copy;
 }
 
+CSolver *CSolver::deserialize(const char *file, InterpreterType itype) {
+	model_print("deserializing %s ...\n", file);
+	Deserializer deserializer(file, itype);
+	return deserializer.deserialize();
+}
+
 void CSolver::serialize() {
 	model_print("serializing ...\n");
-	{
-		Serializer serializer("dump");
-		SetIteratorBooleanEdge *it = getConstraints();
-		while (it->hasNext()) {
-			BooleanEdge b = it->next();
-			serializeBooleanEdge(&serializer, b);
-		}
-		delete it;
-	}
-	model_print("deserializing ...\n");
-	{
-		Deserializer deserializer("dump");
-		deserializer.deserialize();
+	char buffer[255];
+	long long nanotime = getTimeNano();
+	int numchars = sprintf(buffer, "DUMP%llu", nanotime);
+	Serializer serializer(buffer);
+	SetIteratorBooleanEdge *it = getConstraints();
+	while (it->hasNext()) {
+		BooleanEdge b = it->next();
+		serializeBooleanEdge(&serializer, b, true);
 	}
-	
+	delete it;
 }
 
 Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {
@@ -118,6 +200,14 @@ Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange
 	return set;
 }
 
+bool CSolver::itemExistInSet(Set *set, uint64_t item) {
+	return set->exists(item);
+}
+
+VarType CSolver::getSetVarType(Set *set) {
+	return set->getType();
+}
+
 Element *CSolver::createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange) {
 	Set *s = createRangeSet(type, lowrange, highrange);
 	return getElementVar(s);
@@ -139,7 +229,7 @@ uint64_t CSolver::createUniqueItem(MutableSet *set) {
 	return element;
 }
 
-void CSolver::finalizeMutableSet(MutableSet* set){
+void CSolver::finalizeMutableSet(MutableSet *set) {
 	set->finalize();
 }
 
@@ -149,6 +239,26 @@ Element *CSolver::getElementVar(Set *set) {
 	return element;
 }
 
+void CSolver::mustHaveValue(Element *element) {
+	element->anyValue = true;
+}
+
+void CSolver::freezeElementsVariables() {
+
+	for (uint i = 0; i < allElements.getSize(); i++) {
+		Element *e = allElements.get(i);
+		if (e->frozen) {
+			satEncoder->freezeElementVariables(&e->encoding);
+		}
+	}
+}
+
+
+Set *CSolver::getElementRange (Element *element) {
+	return element->getRange();
+}
+
+
 Element *CSolver::getElementConst(VarType type, uint64_t value) {
 	uint64_t array[] = {value};
 	Set *set = new Set(type, array, 1);
@@ -166,6 +276,7 @@ Element *CSolver::getElementConst(VarType type, uint64_t value) {
 	}
 }
 
+
 Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus) {
 	Element *element = new ElementFunction(function,array,numArrays,overflowstatus);
 	Element *e = elemMap.get(element);
@@ -180,14 +291,14 @@ Element *CSolver::applyFunction(Function *function, Element **array, uint numArr
 	}
 }
 
-Function *CSolver::createFunctionOperator(ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
-	Function *function = new FunctionOperator(op, domain, numDomain, range, overflowbehavior);
+Function *CSolver::createFunctionOperator(ArithOp op, Set *range, OverFlowBehavior overflowbehavior) {
+	Function *function = new FunctionOperator(op, range, overflowbehavior);
 	allFunctions.push(function);
 	return function;
 }
 
-Predicate *CSolver::createPredicateOperator(CompOp op, Set **domain, uint numDomain) {
-	Predicate *predicate = new PredicateOperator(op, domain,numDomain);
+Predicate *CSolver::createPredicateOperator(CompOp op) {
+	Predicate *predicate = new PredicateOperator(op);
 	allPredicates.push(predicate);
 	return predicate;
 }
@@ -198,14 +309,14 @@ Predicate *CSolver::createPredicateTable(Table *table, UndefinedBehavior behavio
 	return predicate;
 }
 
-Table *CSolver::createTable(Set **domains, uint numDomain, Set *range) {
-	Table *table = new Table(domains,numDomain,range);
+Table *CSolver::createTable(Set *range) {
+	Table *table = new Table(range);
 	allTables.push(table);
 	return table;
 }
 
-Table *CSolver::createTableForPredicate(Set **domains, uint numDomain) {
-	return createTable(domains, numDomain, NULL);
+Table *CSolver::createTableForPredicate() {
+	return createTable(NULL);
 }
 
 void CSolver::addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
@@ -221,6 +332,8 @@ Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
 BooleanEdge CSolver::getBooleanVar(VarType type) {
 	Boolean *boolean = new BooleanVar(type);
 	allBooleans.push(boolean);
+	if (!booleanVarUsed)
+		booleanVarUsed = true;
 	return BooleanEdge(boolean);
 }
 
@@ -251,11 +364,11 @@ BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs,
 }
 
 bool CSolver::isTrue(BooleanEdge b) {
-	return b.isNegated()?b->isFalse():b->isTrue();
+	return b.isNegated() ? b->isFalse() : b->isTrue();
 }
 
 bool CSolver::isFalse(BooleanEdge b) {
-	return b.isNegated()?b->isTrue():b->isFalse();
+	return b.isNegated() ? b->isTrue() : b->isFalse();
 }
 
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2) {
@@ -268,9 +381,11 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg) {
 	return applyLogicalOperation(op, array, 1);
 }
 
-static int ptrcompares(const void *p1, const void *p2) {
-	uintptr_t b1 = *(uintptr_t const *) p1;
-  uintptr_t b2 = *(uintptr_t const *) p2;
+static int booleanEdgeCompares(const void *p1, const void *p2) {
+	BooleanEdge be1 = *(BooleanEdge const *) p1;
+	BooleanEdge be2 = *(BooleanEdge const *) p2;
+	uint64_t b1 = be1->id;
+	uint64_t b2 = be2->id;
 	if (b1 < b2)
 		return -1;
 	else if (b1 == b2)
@@ -279,11 +394,11 @@ static int ptrcompares(const void *p1, const void *p2) {
 		return 1;
 }
 
-BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {
+BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
 	BooleanEdge newarray[asize];
 	memcpy(newarray, array, asize * sizeof(BooleanEdge));
-	for(uint i=0; i < asize; i++) {
-		BooleanEdge b=newarray[i];
+	for (uint i = 0; i < asize; i++) {
+		BooleanEdge b = newarray[i];
 		if (b->type == LOGICOP) {
 			if (((BooleanLogic *) b.getBoolean())->replaced) {
 				newarray[i] = doRewrite(newarray[i]);
@@ -294,121 +409,206 @@ BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, ui
 	return applyLogicalOperation(op, newarray, asize);
 }
 
+BooleanEdge CSolver::applyAtMostOneConstraint (BooleanEdge *array, uint asize) {
+	if(asize == 0 || asize == 1){
+		return getBooleanTrue();
+	}
+	BooleanEdge newarray[asize*(asize-1)];
+	uint newsize = 0;
+	for (uint i = 0; i < asize -1; i++) {
+		for(uint j = i +1; j < asize; j++){
+			BooleanEdge oprand1 = array[i];
+			BooleanEdge oprand2 = applyLogicalOperation(SATC_NOT, array[j]);
+			newarray[newsize++] = applyLogicalOperation(SATC_IMPLIES, oprand1, oprand2);
+		}
+	}
+	return applyLogicalOperation(SATC_AND, newarray, newsize);
+}
+
+BooleanEdge CSolver::applyExactlyOneConstraint (BooleanEdge *array, uint asize) {
+	BooleanEdge atleastOne = applyLogicalOperation(SATC_OR, array, asize);
+	BooleanEdge atmostOne = applyAtMostOneConstraint (array, asize);
+	return applyLogicalOperation(SATC_AND, atleastOne, atmostOne);
+}
+
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
-	BooleanEdge newarray[asize];
-	switch (op) {
-	case SATC_NOT: {
-		return array[0].negate();
-	}
-	case SATC_IFF: {
-		for (uint i = 0; i < 2; i++) {
-			if (array[i]->type == BOOLCONST) {
-				if (array[i]->isTrue()) {
+	if (!useInterpreter() && !optimizationsOff) {
+		BooleanEdge newarray[asize];
+		switch (op) {
+		case SATC_NOT: {
+			return array[0].negate();
+		}
+		case SATC_IFF: {
+			for (uint i = 0; i < 2; i++) {
+				if (isTrue(array[i])) {	// It can be undefined
 					return array[1 - i];
-				} else {
+				} else if (isFalse(array[i])) {
 					newarray[0] = array[1 - i];
 					return applyLogicalOperation(SATC_NOT, newarray, 1);
-				}
-			} else if (array[i]->type == LOGICOP) {
-				BooleanLogic *b =(BooleanLogic *)array[i].getBoolean();
-				if (b->replaced) {
-					return rewriteLogicalOperation(op, array, asize);
+				} else if (array[i]->type == LOGICOP) {
+					BooleanLogic *b = (BooleanLogic *)array[i].getBoolean();
+					if (b->replaced) {
+						return rewriteLogicalOperation(op, array, asize);
+					}
 				}
 			}
+			break;
 		}
-		break;
-	}
-	case SATC_OR: {
-		for (uint i =0; i <asize; i++) {
-			newarray[i] = applyLogicalOperation(SATC_NOT, array[i]);
-		}
-		return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_AND, newarray, asize));
-	}
-	case SATC_AND: {
-		uint newindex = 0;
-		for (uint i = 0; i < asize; i++) {
-			BooleanEdge b = array[i];
-			if (b->type == LOGICOP) {
-				if (((BooleanLogic *)b.getBoolean())->replaced)
-					return rewriteLogicalOperation(op, array, asize);
+		case SATC_OR: {
+			for (uint i = 0; i < asize; i++) {
+				newarray[i] = applyLogicalOperation(SATC_NOT, array[i]);
 			}
-			if (b->type == BOOLCONST) {
-				if (b->isTrue())
+			return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_AND, newarray, asize));
+		}
+		case SATC_AND: {
+			uint newindex = 0;
+			for (uint i = 0; i < asize; i++) {
+				BooleanEdge b = array[i];
+				if (b->type == LOGICOP) {
+					if (((BooleanLogic *)b.getBoolean())->replaced)
+						return rewriteLogicalOperation(op, array, asize);
+				}
+				if (isTrue(b))
 					continue;
-				else
+				else if (isFalse(b)) {
 					return boolFalse;
-			} else
-				newarray[newindex++] = b;
+				} else
+					newarray[newindex++] = b;
+			}
+			if (newindex == 0) {
+				return boolTrue;
+			} else if (newindex == 1) {
+				return newarray[0];
+			} else {
+				bsdqsort(newarray, newindex, sizeof(BooleanEdge), booleanEdgeCompares);
+				array = newarray;
+				asize = newindex;
+			}
+			break;
+		}
+		case SATC_XOR: {
+			//handle by translation
+			return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_IFF, array, asize));
+		}
+		case SATC_IMPLIES: {
+			//handle by translation
+			return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]);
 		}
-		if (newindex == 0) {
-			return boolTrue;
-		} else if (newindex == 1) {
-			return newarray[0];
-		} else {
-			bsdqsort(newarray, newindex, sizeof(BooleanEdge), ptrcompares);
-			array = newarray;
-			asize = newindex;
 		}
-		break;
-	}
-	case SATC_XOR: {
-		//handle by translation
-		return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_IFF, array, asize));
-	}
-	case SATC_IMPLIES: {
-		//handle by translation
-		return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]);
-	}
-	}
 
-	ASSERT(asize != 0);
-	Boolean *boolean = new BooleanLogic(this, op, array, asize);
-	Boolean *b = boolMap.get(boolean);
-	if (b == NULL) {
-		boolean->updateParents();
-		boolMap.put(boolean, boolean);
+		ASSERT(asize != 0);
+		Boolean *boolean = new BooleanLogic(this, op, array, asize);
+		Boolean *b = boolMap.get(boolean);
+		if (b == NULL) {
+			boolean->updateParents();
+			boolMap.put(boolean, boolean);
+			allBooleans.push(boolean);
+			return BooleanEdge(boolean);
+		} else {
+			delete boolean;
+			return BooleanEdge(b);
+		}
+	} else {
+		ASSERT(asize != 0);
+		Boolean *boolean = new BooleanLogic(this, op, array, asize);
 		allBooleans.push(boolean);
 		return BooleanEdge(boolean);
-	} else {
-		delete boolean;
-		return BooleanEdge(b);
+
 	}
 }
 
 BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
+	//	ASSERT(first != second);
+	if (first == second)
+		return getBooleanFalse();
+
+	bool negate = false;
+	if (order->type == SATC_TOTAL) {
+		if (first > second) {
+			uint64_t tmp = first;
+			first = second;
+			second = tmp;
+			negate = true;
+		}
+	}
 	Boolean *constraint = new BooleanOrder(order, first, second);
-	allBooleans.push(constraint);
-	return BooleanEdge(constraint);
+	if (!useInterpreter() && !optimizationsOff ) {
+		Boolean *b = boolMap.get(constraint);
+
+		if (b == NULL) {
+			allBooleans.push(constraint);
+			boolMap.put(constraint, constraint);
+			constraint->updateParents();
+			if ( order->graph != NULL) {
+				OrderGraph *graph = order->graph;
+				OrderNode *from = graph->lookupOrderNodeFromOrderGraph(first);
+				if (from != NULL) {
+					OrderNode *to = graph->lookupOrderNodeFromOrderGraph(second);
+					if (to != NULL) {
+						OrderEdge *edge = graph->lookupOrderEdgeFromOrderGraph(from, to);
+						OrderEdge *invedge;
+
+						if (edge != NULL && edge->mustPos) {
+							replaceBooleanWithTrueNoRemove(constraint);
+						} else if (edge != NULL && edge->mustNeg) {
+							replaceBooleanWithFalseNoRemove(constraint);
+						} else if ((invedge = graph->lookupOrderEdgeFromOrderGraph(to, from)) != NULL
+											 && invedge->mustPos) {
+							replaceBooleanWithFalseNoRemove(constraint);
+						}
+					}
+				}
+			}
+		} else {
+			delete constraint;
+			constraint = b;
+		}
+	}
+	BooleanEdge be = BooleanEdge(constraint);
+	return negate ? be.negate() : be;
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
-	if (isTrue(constraint))
-		return;
-	else if (isFalse(constraint))
-		setUnSAT();
-	else {
-		if (constraint->type == LOGICOP) {
-			BooleanLogic *b=(BooleanLogic *) constraint.getBoolean();
-			if (!constraint.isNegated()) {
-				if (b->op==SATC_AND) {
-					for(uint i=0;i<b->inputs.getSize();i++) {
-						addConstraint(b->inputs.get(i));
+	if (!useInterpreter() && !optimizationsOff) {
+		if (isTrue(constraint))
+			return;
+		else if (isFalse(constraint)) {
+			setUnSAT();
+		}
+		else {
+			if (constraint->type == LOGICOP) {
+				BooleanLogic *b = (BooleanLogic *) constraint.getBoolean();
+				if (!constraint.isNegated()) {
+					if (b->op == SATC_AND) {
+						uint size = b->inputs.getSize();
+						//Handle potential concurrent modification
+						BooleanEdge array[size];
+						for (uint i = 0; i < size; i++) {
+							array[i] = b->inputs.get(i);
+						}
+						for (uint i = 0; i < size; i++) {
+							addConstraint(array[i]);
+						}
+						return;
 					}
+				}
+				if (b->replaced) {
+					addConstraint(doRewrite(constraint));
 					return;
 				}
 			}
-			if (b->replaced) {
-				addConstraint(doRewrite(constraint));
-				return;
+			constraints.add(constraint);
+			Boolean *ptr = constraint.getBoolean();
+
+			if (ptr->boolVal == BV_UNSAT) {
+				setUnSAT();
 			}
+
+			replaceBooleanWithTrueNoRemove(constraint);
+			constraint->parents.clear();
 		}
+	} else {
 		constraints.add(constraint);
-		Boolean *ptr=constraint.getBoolean();
-		
-		if (ptr->boolVal == BV_UNSAT)
-			setUnSAT();
-		
-		replaceBooleanWithTrueNoRemove(constraint);
 		constraint->parents.clear();
 	}
 }
@@ -420,30 +620,171 @@ Order *CSolver::createOrder(OrderType type, Set *set) {
 	return order;
 }
 
-int CSolver::solve() {
+/** Computes static ordering information to allow isTrue/isFalse
+    queries on newly created orders to work. */
+
+void CSolver::inferFixedOrder(Order *order) {
+	if (order->graph != NULL) {
+		delete order->graph;
+	}
+	order->graph = buildMustOrderGraph(order);
+	reachMustAnalysis(this, order->graph, true);
+}
+
+void CSolver::inferFixedOrders() {
+	SetIteratorOrder *orderit = activeOrders.iterator();
+	while (orderit->hasNext()) {
+		Order *order = orderit->next();
+		inferFixedOrder(order);
+	}
+}
+
+int CSolver::solveIncremental() {
+	if (isUnSAT()) {
+		return IS_UNSAT;
+	}
+
+
+	long long startTime = getTimeNano();
 	bool deleteTuner = false;
 	if (tuner == NULL) {
 		tuner = new DefaultTuner();
 		deleteTuner = true;
 	}
+	int result = IS_INDETER;
+	ASSERT (!useInterpreter());
+	if(!optimizationsOff){
+		computePolarities(this);
+	}
+//	long long time1 = getTimeNano();
+//	model_print("Polarity time: %f\n", (time1 - startTime) / NANOSEC);
+//	Preprocess pp(this);
+//	pp.doTransform();
+//	long long time2 = getTimeNano();
+//	model_print("Preprocess time: %f\n", (time2 - time1) / NANOSEC);
+
+//	DecomposeOrderTransform dot(this);
+//	dot.doTransform();
+//	time1 = getTimeNano();
+//	model_print("Decompose Order: %f\n", (time1 - time2) / NANOSEC);
+
+//	IntegerEncodingTransform iet(this);
+//	iet.doTransform();
+
+	//Doing element optimization on new constraints
+//	ElementOpt eop(this);
+//	eop.doTransform();
+
+	//Since no new element is added, we assuming adding new constraint
+	//has no impact on previous encoding decisions
+//	EncodingGraph eg(this);
+//	eg.encode();
+
+	naiveEncodingDecision(this);
+	//	eg.validate();
+	//Order of sat solver variables don't change!
+//	VarOrderingOpt bor(this, satEncoder);
+//	bor.doTransform();
+
+	long long time2 = getTimeNano();
+	//Encoding newly added constraints
+	satEncoder->encodeAllSATEncoder(this);
+	long long time1 = getTimeNano();
+
+	model_print("Elapse Encode time: %f\n", (time1 - startTime) / NANOSEC);
+
+	model_print("Is problem UNSAT after encoding: %d\n", unsat);
+
+	result = unsat ? IS_UNSAT : satEncoder->solve(satsolverTimeout);
+	model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT ? "SAT" : result == IS_INDETER ? "INDETERMINATE" : " UNSAT");
+	time2 = getTimeNano();
+	elapsedTime = time2 - startTime;
+	model_print("CSOLVER solve time: %f\n", elapsedTime / NANOSEC);
+
+	if (deleteTuner) {
+		delete tuner;
+		tuner = NULL;
+	}
+	return result;
+}
 
+int CSolver::solve() {
+	if (isUnSAT()) {
+		return IS_UNSAT;
+	}
 	long long startTime = getTimeNano();
-	computePolarities(this);
+	bool deleteTuner = false;
+	if (tuner == NULL) {
+		tuner = new DefaultTuner();
+		deleteTuner = true;
+	}
+	int result = IS_INDETER;
+	if (useInterpreter()) {
+		interpreter->encode();
+		model_print("Problem encoded in Interpreter\n");
+		result = interpreter->solve();
+		model_print("Problem solved by Interpreter\n");
+	} else {
 
-	Preprocess pp(this);
-	pp.doTransform();
-	
-	DecomposeOrderTransform dot(this);
-	dot.doTransform();
+		{
+			SetIteratorOrder *orderit = activeOrders.iterator();
+			while (orderit->hasNext()) {
+				Order *order = orderit->next();
+				if (order->graph != NULL) {
+					delete order->graph;
+					order->graph = NULL;
+				}
+			}
+			delete orderit;
+		}
+		long long time1, time2;
+		
+		computePolarities(this);
+		time1 = getTimeNano();
+		model_print("Polarity time: %f\n", (time1 - startTime) / NANOSEC);
+		if(!optimizationsOff){
+			Preprocess pp(this);
+			pp.doTransform();
+			time2 = getTimeNano();
+			model_print("Preprocess time: %f\n", (time2 - time1) / NANOSEC);
+
+			DecomposeOrderTransform dot(this);
+			dot.doTransform();
+			time1 = getTimeNano();
+			model_print("Decompose Order: %f\n", (time1 - time2) / NANOSEC);
+
+			IntegerEncodingTransform iet(this);
+			iet.doTransform();
+
+			ElementOpt eop(this);
+			eop.doTransform();
+
+			EncodingGraph eg(this);
+			eg.encode();
+		}
+		naiveEncodingDecision(this);
+		//	eg.validate();
+		if(!optimizationsOff){
+			VarOrderingOpt bor(this, satEncoder);
+			bor.doTransform();
+			time2 = getTimeNano();
+			model_print("Encoding Graph Time: %f\n", (time2 - time1) / NANOSEC);
+		}
 
-	IntegerEncodingTransform iet(this);
-	iet.doTransform();
+		satEncoder->encodeAllSATEncoder(this);
+		time1 = getTimeNano();
 
-	naiveEncodingDecision(this);
-	satEncoder->encodeAllSATEncoder(this);
-	int result = unsat ? IS_UNSAT : satEncoder->solve();
-	long long finishTime = getTimeNano();
-	elapsedTime = finishTime - startTime;
+		model_print("Elapse Encode time: %f\n", (time1 - startTime) / NANOSEC);
+
+		model_print("Is problem UNSAT after encoding: %d\n", unsat);
+
+
+		result = unsat ? IS_UNSAT : satEncoder->solve(satsolverTimeout);
+		model_print("Result Computed in SAT solver:\t%s\n", result == IS_SAT ? "SAT" : result == IS_INDETER ? "INDETERMINATE" : " UNSAT");
+		time2 = getTimeNano();
+		elapsedTime = time2 - startTime;
+		model_print("CSOLVER solve time: %f\n", elapsedTime / NANOSEC);
+	}
 	if (deleteTuner) {
 		delete tuner;
 		tuner = NULL;
@@ -451,23 +792,71 @@ int CSolver::solve() {
 	return result;
 }
 
+void CSolver::setInterpreter(InterpreterType type) {
+	if (interpreter == NULL) {
+		switch (type) {
+		case SATUNE:
+			break;
+		case ALLOY: {
+			interpreter = new AlloyInterpreter(this);
+			break;
+		} case Z3: {
+			interpreter = new SMTInterpreter(this);
+			break;
+		}
+		case MATHSAT: {
+			interpreter = new MathSATInterpreter(this);
+			break;
+		}
+		case SMTRAT: {
+			interpreter = new SMTRatInterpreter(this);
+			break;
+		}
+		default:
+			ASSERT(0);
+		}
+	}
+}
+
+void CSolver::printConstraints() {
+	SetIteratorBooleanEdge *it = getConstraints();
+	while (it->hasNext()) {
+		BooleanEdge b = it->next();
+		b.print();
+	}
+	delete it;
+}
+
+void CSolver::printConstraint(BooleanEdge b) {
+	b.print();
+}
+
 uint64_t CSolver::getElementValue(Element *element) {
 	switch (element->type) {
 	case ELEMSET:
 	case ELEMCONST:
 	case ELEMFUNCRETURN:
-		return getElementValueSATTranslator(this, element);
+		return useInterpreter() ? interpreter->getValue(element) :
+					 getElementValueSATTranslator(this, element);
 	default:
 		ASSERT(0);
 	}
 	exit(-1);
 }
 
+void CSolver::freezeElement(Element *e) {
+	e->freezeElement();
+	if (!incrementalMode) {
+		incrementalMode = true;
+	}
+}
+
 bool CSolver::getBooleanValue(BooleanEdge bedge) {
-	Boolean *boolean=bedge.getBoolean();
+	Boolean *boolean = bedge.getBoolean();
 	switch (boolean->type) {
 	case BOOLEANVAR:
-		return getBooleanVariableValueSATTranslator(this, boolean);
+		return useInterpreter() ? interpreter->getBooleanValue(boolean) :
+					 getBooleanVariableValueSATTranslator(this, boolean);
 	default:
 		ASSERT(0);
 	}
@@ -488,3 +877,5 @@ void CSolver::autoTune(uint budget) {
 	autotuner->tune();
 	delete autotuner;
 }
+
+