#include "tunable.h"
#include "orderencoder.h"
#include "polarityassignment.h"
+#include "asttransform.h"
-CSolver *allocCSolver() {
- CSolver *This = (CSolver *) ourmalloc(sizeof(CSolver));
- This->unsat = false;
- This->constraints = allocDefHashSetBoolean();
- This->allBooleans = allocDefVectorBoolean();
- This->allSets = allocDefVectorSet();
- This->allElements = allocDefVectorElement();
- This->allPredicates = allocDefVectorPredicate();
- This->allTables = allocDefVectorTable();
- This->allOrders = allocDefVectorOrder();
- This->allFunctions = allocDefVectorFunction();
- This->tuner = allocTuner();
- This->satEncoder = allocSATEncoder(This);
- return This;
+CSolver::CSolver() : unsat(false) {
+ tuner = allocTuner();
+ satEncoder = allocSATEncoder(this);
}
/** This function tears down the solver and the entire AST */
-void deleteSolver(CSolver *This) {
- deleteHashSetBoolean(This->constraints);
-
- uint size = getSizeVectorBoolean(This->allBooleans);
+CSolver::~CSolver() {
+ uint size = allBooleans.getSize();
for (uint i = 0; i < size; i++) {
- deleteBoolean(getVectorBoolean(This->allBooleans, i));
+ delete allBooleans.get(i);
}
- deleteVectorBoolean(This->allBooleans);
- size = getSizeVectorSet(This->allSets);
+ size = allSets.getSize();
for (uint i = 0; i < size; i++) {
- deleteSet(getVectorSet(This->allSets, i));
+ delete allSets.get(i);
}
- deleteVectorSet(This->allSets);
- size = getSizeVectorElement(This->allElements);
+ size = allElements.getSize();
for (uint i = 0; i < size; i++) {
- deleteElement(getVectorElement(This->allElements, i));
+ delete allElements.get(i);
}
- deleteVectorElement(This->allElements);
- size = getSizeVectorTable(This->allTables);
+ size = allTables.getSize();
for (uint i = 0; i < size; i++) {
- deleteTable(getVectorTable(This->allTables, i));
+ delete allTables.get(i);
}
- deleteVectorTable(This->allTables);
- size = getSizeVectorPredicate(This->allPredicates);
+ size = allPredicates.getSize();
for (uint i = 0; i < size; i++) {
- deletePredicate(getVectorPredicate(This->allPredicates, i));
+ delete allPredicates.get(i);
}
- deleteVectorPredicate(This->allPredicates);
- size = getSizeVectorOrder(This->allOrders);
+ size = allOrders.getSize();
for (uint i = 0; i < size; i++) {
- deleteOrder(getVectorOrder(This->allOrders, i));
+ delete allOrders.get(i);
}
- deleteVectorOrder(This->allOrders);
- size = getSizeVectorFunction(This->allFunctions);
+ size = allFunctions.getSize();
for (uint i = 0; i < size; i++) {
- deleteFunction(getVectorFunction(This->allFunctions, i));
+ delete allFunctions.get(i);
}
- deleteVectorFunction(This->allFunctions);
- deleteSATEncoder(This->satEncoder);
- deleteTuner(This->tuner);
- ourfree(This);
+
+ deleteSATEncoder(satEncoder);
+ deleteTuner(tuner);
}
-Set *createSet(CSolver *This, VarType type, uint64_t *elements, uint numelements) {
- Set *set = allocSet(type, elements, numelements);
- pushVectorSet(This->allSets, set);
+Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {
+ Set *set = new Set(type, elements, numelements);
+ allSets.push(set);
return set;
}
-Set *createRangeSet(CSolver *This, VarType type, uint64_t lowrange, uint64_t highrange) {
- Set *set = allocSetRange(type, lowrange, highrange);
- pushVectorSet(This->allSets, set);
+Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange) {
+ Set *set = new Set(type, lowrange, highrange);
+ allSets.push(set);
return set;
}
-MutableSet *createMutableSet(CSolver *This, VarType type) {
- MutableSet *set = allocMutableSet(type);
- pushVectorSet(This->allSets, set);
+MutableSet *CSolver::createMutableSet(VarType type) {
+ MutableSet *set = new MutableSet(type);
+ allSets.push(set);
return set;
}
-void addItem(CSolver *This, MutableSet *set, uint64_t element) {
- addElementMSet(set, element);
+void CSolver::addItem(MutableSet *set, uint64_t element) {
+ set->addElementMSet(element);
}
-uint64_t createUniqueItem(CSolver *This, MutableSet *set) {
+uint64_t CSolver::createUniqueItem(MutableSet *set) {
uint64_t element = set->low++;
- addElementMSet(set, element);
+ set->addElementMSet(element);
return element;
}
-Element *getElementVar(CSolver *This, Set *set) {
- Element *element = allocElementSet(set);
- pushVectorElement(This->allElements, element);
+Element *CSolver::getElementVar(Set *set) {
+ Element *element = new ElementSet(set);
+ allElements.push(element);
return element;
}
-Element *getElementConst(CSolver *This, VarType type, uint64_t value) {
- Element *element = allocElementConst(value, type);
- pushVectorElement(This->allElements, element);
+Element *CSolver::getElementConst(VarType type, uint64_t value) {
+ Element *element = new ElementConst(value, type);
+ allElements.push(element);
return element;
}
-Boolean *getBooleanVar(CSolver *This, VarType type) {
- Boolean *boolean = allocBooleanVar(type);
- pushVectorBoolean(This->allBooleans, boolean);
+Boolean *CSolver::getBooleanVar(VarType type) {
+ Boolean *boolean = new BooleanVar(type);
+ allBooleans.push(boolean);
return boolean;
}
-Function *createFunctionOperator(CSolver *This, ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
- Function *function = allocFunctionOperator(op, domain, numDomain, range, overflowbehavior);
- pushVectorFunction(This->allFunctions, function);
+Function *CSolver::createFunctionOperator(ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
+ Function *function = new FunctionOperator(op, domain, numDomain, range, overflowbehavior);
+ allFunctions.push(function);
return function;
}
-Predicate *createPredicateOperator(CSolver *This, CompOp op, Set **domain, uint numDomain) {
- Predicate *predicate = allocPredicateOperator(op, domain,numDomain);
- pushVectorPredicate(This->allPredicates, predicate);
+Predicate *CSolver::createPredicateOperator(CompOp op, Set **domain, uint numDomain) {
+ Predicate *predicate = new PredicateOperator(op, domain,numDomain);
+ allPredicates.push(predicate);
return predicate;
}
-Predicate *createPredicateTable(CSolver *This, Table *table, UndefinedBehavior behavior) {
- Predicate *predicate = allocPredicateTable(table, behavior);
- pushVectorPredicate(This->allPredicates, predicate);
+Predicate *CSolver::createPredicateTable(Table *table, UndefinedBehavior behavior) {
+ Predicate *predicate = new PredicateTable(table, behavior);
+ allPredicates.push(predicate);
return predicate;
}
-Table *createTable(CSolver *This, Set **domains, uint numDomain, Set *range) {
- Table *table = allocTable(domains,numDomain,range);
- pushVectorTable(This->allTables, table);
+Table *CSolver::createTable(Set **domains, uint numDomain, Set *range) {
+ Table *table = new Table(domains,numDomain,range);
+ allTables.push(table);
return table;
}
-Table *createTableForPredicate(CSolver *solver, Set **domains, uint numDomain) {
- return createTable(solver, domains, numDomain, NULL);
+Table *CSolver::createTableForPredicate(Set **domains, uint numDomain) {
+ return createTable(domains, numDomain, NULL);
}
-void addTableEntry(CSolver *This, Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
- addNewTableEntry(table,inputs, inputSize,result);
+void CSolver::addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
+ table->addNewTableEntry(inputs, inputSize, result);
}
-Function *completeTable(CSolver *This, Table *table, UndefinedBehavior behavior) {
- Function *function = allocFunctionTable(table, behavior);
- pushVectorFunction(This->allFunctions,function);
+Function *CSolver::completeTable(Table *table, UndefinedBehavior behavior) {
+ Function *function = new FunctionTable(table, behavior);
+ allFunctions.push(function);
return function;
}
-Element *applyFunction(CSolver *This, Function *function, Element **array, uint numArrays, Boolean *overflowstatus) {
- Element *element = allocElementFunction(function,array,numArrays,overflowstatus);
- pushVectorElement(This->allElements, element);
+Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus) {
+ Element *element = new ElementFunction(function,array,numArrays,overflowstatus);
+ allElements.push(element);
return element;
}
-Boolean *applyPredicate(CSolver *This, Predicate *predicate, Element **inputs, uint numInputs) {
- return applyPredicateTable(This, predicate, inputs, numInputs, NULL);
+Boolean *CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) {
+ return applyPredicateTable(predicate, inputs, numInputs, NULL);
}
-Boolean *applyPredicateTable(CSolver *This, Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
- Boolean *boolean = allocBooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
- pushVectorBoolean(This->allBooleans, boolean);
+
+Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
+ Boolean *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
+ allBooleans.push(boolean);
return boolean;
}
-Boolean *applyLogicalOperation(CSolver *This, LogicOp op, Boolean **array, uint asize) {
- return allocBooleanLogicArray(This, op, array, asize);
+Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean **array, uint asize) {
+ return new BooleanLogic(this, op, array, asize);
}
-void addConstraint(CSolver *This, Boolean *constraint) {
- addHashSetBoolean(This->constraints, constraint);
+void CSolver::addConstraint(Boolean *constraint) {
+ constraints.add(constraint);
}
-Order *createOrder(CSolver *This, OrderType type, Set *set) {
- Order *order = allocOrder(type, set);
- pushVectorOrder(This->allOrders, order);
+Order *CSolver::createOrder(OrderType type, Set *set) {
+ Order *order = new Order(type, set);
+ allOrders.push(order);
return order;
}
-Boolean *orderConstraint(CSolver *This, Order *order, uint64_t first, uint64_t second) {
- Boolean *constraint = allocBooleanOrder(order, first, second);
- pushVectorBoolean(This->allBooleans,constraint);
+Boolean *CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
+ Boolean *constraint = new BooleanOrder(order, first, second);
+ allBooleans.push(constraint);
return constraint;
}
-int startEncoding(CSolver *This) {
- naiveEncodingDecision(This);
- SATEncoder *satEncoder = This->satEncoder;
- computePolarities(This);
- orderAnalysis(This);
- encodeAllSATEncoder(This, satEncoder);
+int CSolver::startEncoding() {
+ computePolarities(this);
+ ASTTransform(this);
+ naiveEncodingDecision(this);
+ orderAnalysis(this);
+ encodeAllSATEncoder(this, satEncoder);
int result = solveCNF(satEncoder->cnf);
model_print("sat_solver's result:%d\tsolutionSize=%d\n", result, satEncoder->cnf->solver->solutionsize);
for (int i = 1; i <= satEncoder->cnf->solver->solutionsize; i++) {
return result;
}
-uint64_t getElementValue(CSolver *This, Element *element) {
+uint64_t CSolver::getElementValue(Element *element) {
switch (GETELEMENTTYPE(element)) {
case ELEMSET:
case ELEMCONST:
case ELEMFUNCRETURN:
- return getElementValueSATTranslator(This, element);
+ return getElementValueSATTranslator(this, element);
default:
ASSERT(0);
}
exit(-1);
}
-bool getBooleanValue( CSolver *This, Boolean *boolean) {
+bool CSolver::getBooleanValue(Boolean *boolean) {
switch (GETBOOLEANTYPE(boolean)) {
case BOOLEANVAR:
- return getBooleanVariableValueSATTranslator(This, boolean);
+ return getBooleanVariableValueSATTranslator(this, boolean);
default:
ASSERT(0);
}
exit(-1);
}
-HappenedBefore getOrderConstraintValue(CSolver *This, Order *order, uint64_t first, uint64_t second) {
- return getOrderConstraintValueSATTranslator(This, order, first, second);
+HappenedBefore CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) {
+ return getOrderConstraintValueSATTranslator(this, order, first, second);
}
projects / satune.git / blobdiff