Reorg code

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index a6dde8fe27489b4e775ba39ce441ceb0cc9d80ea..d1b0f5830420ba46a4c2cb3ef87f18262d4bcb3a 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,35 +1,71 @@
 #include "csolver.h"
+#include "set.h"
+#include "mutableset.h"
+#include "element.h"
 
 CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
-       tmp->constraint=allocDefVectorBoolean();
+       tmp->constraints=allocDefVectorBoolean();
+       tmp->sets=allocDefVectorSet();
+       tmp->elements=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=getSizeVectorSet(this->sets);
+       for(uint i=0;i<size;i++) {
+               deleteSet(getVectorSet(this->sets, i));
+       }
+
+       deleteVectorSet(this->sets);
+
+       size=getSizeVectorElement(this->elements);
+       for(uint i=0;i<size;i++) {
+               deleteElement(getVectorElement(this->elements, i));
+       }
+
+       deleteVectorElement(this->elements);
+       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->sets, 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->sets, set);
+       return set;
+}
+
+MutableSet * createMutableSet(CSolver * this, VarType type) {
+       MutableSet * set=allocMutableSet(type);
+       pushVectorSet(this->sets, set);
+       return set;
 }
 
 void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+       addElementMSet(set, element);
 }
 
-int64_t createUniqueItem(CSolver *solver, MutableSet * set) {
-       return 0;
+uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
+       uint64_t element=set->low++;
+       addElementMSet(set, element);
+       return element;
 }
 
-Element * getElementVar(CSolver *solver, Set * set) {
-       return NULL;
+Element * getElementVar(CSolver *this, Set * set) {
+       Element * element=allocElement(set);
+       pushVectorElement(this->elements, element);
+       return element;
 }
 
-Boolean * getBooleanVar(CSolver *solver) {
+Boolean * getBooleanVar(CSolver *solver, VarType type) {
        return NULL;
 }
 
@@ -68,7 +104,8 @@ 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) {