X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.c;h=7179222096c54ab17af4cb31b5f2ec50e74659b8;hp=26a4be990b02b09edc0f9bf50f3741c2824b5a77;hb=7756da62dfcdbcbf306ca00ab3aee531ccb3324d;hpb=8757e01aecc2e4eb4b253609b4b9affca672e903

diff --git a/src/csolver.c b/src/csolver.c
index 26a4be9..7179222 100644
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -5,6 +5,7 @@
 #include "boolean.h"
 #include "predicate.h"
 #include "order.h"
+#include "table.h"
 
 CSolver * allocCSolver() {
 	CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
@@ -12,52 +13,54 @@ CSolver * allocCSolver() {
 	tmp->allBooleans=allocDefVectorBoolean();
 	tmp->allSets=allocDefVectorSet();
 	tmp->allElements=allocDefVectorElement();
+	tmp->allPredicates = allocDefVectorPredicate();
+	tmp->allTables = allocDefVectorTable();
 	return tmp;
 }
 
 /** This function tears down the solver and the entire AST */
 
-void deleteSolver(CSolver *this) {
-	deleteVectorBoolean(this->constraints);
+void deleteSolver(CSolver *This) {
+	deleteVectorBoolean(This->constraints);
 
-	uint size=getSizeVectorBoolean(this->allBooleans);
+	uint size=getSizeVectorBoolean(This->allBooleans);
 	for(uint i=0;i<size;i++) {
-		deleteBoolean(getVectorBoolean(this->allBooleans, i));
+		deleteBoolean(getVectorBoolean(This->allBooleans, i));
 	}
 
-	deleteVectorBoolean(this->allBooleans);
+	deleteVectorBoolean(This->allBooleans);
 
-	size=getSizeVectorSet(this->allSets);
+	size=getSizeVectorSet(This->allSets);
 	for(uint i=0;i<size;i++) {
-		deleteSet(getVectorSet(this->allSets, i));
+		deleteSet(getVectorSet(This->allSets, i));
 	}
 
-	deleteVectorSet(this->allSets);
+	deleteVectorSet(This->allSets);
 
-	size=getSizeVectorElement(this->allElements);
+	size=getSizeVectorElement(This->allElements);
 	for(uint i=0;i<size;i++) {
-		deleteElement(getVectorElement(this->allElements, i));
+		deleteElement(getVectorElement(This->allElements, i));
 	}
-
-	deleteVectorElement(this->allElements);
-	ourfree(this);
+	//FIXME: Freeing alltables and allpredicates
+	deleteVectorElement(This->allElements);
+	ourfree(This);
 }
 
-Set * createSet(CSolver * this, VarType type, uint64_t * elements, uint numelements) {
+Set * createSet(CSolver * This, VarType type, uint64_t * elements, uint numelements) {
 	Set * set=allocSet(type, elements, numelements);
-	pushVectorSet(this->allSets, set);
+	pushVectorSet(This->allSets, set);
 	return set;
 }
 
-Set * createRangeSet(CSolver * this, VarType type, uint64_t lowrange, uint64_t highrange) {
+Set * createRangeSet(CSolver * This, VarType type, uint64_t lowrange, uint64_t highrange) {
 	Set * set=allocSetRange(type, lowrange, highrange);
-	pushVectorSet(this->allSets, set);
+	pushVectorSet(This->allSets, set);
 	return set;
 }
 
-MutableSet * createMutableSet(CSolver * this, VarType type) {
+MutableSet * createMutableSet(CSolver * This, VarType type) {
 	MutableSet * set=allocMutableSet(type);
-	pushVectorSet(this->allSets, set);
+	pushVectorSet(This->allSets, set);
 	return set;
 }
 
@@ -71,9 +74,9 @@ uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
 	return element;
 }
 
-Element * getElementVar(CSolver *this, Set * set) {
+Element * getElementVar(CSolver *This, Set * set) {
 	Element * element=allocElement(set);
-	pushVectorElement(this->allElements, element);
+	pushVectorElement(This->allElements, element);
 	return element;
 }
 
@@ -83,26 +86,32 @@ Boolean * getBooleanVar(CSolver *solver, VarType type) {
 	return boolean;
 }
 
-Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, uint numDomain, Set * range,
+																	OverFlowBehavior overflowbehavior) {
 	return NULL;
 }
 
-Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain, uint numDomain) {
-	return allocPredicate(op, domain,numDomain);
+Predicate * createPredicateOperator(CSolver *solver, CompOp op, Set ** domain, uint numDomain) {
+	Predicate* predicate= allocPredicate(op, domain,numDomain);
+	pushVectorPredicate(solver->allPredicates, predicate);
+	return predicate;
 }
 
 Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range) {
-	return NULL;
+	Table* table= allocTable(domains,numDomain,range);
+	pushVectorTable(solver->allTables, table);
+	return table;
 }
 
-void addTableEntry(CSolver *solver, uint64_t* inputs, uint inputSize, uint64_t result) {
+void addTableEntry(CSolver *solver, Table* table, uint64_t* inputs, uint inputSize, uint64_t result) {
+    addNewTableEntry(table,inputs, inputSize,result);
 }
 
 Function * completeTable(CSolver *solver, Table * table) {
 	return NULL;
 }
 
-Element * applyFunction(CSolver *solver, Function * function, Element ** array) {
+Element * applyFunction(CSolver *solver, Function * function, Element ** array, Boolean * overflowstatus) {
 	return NULL;
 }
 
@@ -110,15 +119,15 @@ Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inpu
 	return NULL;
 }
 
-Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** array) {
+Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array) {
 	return NULL;
 }
 
-void addBoolean(CSolver *this, Boolean * constraint) {
-	pushVectorBoolean(this->constraints, constraint);
+void addBoolean(CSolver *This, Boolean * constraint) {
+	pushVectorBoolean(This->constraints, constraint);
 }
 
-Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
+Order * createOrder(CSolver *solver, OrderType type, Set * set) {
 	return allocOrder(type, set);
 }