X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.c;h=26a4be990b02b09edc0f9bf50f3741c2824b5a77;hp=a6dde8fe27489b4e775ba39ce441ceb0cc9d80ea;hb=3abc4365ea744c8b2327aa5fdee3878867711ce1;hpb=2ef6d0360a8317b47f1a78990e2ed2f660855b53

diff --git a/src/csolver.c b/src/csolver.c
index a6dde8f..26a4be9 100644
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,55 +1,101 @@
 #include "csolver.h"
+#include "set.h"
+#include "mutableset.h"
+#include "element.h"
+#include "boolean.h"
+#include "predicate.h"
+#include "order.h"
 
 CSolver * allocCSolver() {
 	CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
-	tmp->constraint=allocDefVectorBoolean();
+	tmp->constraints=allocDefVectorBoolean();
+	tmp->allBooleans=allocDefVectorBoolean();
+	tmp->allSets=allocDefVectorSet();
+	tmp->allElements=allocDefVectorElement();
 	return tmp;
 }
 
-Set * createSet(CSolver * solver, VarType type, uint64_t ** elements) {
-	return NULL;
+/** This function tears down the solver and the entire AST */
+
+void deleteSolver(CSolver *this) {
+	deleteVectorBoolean(this->constraints);
+
+	uint size=getSizeVectorBoolean(this->allBooleans);
+	for(uint i=0;i<size;i++) {
+		deleteBoolean(getVectorBoolean(this->allBooleans, i));
+	}
+
+	deleteVectorBoolean(this->allBooleans);
+
+	size=getSizeVectorSet(this->allSets);
+	for(uint i=0;i<size;i++) {
+		deleteSet(getVectorSet(this->allSets, i));
+	}
+
+	deleteVectorSet(this->allSets);
+
+	size=getSizeVectorElement(this->allElements);
+	for(uint i=0;i<size;i++) {
+		deleteElement(getVectorElement(this->allElements, i));
+	}
+
+	deleteVectorElement(this->allElements);
+	ourfree(this);
 }
 
-Set * createRangeSet(CSolver * solver, VarType type, uint64_t lowrange, uint64_t highrange) {
-	return NULL;
+Set * createSet(CSolver * this, VarType type, uint64_t * elements, uint numelements) {
+	Set * set=allocSet(type, elements, numelements);
+	pushVectorSet(this->allSets, set);
+	return set;
 }
 
-MutableSet * createMutableSet(CSolver * solver, VarType type) {
-	return NULL;
+Set * createRangeSet(CSolver * this, VarType type, uint64_t lowrange, uint64_t highrange) {
+	Set * set=allocSetRange(type, lowrange, highrange);
+	pushVectorSet(this->allSets, set);
+	return set;
 }
 
-void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+MutableSet * createMutableSet(CSolver * this, VarType type) {
+	MutableSet * set=allocMutableSet(type);
+	pushVectorSet(this->allSets, set);
+	return set;
 }
 
-int64_t createUniqueItem(CSolver *solver, MutableSet * set) {
-	return 0;
+void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+	addElementMSet(set, element);
 }
 
-Element * getElementVar(CSolver *solver, Set * set) {
-	return NULL;
+uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
+	uint64_t element=set->low++;
+	addElementMSet(set, element);
+	return element;
 }
 
-Boolean * getBooleanVar(CSolver *solver) {
-	return NULL;
+Element * getElementVar(CSolver *this, Set * set) {
+	Element * element=allocElement(set);
+	pushVectorElement(this->allElements, element);
+	return element;
 }
 
-Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
-	return NULL;
+Boolean * getBooleanVar(CSolver *solver, VarType type) {
+	Boolean* boolean= allocBoolean(type);
+	pushVectorBoolean(solver->allBooleans, boolean);
+	return boolean;
 }
 
-Function * createFunctionOperatorPure(CSolver *solver, enum ArithOp op) {
+Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
 	return NULL;
 }
 
-Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain) {
-	return NULL;
+Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain, uint numDomain) {
+	return allocPredicate(op, domain,numDomain);
 }
 
-Table * createTable(CSolver *solver, Set **domains, Set * range) {
+Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range) {
 	return NULL;
 }
 
-void addTableEntry(CSolver *solver, Element ** inputs, Element *result) {
+void addTableEntry(CSolver *solver, uint64_t* inputs, uint inputSize, uint64_t result) {
 }
 
 Function * completeTable(CSolver *solver, Table * table) {
@@ -68,13 +114,16 @@ Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** arr
 	return NULL;
 }
 
-void addBoolean(CSolver *solver, Boolean * constraint) {
+void addBoolean(CSolver *this, Boolean * constraint) {
+	pushVectorBoolean(this->constraints, constraint);
 }
 
 Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
-	return NULL;
+	return allocOrder(type, set);
 }
 
 Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64_t second) {
-	return NULL;
+	Boolean* constraint = allocBooleanOrder(order, first, second);
+	pushVectorBoolean(solver->allBooleans,constraint);
+	return constraint;
 }