#include "sattranslator.h"
#include "tunable.h"
#include "polarityassignment.h"
-#include "analyzer.h"
+#include "decomposeordertransform.h"
#include "autotuner.h"
#include "astops.h"
#include "structs.h"
+#include "orderresolver.h"
+#include "integerencoding.h"
CSolver::CSolver() :
boolTrue(new BooleanConst(true)),
CSolver *CSolver::clone() {
CSolver *copy = new CSolver();
CloneMap map;
- HSIteratorBoolean *it = getConstraints();
+ SetIteratorBoolean *it = getConstraints();
while (it->hasNext()) {
Boolean *b = it->next();
copy->addConstraint(b->clone(copy, &map));
return set;
}
+Element *CSolver::createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange) {
+ Set *s = createRangeSet(type, lowrange, highrange);
+ return getElementVar(s);
+}
+
MutableSet *CSolver::createMutableSet(VarType type) {
MutableSet *set = new MutableSet(type);
allSets.push(set);
Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
- Boolean * b = boolMap.get(boolean);
+ Boolean *b = boolMap.get(boolean);
if (b == NULL) {
boolMap.put(boolean, boolean);
allBooleans.push(boolean);
}
}
+bool CSolver::isTrue(Boolean *b) {
+ return b->isTrue();
+}
+
+bool CSolver::isFalse(Boolean *b) {
+ return b->isFalse();
+}
+
+Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean *arg1, Boolean *arg2) {
+ Boolean *array[] = {arg1, arg2};
+ return applyLogicalOperation(op, array, 2);
+}
+
+Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean *arg) {
+ Boolean *array[] = {arg};
+ return applyLogicalOperation(op, array, 1);
+}
+
+
Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean **array, uint asize) {
- Boolean * newarray[asize];
- switch(op) {
+ Boolean *newarray[asize];
+ switch (op) {
case SATC_NOT: {
- if (array[0]->type == LOGICOP && ((BooleanLogic *)array[0])->op==SATC_NOT) {
+ if (array[0]->type == LOGICOP && ((BooleanLogic *)array[0])->op == SATC_NOT) {
return ((BooleanLogic *) array[0])->inputs.get(0);
} else if (array[0]->type == BOOLCONST) {
- bool isTrue = ((BooleanConst *) array[0])->isTrue;
- return isTrue ? boolFalse : boolTrue;
+ return array[0]->isTrue() ? boolFalse : boolTrue;
+ }
+ break;
+ }
+ case SATC_IFF: {
+ for (uint i = 0; i < 2; i++) {
+ if (array[i]->type == BOOLCONST) {
+ if (array[i]->isTrue()) {
+ return array[1 - i];
+ } else {
+ newarray[0] = array[1 - i];
+ return applyLogicalOperation(SATC_NOT, newarray, 1);
+ }
+ }
}
break;
}
case SATC_XOR: {
- for(uint i=0;i<2;i++) {
+ for (uint i = 0; i < 2; i++) {
if (array[i]->type == BOOLCONST) {
- bool isTrue = ((BooleanConst *) array[i])->isTrue;
- if (isTrue) {
- newarray[0]=array[1-i];
+ if (array[i]->isTrue()) {
+ newarray[0] = array[1 - i];
return applyLogicalOperation(SATC_NOT, newarray, 1);
} else
- return array[1-i];
+ return array[1 - i];
}
}
break;
}
case SATC_OR: {
- uint newindex=0;
- for(uint i=0;i<asize;i++) {
- Boolean *b=array[i];
+ uint newindex = 0;
+ for (uint i = 0; i < asize; i++) {
+ Boolean *b = array[i];
if (b->type == BOOLCONST) {
- bool isTrue = ((BooleanConst *) b)->isTrue;
- if (isTrue)
- return b;
+ if (b->isTrue())
+ return boolTrue;
else
continue;
} else
- newarray[newindex++]=b;
+ newarray[newindex++] = b;
}
- if (newindex==1)
+ if (newindex == 0) {
+ return boolFalse;
+ } else if (newindex == 1)
return newarray[0];
else if (newindex == 2) {
- bool isNot0 = (newarray[0]->type==BOOLCONST) && ((BooleanLogic *)newarray[0])->op == SATC_NOT;
- bool isNot1 = (newarray[1]->type==BOOLCONST) && ((BooleanLogic *)newarray[1])->op == SATC_NOT;
+ bool isNot0 = (newarray[0]->type == BOOLCONST) && ((BooleanLogic *)newarray[0])->op == SATC_NOT;
+ bool isNot1 = (newarray[1]->type == BOOLCONST) && ((BooleanLogic *)newarray[1])->op == SATC_NOT;
if (isNot0 != isNot1) {
if (isNot0) {
break;
}
case SATC_AND: {
- uint newindex=0;
- for(uint i=0;i<asize;i++) {
- Boolean *b=array[i];
+ uint newindex = 0;
+ for (uint i = 0; i < asize; i++) {
+ Boolean *b = array[i];
if (b->type == BOOLCONST) {
- bool isTrue = ((BooleanConst *) b)->isTrue;
- if (isTrue)
+ if (b->isTrue())
continue;
else
- return b;
+ return boolFalse;
} else
- newarray[newindex++]=b;
+ newarray[newindex++] = b;
}
- if(newindex==1) {
+ if (newindex == 0) {
+ return boolTrue;
+ } else if (newindex == 1) {
return newarray[0];
} else {
array = newarray;
}
case SATC_IMPLIES: {
if (array[0]->type == BOOLCONST) {
- BooleanConst *b=(BooleanConst *) array[0];
- if (b->isTrue) {
+ if (array[0]->isTrue()) {
return array[1];
} else {
return boolTrue;
}
} else if (array[1]->type == BOOLCONST) {
- BooleanConst *b=(BooleanConst *) array[0];
- if (b->isTrue) {
- return b;
+ if (array[1]->isTrue()) {
+ return array[1];
} else {
return applyLogicalOperation(SATC_NOT, array, 1);
}
break;
}
}
-
+
+ ASSERT(asize != 0);
Boolean *boolean = new BooleanLogic(this, op, array, asize);
Boolean *b = boolMap.get(boolean);
if (b == NULL) {
boolMap.put(boolean, boolean);
allBooleans.push(boolean);
- return boolean;
+ return boolean;
} else {
delete boolean;
return b;
Order *CSolver::createOrder(OrderType type, Set *set) {
Order *order = new Order(type, set);
allOrders.push(order);
+ activeOrders.add(order);
return order;
}
-int CSolver::startEncoding() {
+int CSolver::solve() {
bool deleteTuner = false;
if (tuner == NULL) {
tuner = new DefaultTuner();
deleteTuner = true;
}
-
+
long long startTime = getTimeNano();
computePolarities(this);
- orderAnalysis(this);
+
+ DecomposeOrderTransform dot(this);
+ dot.doTransform();
+
+ //This leaks like crazy
+ // IntegerEncodingTransform iet(this);
+ //iet.doTransform();
+
naiveEncodingDecision(this);
satEncoder->encodeAllSATEncoder(this);
int result = unsat ? IS_UNSAT : satEncoder->solve();
exit(-1);
}
-HappenedBefore CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) {
- return getOrderConstraintValueSATTranslator(this, order, first, second);
+bool CSolver::getOrderConstraintValue(Order *order, uint64_t first, uint64_t second) {
+ return order->encoding.resolver->resolveOrder(first, second);
}
long long CSolver::getEncodeTime() { return satEncoder->getEncodeTime(); }
long long CSolver::getSolveTime() { return satEncoder->getSolveTime(); }
void CSolver::autoTune(uint budget) {
- AutoTuner * autotuner=new AutoTuner(budget);
+ AutoTuner *autotuner = new AutoTuner(budget);
autotuner->addProblem(this);
autotuner->tune();
delete autotuner;
projects / satune.git / blobdiff