Fix warnings, merge, and check my code in

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index a6dde8fe27489b4e775ba39ce441ceb0cc9d80ea..7a9d1e0d2870ce3c87d4adf828fc9665655af3a4 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,80 +1,162 @@
 #include "csolver.h"
+#include "set.h"
+#include "mutableset.h"
+#include "element.h"
+#include "boolean.h"
+#include "predicate.h"
+#include "order.h"
+#include "table.h"
+#include "function.h"
 
 CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
-       tmp->constraint=allocDefVectorBoolean();
+       tmp->constraints=allocDefVectorBoolean();
+       tmp->allBooleans=allocDefVectorBoolean();
+       tmp->allSets=allocDefVectorSet();
+       tmp->allElements=allocDefVectorElement();
+       tmp->allPredicates = allocDefVectorPredicate();
+       tmp->allTables = allocDefVectorTable();
+       tmp->allOrders = allocDefVectorOrder();
+       tmp->allFunctions = allocDefVectorFunction();
        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));
+       }
+       size=getSizeVectorTable(This->allTables);
+       for(uint i=0;i<size;i++) {
+               deleteTable(getVectorTable(This->allTables, i));
+       }
+       size=getSizeVectorPredicate(This->allPredicates);
+       for(uint i=0;i<size;i++) {
+               deletePredicate(getVectorPredicate(This->allPredicates, i));
+       }
+       size=getSizeVectorOrder(This->allOrders);
+       for(uint i=0;i<size;i++) {
+               deleteOrder(getVectorOrder(This->allOrders, i));
+       }
+       deleteVectorOrder(This->allOrders);
+       size=getSizeVectorFunction(This->allFunctions);
+       for(uint i=0;i<size;i++) {
+               deleteFunction(getVectorFunction(This->allFunctions, i));
+       }
+       deleteVectorFunction(This->allFunctions);
+       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) {
-       return NULL;
+Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, uint numDomain, Set * range,OverFlowBehavior overflowbehavior) {
+    Function* function = allocFunctionOperator(op, domain, numDomain, range, overflowbehavior);
+    pushVectorFunction(solver->allFunctions, function);
+    return function;
 }
 
-Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain) {
-       return NULL;
+Predicate * createPredicateOperator(CSolver *solver, CompOp op, Set ** domain, uint numDomain) {
+       Predicate* predicate= allocPredicate(op, domain,numDomain);
+       pushVectorPredicate(solver->allPredicates, predicate);
+       return predicate;
 }
 
-Table * createTable(CSolver *solver, Set **domains, Set * range) {
-       return NULL;
+Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range) {
+       Table* table= allocTable(domains,numDomain,range);
+       pushVectorTable(solver->allTables, table);
+       return table;
 }
 
-void addTableEntry(CSolver *solver, Element ** inputs, Element *result) {
+void addTableEntry(CSolver *solver, Table* table, uint64_t* inputs, uint inputSize, uint64_t result) {
+    addNewTableEntry(table,inputs, inputSize,result);
 }
 
 Function * completeTable(CSolver *solver, Table * table) {
-       return NULL;
+    Function* function = allocFunctionTable(table);
+    pushVectorFunction(solver->allFunctions,function);
+    return function;
 }
 
-Element * applyFunction(CSolver *solver, Function * function, Element ** array) {
+Element * applyFunction(CSolver *solver, Function * function, Element ** array, uint numArrays, Boolean * overflowstatus) {
        return NULL;
 }
 
-Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inputs) {
+Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inputs, uint numInputs) {
        return NULL;
 }
 
-Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** array) {
+Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array) {
        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;
+Order * createOrder(CSolver *solver, OrderType type, Set * set) {
+       Order* order = allocOrder(type, set);
+       pushVectorOrder(solver->allOrders, order);
+       return order;
 }
 
 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;
 }