X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=bcde64e9b84274cebed1ebabd1b14688ee7e9a42;hp=e9c9526e14d9861273c9793fda12f2d3e26a5756;hb=c5e632659f6f8ad931cf14104f72a5aa59acf911;hpb=4216901871798182a3574865d6aa4f3ff3130a54

diff --git a/src/csolver.cc b/src/csolver.cc
index e9c9526..bcde64e 100644
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -10,233 +10,399 @@
 #include "satencoder.h"
 #include "sattranslator.h"
 #include "tunable.h"
-#include "orderencoder.h"
 #include "polarityassignment.h"
-
-CSolver *allocCSolver() {
-	CSolver *This = (CSolver *) ourmalloc(sizeof(CSolver));
-	This->unsat = false;
-	This->constraints = allocDefHashSetBoolean();
-	This->allBooleans = allocDefVectorBoolean();
-	This->allSets = allocDefVectorSet();
-	This->allElements = allocDefVectorElement();
-	This->allPredicates = allocDefVectorPredicate();
-	This->allTables = allocDefVectorTable();
-	This->allOrders = allocDefVectorOrder();
-	This->allFunctions = allocDefVectorFunction();
-	This->tuner = allocTuner();
-	This->satEncoder = allocSATEncoder(This);
-	return This;
+#include "analyzer.h"
+#include "autotuner.h"
+#include "astops.h"
+#include "structs.h"
+
+CSolver::CSolver() :
+	boolTrue(new BooleanConst(true)),
+	boolFalse(new BooleanConst(false)),
+	unsat(false),
+	tuner(NULL),
+	elapsedTime(0)
+{
+	satEncoder = new SATEncoder(this);
 }
 
 /** This function tears down the solver and the entire AST */
 
-void deleteSolver(CSolver *This) {
-	deleteHashSetBoolean(This->constraints);
-
-	uint size = getSizeVectorBoolean(This->allBooleans);
+CSolver::~CSolver() {
+	uint size = allBooleans.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteBoolean(getVectorBoolean(This->allBooleans, i));
+		delete allBooleans.get(i);
 	}
-	deleteVectorBoolean(This->allBooleans);
 
-	size = getSizeVectorSet(This->allSets);
+	size = allSets.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteSet(getVectorSet(This->allSets, i));
+		delete allSets.get(i);
 	}
-	deleteVectorSet(This->allSets);
 
-	size = getSizeVectorElement(This->allElements);
+	size = allElements.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteElement(getVectorElement(This->allElements, i));
+		delete allElements.get(i);
 	}
-	deleteVectorElement(This->allElements);
 
-	size = getSizeVectorTable(This->allTables);
+	size = allTables.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteTable(getVectorTable(This->allTables, i));
+		delete allTables.get(i);
 	}
-	deleteVectorTable(This->allTables);
 
-	size = getSizeVectorPredicate(This->allPredicates);
+	size = allPredicates.getSize();
 	for (uint i = 0; i < size; i++) {
-		deletePredicate(getVectorPredicate(This->allPredicates, i));
+		delete allPredicates.get(i);
 	}
-	deleteVectorPredicate(This->allPredicates);
 
-	size = getSizeVectorOrder(This->allOrders);
+	size = allOrders.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteOrder(getVectorOrder(This->allOrders, i));
+		delete allOrders.get(i);
 	}
-	deleteVectorOrder(This->allOrders);
 
-	size = getSizeVectorFunction(This->allFunctions);
+	size = allFunctions.getSize();
 	for (uint i = 0; i < size; i++) {
-		deleteFunction(getVectorFunction(This->allFunctions, i));
+		delete allFunctions.get(i);
+	}
+
+	delete boolTrue;
+	delete boolFalse;
+	delete satEncoder;
+}
+
+CSolver *CSolver::clone() {
+	CSolver *copy = new CSolver();
+	CloneMap map;
+	HSIteratorBoolean *it = getConstraints();
+	while (it->hasNext()) {
+		Boolean *b = it->next();
+		copy->addConstraint(b->clone(copy, &map));
 	}
-	deleteVectorFunction(This->allFunctions);
-	deleteSATEncoder(This->satEncoder);
-	deleteTuner(This->tuner);
-	ourfree(This);
+	delete it;
+	return copy;
 }
 
