#include "element.h"
#include "boolean.h"
#include "predicate.h"
+#include "order.h"
+#include "table.h"
CSolver * allocCSolver() {
CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
tmp->constraints=allocDefVectorBoolean();
- tmp->sets=allocDefVectorSet();
- tmp->elements=allocDefVectorElement();
+ tmp->allBooleans=allocDefVectorBoolean();
+ tmp->allSets=allocDefVectorSet();
+ tmp->allElements=allocDefVectorElement();
+ tmp->allPredicates = allocDefVectorPredicate();
+ tmp->allTables = allocDefVectorTable();
return tmp;
}
void deleteSolver(CSolver *this) {
deleteVectorBoolean(this->constraints);
- uint size=getSizeVectorSet(this->sets);
+
+ uint size=getSizeVectorBoolean(this->allBooleans);
for(uint i=0;i<size;i++) {
- deleteSet(getVectorSet(this->sets, i));
+ deleteBoolean(getVectorBoolean(this->allBooleans, i));
}
- deleteVectorSet(this->sets);
+ deleteVectorBoolean(this->allBooleans);
- size=getSizeVectorElement(this->elements);
+ size=getSizeVectorSet(this->allSets);
for(uint i=0;i<size;i++) {
- deleteElement(getVectorElement(this->elements, i));
+ deleteSet(getVectorSet(this->allSets, i));
}
- deleteVectorElement(this->elements);
+ deleteVectorSet(this->allSets);
+
+ size=getSizeVectorElement(this->allElements);
+ for(uint i=0;i<size;i++) {
+ deleteElement(getVectorElement(this->allElements, i));
+ }
+ //FIXME: Freeing alltables and allpredicates
+ deleteVectorElement(this->allElements);
ourfree(this);
}
Set * createSet(CSolver * this, VarType type, uint64_t * elements, uint numelements) {
Set * set=allocSet(type, elements, numelements);
- pushVectorSet(this->sets, set);
+ pushVectorSet(this->allSets, set);
return set;
}
Set * createRangeSet(CSolver * this, VarType type, uint64_t lowrange, uint64_t highrange) {
Set * set=allocSetRange(type, lowrange, highrange);
- pushVectorSet(this->sets, set);
+ pushVectorSet(this->allSets, set);
return set;
}
MutableSet * createMutableSet(CSolver * this, VarType type) {
MutableSet * set=allocMutableSet(type);
- pushVectorSet(this->sets, set);
+ pushVectorSet(this->allSets, set);
return set;
}
Element * getElementVar(CSolver *this, Set * set) {
Element * element=allocElement(set);
- pushVectorElement(this->elements, element);
+ pushVectorElement(this->allElements, element);
return element;
}
Boolean * getBooleanVar(CSolver *solver, VarType type) {
- Boolean* boolean= allocBoolean(type);
- pushVectorBoolean(solver->constraints, boolean);
- return boolean;
+ Boolean* boolean= allocBoolean(type);
+ pushVectorBoolean(solver->allBooleans, boolean);
+ 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;
}
-//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);
+ Predicate* predicate= allocPredicate(op, domain,numDomain);
+ pushVectorPredicate(solver->allPredicates, predicate);
+ return predicate;
}
Table * createTable(CSolver *solver, Set **domains, uint numDomain, Set * range) {
- return NULL;
+ Table* table= allocTable(domains,numDomain,range);
+ pushVectorTable(solver->allTables, table);
+ return table;
}
-void addTableEntry(CSolver *solver, uint64_t* inputs, uint inputSize, uint64_t 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;
}
-Element * applyFunction(CSolver *solver, Function * function, Element ** array) {
+Element * applyFunction(CSolver *solver, Function * function, Element ** array, Boolean * overflowstatus) {
return NULL;
}
return NULL;
}
-Boolean * applyLogicalOperation(CSolver *solver, enum LogicOp op, Boolean ** array) {
+Boolean * applyLogicalOperation(CSolver *solver, LogicOp op, Boolean ** array) {
return NULL;
}
pushVectorBoolean(this->constraints, constraint);
}
-Order * createOrder(CSolver *solver, enum OrderType type, Set * set) {
- return allocOrder(type, set);
+Order * createOrder(CSolver *solver, OrderType type, Set * set) {
+ return allocOrder(type, set);
}
Boolean * orderConstraint(CSolver *solver, Order * order, uint64_t first, uint64_t second) {
- Boolean* constraint = allocBooleanOrder(order, first, second);
- pushVectorBoolean(solver->constraints,constraint);
- return constraint;
+ Boolean* constraint = allocBooleanOrder(order, first, second);
+ pushVectorBoolean(solver->allBooleans,constraint);
+ return constraint;
}