Start work on Naive Encoders

[satune.git] / src / csolver.c

diff --git a/src/csolver.c b/src/csolver.c
index 68bbb469e811c75d74c678793bd32095323fd4d2..7179222096c54ab17af4cb31b5f2ec50e74659b8 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -1,10 +1,10 @@
 #include "csolver.h"
-#include "AST/set.h"
-#include "AST/mutableset.h"
-#include "AST/element.h"
-#include "AST/boolean.h"
-#include "AST/predicate.h"
-#include "AST/order.h"
+#include "set.h"
+#include "mutableset.h"
+#include "element.h"
+#include "boolean.h"
+#include "predicate.h"
+#include "order.h"
 #include "table.h"
 
 CSolver * allocCSolver() {
@@ -20,47 +20,47 @@ CSolver * allocCSolver() {
 
 /** This function tears down the solver and the entire AST */
 
-void deleteSolver(CSolver *this) {
-       deleteVectorBoolean(this->constraints);
+void deleteSolver(CSolver *This) {
+       deleteVectorBoolean(This->constraints);
 
-       uint size=getSizeVectorBoolean(this->allBooleans);
+       uint size=getSizeVectorBoolean(This->allBooleans);
        for(uint i=0;i<size;i++) {
-               deleteBoolean(getVectorBoolean(this->allBooleans, i));
+               deleteBoolean(getVectorBoolean(This->allBooleans, i));
        }
 
-       deleteVectorBoolean(this->allBooleans);
+       deleteVectorBoolean(This->allBooleans);
 
-       size=getSizeVectorSet(this->allSets);
+       size=getSizeVectorSet(This->allSets);
        for(uint i=0;i<size;i++) {
-               deleteSet(getVectorSet(this->allSets, i));
+               deleteSet(getVectorSet(This->allSets, i));
        }
 
-       deleteVectorSet(this->allSets);
+       deleteVectorSet(This->allSets);
 
-       size=getSizeVectorElement(this->allElements);
+       size=getSizeVectorElement(This->allElements);
        for(uint i=0;i<size;i++) {
-               deleteElement(getVectorElement(this->allElements, i));
+               deleteElement(getVectorElement(This->allElements, i));
        }
        //FIXME: Freeing alltables and allpredicates
-       deleteVectorElement(this->allElements);
-       ourfree(this);
+       deleteVectorElement(This->allElements);
+       ourfree(This);
 }
 
-Set * createSet(CSolver * this, VarType type, uint64_t * elements, uint numelements) {
+Set * createSet(CSolver * This, VarType type, uint64_t * elements, uint numelements) {
        Set * set=allocSet(type, elements, numelements);
-       pushVectorSet(this->allSets, set);
+       pushVectorSet(This->allSets, set);
        return set;
 }
 
-Set * createRangeSet(CSolver * this, VarType type, uint64_t lowrange, uint64_t highrange) {
+Set * createRangeSet(CSolver * This, VarType type, uint64_t lowrange, uint64_t highrange) {
        Set * set=allocSetRange(type, lowrange, highrange);
-       pushVectorSet(this->allSets, set);
+       pushVectorSet(This->allSets, set);
        return set;
 }
 
-MutableSet * createMutableSet(CSolver * this, VarType type) {
+MutableSet * createMutableSet(CSolver * This, VarType type) {
        MutableSet * set=allocMutableSet(type);
-       pushVectorSet(this->allSets, set);
+       pushVectorSet(This->allSets, set);
        return set;
 }
 
@@ -74,9 +74,9 @@ uint64_t createUniqueItem(CSolver *solver, MutableSet * set) {
        return element;
 }
 
-Element * getElementVar(CSolver *this, Set * set) {
+Element * getElementVar(CSolver *This, Set * set) {
        Element * element=allocElement(set);
-       pushVectorElement(this->allElements, element);
+       pushVectorElement(This->allElements, element);
        return element;
 }
 
@@ -86,12 +86,12 @@ Boolean * getBooleanVar(CSolver *solver, VarType type) {
        return boolean;
 }
 
-Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range,
-        enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
+Function * createFunctionOperator(CSolver *solver, ArithOp op, Set ** domain, uint numDomain, Set * range,
+                                                                                                                                       OverFlowBehavior overflowbehavior) {
        return NULL;
 }
 
-Predicate * createPredicateOperator(CSolver *solver, enum CompOp op, Set ** domain, uint numDomain) {
+Predicate * createPredicateOperator(CSolver *solver, CompOp op, Set ** domain, uint numDomain) {
        Predicate* predicate= allocPredicate(op, domain,numDomain);
        pushVectorPredicate(solver->allPredicates, predicate);
        return predicate;
@@ -111,7 +111,7 @@ Function * completeTable(CSolver *solver, Table * table) {
        return NULL;
 }
 
-Element * applyFunction(CSolver *solver, Function * function, Element ** array) {
+Element * applyFunction(CSolver *solver, Function * function, Element ** array, Boolean * overflowstatus) {
        return NULL;
 }
 
@@ -119,15 +119,15 @@ Boolean * applyPredicate(CSolver *solver, Predicate * predicate, Element ** inpu
        return NULL;
 }
 
-Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** array) {
+Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array) {
        return NULL;
 }
 
-void addBoolean(CSolver *this, Boolean * constraint) {
-       pushVectorBoolean(this->constraints, constraint);
+void addBoolean(CSolver *This, Boolean * constraint) {
+       pushVectorBoolean(This->constraints, constraint);
 }
 
-Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
+Order * createOrder(CSolver *solver, OrderType type, Set * set) {
        return allocOrder(type, set);
 }