-Set *createSet(CSolver *This, VarType type, uint64_t *elements, uint numelements) {
-	Set *set = allocSet(type, elements, numelements);
-	pushVectorSet(This->allSets, set);
+Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {
+	Set *set = new Set(type, elements, numelements);
+	allSets.push(set);
 	return set;
 }
 
-Set *createRangeSet(CSolver *This, VarType type, uint64_t lowrange, uint64_t highrange) {
-	Set *set = allocSetRange(type, lowrange, highrange);
-	pushVectorSet(This->allSets, set);
+Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange) {
+	Set *set = new Set(type, lowrange, highrange);
+	allSets.push(set);
 	return set;
 }
 
-MutableSet *createMutableSet(CSolver *This, VarType type) {
-	MutableSet *set = allocMutableSet(type);
-	pushVectorSet(This->allSets, set);
+MutableSet *CSolver::createMutableSet(VarType type) {
+	MutableSet *set = new MutableSet(type);
+	allSets.push(set);
 	return set;
 }
 
-void addItem(CSolver *This, MutableSet *set, uint64_t element) {
-	addElementMSet(set, element);
+void CSolver::addItem(MutableSet *set, uint64_t element) {
+	set->addElementMSet(element);
 }
 
-uint64_t createUniqueItem(CSolver *This, MutableSet *set) {
-	uint64_t element = set->low++;
-	addElementMSet(set, element);
+uint64_t CSolver::createUniqueItem(MutableSet *set) {
+	uint64_t element = set->getNewUniqueItem();
+	set->addElementMSet(element);
 	return element;
 }
 
-Element *getElementVar(CSolver *This, Set *set) {
-	Element *element = allocElementSet(set);
-	pushVectorElement(This->allElements, element);
+Element *CSolver::getElementVar(Set *set) {
+	Element *element = new ElementSet(set);
+	allElements.push(element);
 	return element;
 }
 
-Element *getElementConst(CSolver *This, VarType type, uint64_t value) {
-	Element *element = allocElementConst(value, type);
-	pushVectorElement(This->allElements, element);
-	return element;
+Element *CSolver::getElementConst(VarType type, uint64_t value) {
+	uint64_t array[] = {value};
+	Set *set = new Set(type, array, 1);
+	Element *element = new ElementConst(value, type, set);
+	Element *e = elemMap.get(element);
+	if (e == NULL) {
+		allSets.push(set);
+		allElements.push(element);
+		elemMap.put(element, element);
+		return element;
+	} else {
+		delete set;
+		delete element;
+		return e;
+	}
 }
 
-Boolean *getBooleanVar(CSolver *This, VarType type) {
-	Boolean *boolean = allocBooleanVar(type);
-	pushVectorBoolean(This->allBooleans, boolean);
-	return boolean;
+Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus) {
+	Element *element = new ElementFunction(function,array,numArrays,overflowstatus);
+	Element *e = elemMap.get(element);
+	if (e == NULL) {
+		allElements.push(element);
+		elemMap.put(element, element);
+		return element;
+	} else {
+		delete element;
+		return e;
+	}
 }
 
-Function *createFunctionOperator(CSolver *This, ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
-	Function *function = allocFunctionOperator(op, domain, numDomain, range, overflowbehavior);
-	pushVectorFunction(This->allFunctions, function);
+Function *CSolver::createFunctionOperator(ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
+	Function *function = new FunctionOperator(op, domain, numDomain, range, overflowbehavior);
+	allFunctions.push(function);
 	return function;
 }
 
-Predicate *createPredicateOperator(CSolver *This, CompOp op, Set **domain, uint numDomain) {
-	Predicate *predicate = allocPredicateOperator(op, domain,numDomain);
-	pushVectorPredicate(This->allPredicates, predicate);
+Predicate *CSolver::createPredicateOperator(CompOp op, Set **domain, uint numDomain) {
+	Predicate *predicate = new PredicateOperator(op, domain,numDomain);
+	allPredicates.push(predicate);
 	return predicate;
 }
 
-Predicate *createPredicateTable(CSolver *This, Table *table, UndefinedBehavior behavior) {
-	Predicate *predicate = allocPredicateTable(table, behavior);
-	pushVectorPredicate(This->allPredicates, predicate);
+Predicate *CSolver::createPredicateTable(Table *table, UndefinedBehavior behavior) {
+	Predicate *predicate = new PredicateTable(table, behavior);
+	allPredicates.push(predicate);
 	return predicate;
 }
 
-Table *createTable(CSolver *This, Set **domains, uint numDomain, Set *range) {
-	Table *table = allocTable(domains,numDomain,range);
-	pushVectorTable(This->allTables, table);
+Table *CSolver::createTable(Set **domains, uint numDomain, Set *range) {
+	Table *table = new Table(domains,numDomain,range);
+	allTables.push(table);
 	return table;
 }
 
-Table *createTableForPredicate(CSolver *solver, Set **domains, uint numDomain) {
-	return createTable(solver, domains, numDomain, NULL);
+Table *CSolver::createTableForPredicate(Set **domains, uint numDomain) {
+	return createTable(domains, numDomain, NULL);
 }
 
-void addTableEntry(CSolver *This, Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
-	addNewTableEntry(table,inputs, inputSize,result);
+void CSolver::addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
+	table->addNewTableEntry(inputs, inputSize, result);
 }
 
-Function *completeTable(CSolver *This, Table *table, UndefinedBehavior behavior) {
-	Function *function = allocFunctionTable(table, behavior);
-	pushVectorFunction(This->allFunctions,function);
+Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
+	Function *function = new FunctionTable(table, behavior);
+	allFunctions.push(function);
 	return function;
 }
 
-Element *applyFunction(CSolver *This, Function *function, Element **array, uint numArrays, Boolean *overflowstatus) {
-	Element *element = allocElementFunction(function,array,numArrays,overflowstatus);
-	pushVectorElement(This->allElements, element);
-	return element;
+Boolean *CSolver::getBooleanVar(VarType type) {
+	Boolean *boolean = new BooleanVar(type);
+	allBooleans.push(boolean);
+	return boolean;
 }
 
-Boolean *applyPredicate(CSolver *This, Predicate *predicate, Element **inputs, uint numInputs) {
-	return applyPredicateTable(This, predicate, inputs, numInputs, NULL);
+Boolean *CSolver::getBooleanTrue() {
+	return boolTrue;
 }
-Boolean *applyPredicateTable(CSolver *This, Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
-	Boolean *boolean = allocBooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
-	pushVectorBoolean(This->allBooleans, boolean);
-	return boolean;
+
+Boolean *CSolver::getBooleanFalse() {
+	return boolFalse;
 }
 
-Boolean *applyLogicalOperation(CSolver *This, LogicOp op, Boolean **array, uint asize) {
-	return allocBooleanLogicArray(This, op, array, asize);
+Boolean *CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) {
+	return applyPredicateTable(predicate, inputs, numInputs, NULL);
 }
 
-void addConstraint(CSolver *This, Boolean *constraint) {
-	addHashSetBoolean(This->constraints, constraint);
+Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
+	BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
+	Boolean * b = boolMap.get(boolean);
+	if (b == NULL) {
+		boolMap.put(boolean, boolean);
+		allBooleans.push(boolean);
+		return boolean;
+	} else {
+		delete boolean;
+		return b;
+	}
 }
 
-Order *createOrder(CSolver *This, OrderType type, Set *set) {
-	Order *order = allocOrder(type, set);
-	pushVectorOrder(This->allOrders, order);
-	return order;
+Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean **array, uint asize) {
+	Boolean * newarray[asize];
+	switch(op) {
+	case SATC_NOT: {
+		if (array[0]->type == LOGICOP && ((BooleanLogic *)array[0])->op==SATC_NOT) {
+			return ((BooleanLogic *) array[0])->inputs.get(0);
+		} else if (array[0]->type == BOOLCONST) {
+			bool isTrue = ((BooleanConst *) array[0])->isTrue;
+			return isTrue ? boolFalse : boolTrue;
+		}
+		break;
+	}
+	case SATC_XOR: {
+		for(uint i=0;i<2;i++) {
+			if (array[i]->type == BOOLCONST) {
+				bool isTrue = ((BooleanConst *) array[i])->isTrue;
+				if (isTrue) {
+					newarray[0]=array[1-i];
+					return applyLogicalOperation(SATC_NOT, newarray, 1);
+				} else
+					return array[1-i];
+			}
+		}
+		break;
+	}
+	case SATC_OR: {
+		uint newindex=0;
+		for(uint i=0;i<asize;i++) {
+			Boolean *b=array[i];
+			if (b->type == BOOLCONST) {
+				bool isTrue = ((BooleanConst *) b)->isTrue;
+				if (isTrue)
+					return b;
+				else
+					continue;
+			} else
+				newarray[newindex++]=b;
+		}
+		if (newindex==1)
+			return newarray[0];
+		else if (newindex == 2) {
+			bool isNot0 = (newarray[0]->type==BOOLCONST) && ((BooleanLogic *)newarray[0])->op == SATC_NOT;
+			bool isNot1 = (newarray[1]->type==BOOLCONST) && ((BooleanLogic *)newarray[1])->op == SATC_NOT;
+
+			if (isNot0 != isNot1) {
+				if (isNot0) {
+					newarray[0] = ((BooleanLogic *) newarray[0])->inputs.get(0);
+				} else {
+					Boolean *tmp =  ((BooleanLogic *) array[1])->inputs.get(0);
+					array[1] = array[0];
+					array[0] = tmp;
+				}
+				return applyLogicalOperation(SATC_IMPLIES, newarray, 2);
+			}
+		} else {
+			array = newarray;
+			asize = newindex;
+		}
+		break;
+	}
+	case SATC_AND: {
+		uint newindex=0;
+		for(uint i=0;i<asize;i++) {
+			Boolean *b=array[i];
+			if (b->type == BOOLCONST) {
+				bool isTrue = ((BooleanConst *) b)->isTrue;
+				if (isTrue)
+					continue;
+				else
+					return b;
+			} else
+				newarray[newindex++]=b;
+		}
+		if(newindex==1) {
+			return newarray[0];
+		} else {
+			array = newarray;
+			asize = newindex;
+		}
+		break;
+	}
+	case SATC_IMPLIES: {
+		if (array[0]->type == BOOLCONST) {
+			BooleanConst *b=(BooleanConst *) array[0];
+			if (b->isTrue) {
+				return array[1];
+			} else {
+				return boolTrue;
+			}
+		} else if (array[1]->type == BOOLCONST) {
+			BooleanConst *b=(BooleanConst *) array[0];
+			if (b->isTrue) {
+				return b;
+			} else {
+				return applyLogicalOperation(SATC_NOT, array, 1);
+			}
+		}
+		break;
+	}
+	}
+	
+	Boolean *boolean = new BooleanLogic(this, op, array, asize);
+	Boolean *b = boolMap.get(boolean);
+	if (b == NULL) {
+		boolMap.put(boolean, boolean);
+		allBooleans.push(boolean);
+		return boolean;		
+	} else {
+		delete boolean;
+		return b;
+	}
 }
 
-Boolean *orderConstraint(CSolver *This, Order *order, uint64_t first, uint64_t second) {
-	Boolean *constraint = allocBooleanOrder(order, first, second);
-	pushVectorBoolean(This->allBooleans,constraint);
+Boolean *CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
+	Boolean *constraint = new BooleanOrder(order, first, second);
+	allBooleans.push(constraint);
 	return constraint;
 }
 
-int startEncoding(CSolver *This) {
-	naiveEncodingDecision(This);
-	SATEncoder *satEncoder = This->satEncoder;
-	computePolarities(This);
-	orderAnalysis(This);
-	encodeAllSATEncoder(This, satEncoder);
-	int result = solveCNF(satEncoder->cnf);
-	model_print("sat_solver's result:%d\tsolutionSize=%d\n", result, satEncoder->cnf->solver->solutionsize);
-	for (uint i = 1; i <= satEncoder->cnf->solver->solutionsize; i++) {
-		model_print("%d, ", satEncoder->cnf->solver->solution[i]);
+void CSolver::addConstraint(Boolean *constraint) {
+	if (constraint == boolTrue)
+		return;
+	else if (constraint == boolFalse)
+		setUnSAT();
+	else
+		constraints.add(constraint);
+}
+
+Order *CSolver::createOrder(OrderType type, Set *set) {
+	Order *order = new Order(type, set);
+	allOrders.push(order);
+	return order;
+}
+
+int CSolver::startEncoding() {
+	bool deleteTuner = false;
+	if (tuner == NULL) {
+		tuner = new DefaultTuner();
+		deleteTuner = true;
+	}
+		
+	long long startTime = getTimeNano();
+	computePolarities(this);
+	orderAnalysis(this);
+	naiveEncodingDecision(this);
+	satEncoder->encodeAllSATEncoder(this);
+	int result = unsat ? IS_UNSAT : satEncoder->solve();
+	long long finishTime = getTimeNano();
+	elapsedTime = finishTime - startTime;
+	if (deleteTuner) {
+		delete tuner;
+		tuner = NULL;
 	}
-	model_print("\n");
 	return result;
 }
 
-uint64_t getElementValue(CSolver *This, Element *element) {
-	switch (GETELEMENTTYPE(element)) {
+uint64_t CSolver::getElementValue(Element *element) {
+	switch (element->type) {
 	case ELEMSET:
 	case ELEMCONST:
 	case ELEMFUNCRETURN:
-		return getElementValueSATTranslator(This, element);
+		return getElementValueSATTranslator(this, element);
 	default:
 		ASSERT(0);
 	}
 	exit(-1);
 }
 
-bool getBooleanValue( CSolver *This, Boolean *boolean) {
-	switch (GETBOOLEANTYPE(boolean)) {
+bool CSolver::getBooleanValue(Boolean *boolean) {
+	switch (boolean->type) {
 	case BOOLEANVAR:
-		return getBooleanVariableValueSATTranslator(This, boolean);
+		return getBooleanVariableValueSATTranslator(this, boolean);
 	default:
 		ASSERT(0);
 	}
 	exit(-1);
 }
 
-HappenedBefore getOrderConstraintValue(CSolver *This, Order *order, uint64_t first, uint64_t second) {
-	return getOrderConstraintValueSATTranslator(This, order, first, second);
+HappenedBefore CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) {
+	return getOrderConstraintValueSATTranslator(this, order, first, second);
 }
 
+long long CSolver::getEncodeTime() { return satEncoder->getEncodeTime(); }
+
+long long CSolver::getSolveTime() { return satEncoder->getSolveTime(); }
+
+void CSolver::autoTune(uint budget) {
+	AutoTuner * autotuner=new AutoTuner(budget);
+	autotuner->addProblem(this);
+	autotuner->tune();
+	delete autotuner;
+}