edits

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index 20e729a5ef391ee0c86b46703d204df64e98e523..1d1413a9c60dcded40c67e2852701ab63f1d6227 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,65 +1,130 @@
 #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=allocVector();
+       tmp->constraints=allocDefVectorBoolean();
+       tmp->allBooleans=allocDefVectorBoolean();
+       tmp->allSets=allocDefVectorSet();
+       tmp->allElements=allocDefVectorElement();
        return tmp;
 }
 
-Set * createSet(CSolver * solver, Type type, uint64_t ** elements) {
-       
+/** 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 * createSet(CSolver * solver, Type type, uint64_t lowrange, uint64_t highrange) {
+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, Type type) {
+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 CSolver::addItem(MutableSet * set, uint64_t element) {
+MutableSet * createMutableSet(CSolver * this, VarType type) {
+       MutableSet * set=allocMutableSet(type);
+       pushVectorSet(this->allSets, set);
+       return set;
 }
 
-int64_t CSolver::createUniqueItem(MutableSet * set) {
+void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+       addElementMSet(set, element);
 }
 
-Element * CSolver::getElementVar(Set * set) {
+uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
+       uint64_t element=set->low++;
+       addElementMSet(set, element);
+       return element;
 }
 
-Boolean * CSolver::getBooleanVar() {
+Element * getElementVar(CSolver *this, Set * set) {
+       Element * element=allocElement(set);
+       pushVectorElement(this->allElements, element);
+       return element;
 }
 
-Function * CSolver::createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+Boolean * getBooleanVar(CSolver *solver, VarType type) {
+       Boolean* boolean= allocBoolean(type);
+       pushVectorBoolean(solver->allBooleans, boolean);
+       return boolean;
 }
 
-Function * CSolver::createFunctionOperator(enum ArithOp op) {
+Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range,
+                                                                                                                                       enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+       return NULL;
 }
 
-Predicate * CSolver::createPredicateOperator(enum CompOp op, Set ** domain) {
+Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain, uint numDomain) {
+       return allocPredicate(op, domain,numDomain);
 }
 
-Table * CSolver::createTable(Set **domains, Set * range) {
+Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range) {
+       return NULL;
 }
 
-void CSolver::addTableEntry(Element ** inputs, Element *result) {
+void addTableEntry(CSolver *solver, uint64_t* inputs, uint inputSize, uint64_t result) {
 }
 
-Function * CSolver::completeTable(struct Table *) {
+Function * completeTable(CSolver *solver, Table * table) {
+       return NULL;
 }
 
-Element * CSolver::applyFunction(Function * function, Element ** array) {
+Element * applyFunction(CSolver *solver, Function * function, Element ** array) {
+       return NULL;
 }
 
-Boolean * CSolver::applyPredicate(Predicate * predicate, Element ** inputs) {
+Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inputs) {
+       return NULL;
 }
 
-Boolean * CSolver::applyLogicalOperation(enum LogicOp op, Boolean ** array) {
+Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** array) {
+       return NULL;
 }
 
-void CSolver::addBoolean(Boolean * constraint) {
+void addBoolean(CSolver *this, Boolean * constraint) {
+       pushVectorBoolean(this->constraints, constraint);
 }
 
-Order * CSolver::createOrder(enum OrderType type, Set * set) {
+Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
+       return allocOrder(type, set);
 }
 
-Boolean * CSolver::orderedConstraint(Order * order, uint64_t first, uint64_t second) {
+Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64_t second) {
+       Boolean* constraint = allocBooleanOrder(order, first, second);
+       pushVectorBoolean(solver->allBooleans,constraint);
+       return constraint;
 }