Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index 2e4f31659874524a98f642d12b47b0c0ccf17f7d..5ddaaeda13e13e79db6bb291f2705418217241c4 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -2,63 +2,95 @@
 #include "set.h"
 #include "mutableset.h"
 #include "element.h"
+#include "boolean.h"
+#include "predicate.h"
+
 CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
-       tmp->constraint=allocDefVectorBoolean();
-        tmp->uniqSec=1;
+       tmp->constraints=allocDefVectorBoolean();
+       tmp->sets=allocDefVectorSet();
+       tmp->elements=allocDefVectorElement();
        return tmp;
 }
 
-Set * createSet(CSolver * solver, VarType type, uint64_t * elements, uint num) {
-    Set* set = allocSet(type, elements,num );
-    return set;
+/** 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) {
-    Set* rset = allocSetRange(type, lowrange, highrange);
-    return rset;
+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) {
-    MutableSet* mset = allocMutableSet(type);
-    return mset;
+Set * createRangeSet(CSolver * this, VarType type, uint64_t lowrange, uint64_t highrange) {
+       Set * set=allocSetRange(type, lowrange, highrange);
+       pushVectorSet(this->sets, set);
+       return set;
 }
 
-void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
-    addElementMSet(set, element);
+MutableSet * createMutableSet(CSolver * this, VarType type) {
+       MutableSet * set=allocMutableSet(type);
+       pushVectorSet(this->sets, set);
+       return set;
 }
 
-int64_t createUniqueItem(CSolver *solver, MutableSet * set) {
-    uint64_t uSec= solver->uniqSec++;
-    addElementMSet(set, uSec);
-    return uSec;
+void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+       addElementMSet(set, element);
 }
 
-Element * getElementVar(CSolver *solver, Set * set) {
-    return allocElement(set);
+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->elements, 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->constraints, 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;
+//Function * createFunctionOperatorPure(CSolver *solver, enum ArithOp op) {
+//     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) {
@@ -77,14 +109,16 @@ Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** arr
        return NULL;
 }
 
-void addBoolean(CSolver *solver, Boolean * constraint) {
-    solver->
+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->constraints,constraint);
+    return constraint;
 }