Implementing client interfaces regarding Sets

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index 20e729a5ef391ee0c86b46703d204df64e98e523..2e4f31659874524a98f642d12b47b0c0ccf17f7d 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,65 +1,90 @@
 #include "csolver.h"
-
+#include "set.h"
+#include "mutableset.h"
+#include "element.h"
 CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
-       tmp->constraint=allocVector();
+       tmp->constraint=allocDefVectorBoolean();
+        tmp->uniqSec=1;
        return tmp;
 }
 
-Set * createSet(CSolver * solver, Type type, uint64_t ** elements) {
-       
+Set * createSet(CSolver * solver, VarType type, uint64_t * elements, uint num) {
+    Set* set = allocSet(type, elements,num );
+    return set;
 }
 
-Set * createSet(CSolver * solver, Type type, uint64_t lowrange, uint64_t highrange) {
+Set * createRangeSet(CSolver * solver, VarType type, uint64_t lowrange, uint64_t highrange) {
+    Set* rset = allocSetRange(type, lowrange, highrange);
+    return rset;
 }
 
-MutableSet * createMutableSet(CSolver * solver, Type type) {
+MutableSet * createMutableSet(CSolver * solver, VarType type) {
+    MutableSet* mset = allocMutableSet(type);
+    return mset;
 }
 
-void CSolver::addItem(MutableSet * set, uint64_t element) {
+void addItem(CSolver *solver, MutableSet * set, uint64_t element) {
+    addElementMSet(set, element);
 }
 
-int64_t CSolver::createUniqueItem(MutableSet * set) {
+int64_t createUniqueItem(CSolver *solver, MutableSet * set) {
+    uint64_t uSec= solver->uniqSec++;
+    addElementMSet(set, uSec);
+    return uSec;
 }
 
-Element * CSolver::getElementVar(Set * set) {
+Element * getElementVar(CSolver *solver, Set * set) {
+    return allocElement(set);
 }
 
-Boolean * CSolver::getBooleanVar() {
+Boolean * getBooleanVar(CSolver *solver) {
+    return NULL;
 }
 
-Function * CSolver::createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+       return NULL;
 }
 
-Function * CSolver::createFunctionOperator(enum ArithOp op) {
+Function * createFunctionOperatorPure(CSolver *solver, enum ArithOp op) {
+       return NULL;
 }
 
-Predicate * CSolver::createPredicateOperator(enum CompOp op, Set ** domain) {
+Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain) {
+       return NULL;
 }
 
-Table * CSolver::createTable(Set **domains, Set * range) {
+Table * createTable(CSolver *solver, Set **domains, Set * range) {
+       return NULL;
 }
 
-void CSolver::addTableEntry(Element ** inputs, Element *result) {
+void addTableEntry(CSolver *solver, Element ** inputs, Element *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 *solver, Boolean * constraint) {
+    solver->
 }
 
-Order * CSolver::createOrder(enum OrderType type, Set * set) {
+Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
+       return NULL;
 }
 
-Boolean * CSolver::orderedConstraint(Order * order, uint64_t first, uint64_t second) {
+Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64_t second) {
+       return NULL;
 }