#include "structs.h"
#include "orderresolver.h"
#include "integerencoding.h"
-#include <stdlib.h>
+#include "qsort.h"
+#include "preprocess.h"
+#include "serializer.h"
+#include "deserializer.h"
CSolver::CSolver() :
- boolTrue(new BooleanConst(true)),
- boolFalse(new BooleanConst(false)),
+ boolTrue(BooleanEdge(new BooleanConst(true))),
+ boolFalse(boolTrue.negate()),
unsat(false),
tuner(NULL),
elapsedTime(0)
delete allFunctions.get(i);
}
- delete boolTrue;
- delete boolFalse;
+ delete boolTrue.getBoolean();
delete satEncoder;
}
CSolver *CSolver::clone() {
CSolver *copy = new CSolver();
CloneMap map;
- SetIteratorBoolean *it = getConstraints();
+ SetIteratorBooleanEdge *it = getConstraints();
while (it->hasNext()) {
- Boolean *b = it->next();
- copy->addConstraint(b->clone(copy, &map));
+ BooleanEdge b = it->next();
+ copy->addConstraint(cloneEdge(copy, &map, b));
}
delete it;
return copy;
}
+void CSolver::serialize() {
+ model_print("serializing ...\n");
+ {
+ Serializer serializer("dump");
+ SetIteratorBooleanEdge *it = getConstraints();
+ while (it->hasNext()) {
+ BooleanEdge b = it->next();
+ serializeBooleanEdge(&serializer, b);
+ }
+ delete it;
+ }
+ model_print("deserializing ...\n");
+ {
+ Deserializer deserializer("dump");
+ deserializer.deserialize();
+ }
+
+}
+
Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {
Set *set = new Set(type, elements, numelements);
allSets.push(set);
return set;
}
-void CSolver::addItem(MutableSet *set, uint64_t element) {
- set->addElementMSet(element);
-}
+//void CSolver::addItem(MutableSet *set, uint64_t element) {
+// set->addElementMSet(element);
+//}
uint64_t CSolver::createUniqueItem(MutableSet *set) {
uint64_t element = set->getNewUniqueItem();
Element *CSolver::getElementConst(VarType type, uint64_t value) {
uint64_t array[] = {value};
Set *set = new Set(type, array, 1);
- Element *element = new ElementConst(value, type, set);
+ Element *element = new ElementConst(value, set);
Element *e = elemMap.get(element);
if (e == NULL) {
allSets.push(set);
}
}
-Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus) {
+Element *CSolver::applyFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus) {
Element *element = new ElementFunction(function,array,numArrays,overflowstatus);
Element *e = elemMap.get(element);
if (e == NULL) {
+ element->updateParents();
allElements.push(element);
elemMap.put(element, element);
return element;
return function;
}
-Boolean *CSolver::getBooleanVar(VarType type) {
+BooleanEdge CSolver::getBooleanVar(VarType type) {
Boolean *boolean = new BooleanVar(type);
allBooleans.push(boolean);
- return boolean;
+ return BooleanEdge(boolean);
}
-Boolean *CSolver::getBooleanTrue() {
+BooleanEdge CSolver::getBooleanTrue() {
return boolTrue;
}
-Boolean *CSolver::getBooleanFalse() {
+BooleanEdge CSolver::getBooleanFalse() {
return boolFalse;
}
-Boolean *CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) {
- return applyPredicateTable(predicate, inputs, numInputs, NULL);
+BooleanEdge CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) {
+ return applyPredicateTable(predicate, inputs, numInputs, BooleanEdge(NULL));
}
-Boolean *CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, Boolean *undefinedStatus) {
+BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus) {
BooleanPredicate *boolean = new BooleanPredicate(predicate, inputs, numInputs, undefinedStatus);
Boolean *b = boolMap.get(boolean);
if (b == NULL) {
+ boolean->updateParents();
boolMap.put(boolean, boolean);
allBooleans.push(boolean);
- return boolean;
+ return BooleanEdge(boolean);
} else {
delete boolean;
- return b;
+ return BooleanEdge(b);
}
}
-bool CSolver::isTrue(Boolean *b) {
- return b->isTrue();
+bool CSolver::isTrue(BooleanEdge b) {
+ return b.isNegated()?b->isFalse():b->isTrue();
}
-bool CSolver::isFalse(Boolean *b) {
- return b->isFalse();
+bool CSolver::isFalse(BooleanEdge b) {
+ return b.isNegated()?b->isTrue():b->isFalse();
}
-Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean *arg1, Boolean *arg2) {
- Boolean *array[] = {arg1, arg2};
+BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2) {
+ BooleanEdge array[] = {arg1, arg2};
return applyLogicalOperation(op, array, 2);
}
-Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean *arg) {
- Boolean *array[] = {arg};
+BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg) {
+ BooleanEdge array[] = {arg};
return applyLogicalOperation(op, array, 1);
}
return 1;
}
-Boolean *CSolver::applyLogicalOperation(LogicOp op, Boolean **array, uint asize) {
- Boolean *newarray[asize];
+BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {
+ BooleanEdge newarray[asize];
+ memcpy(newarray, array, asize * sizeof(BooleanEdge));
+ for(uint i=0; i < asize; i++) {
+ BooleanEdge b=newarray[i];
+ if (b->type == LOGICOP) {
+ if (((BooleanLogic *) b.getBoolean())->replaced) {
+ newarray[i] = doRewrite(newarray[i]);
+ i--;//Check again
+ }
+ }
+ }
+ return applyLogicalOperation(op, newarray, asize);
+}
+
+BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
+ BooleanEdge newarray[asize];
switch (op) {
case 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) {
- return array[0]->isTrue() ? boolFalse : boolTrue;
- }
- break;
+ return array[0].negate();
}
case SATC_IFF: {
for (uint i = 0; i < 2; i++) {
newarray[0] = array[1 - i];
return applyLogicalOperation(SATC_NOT, newarray, 1);
}
+ } else if (array[i]->type == LOGICOP) {
+ BooleanLogic *b =(BooleanLogic *)array[i].getBoolean();
+ if (b->replaced) {
+ return rewriteLogicalOperation(op, array, asize);
+ }
}
}
break;
case SATC_AND: {
uint newindex = 0;
for (uint i = 0; i < asize; i++) {
- Boolean *b = array[i];
+ BooleanEdge b = array[i];
+ if (b->type == LOGICOP) {
+ if (((BooleanLogic *)b.getBoolean())->replaced)
+ return rewriteLogicalOperation(op, array, asize);
+ }
if (b->type == BOOLCONST) {
if (b->isTrue())
continue;
} else if (newindex == 1) {
return newarray[0];
} else {
- qsort(newarray, asize, sizeof(Boolean *), ptrcompares);
+ bsdqsort(newarray, newindex, sizeof(BooleanEdge), ptrcompares);
array = newarray;
asize = newindex;
}
Boolean *boolean = new BooleanLogic(this, op, array, asize);
Boolean *b = boolMap.get(boolean);
if (b == NULL) {
+ boolean->updateParents();
boolMap.put(boolean, boolean);
allBooleans.push(boolean);
- return boolean;
+ return BooleanEdge(boolean);
} else {
delete boolean;
- return b;
+ return BooleanEdge(b);
}
}
-Boolean *CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
+BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
Boolean *constraint = new BooleanOrder(order, first, second);
allBooleans.push(constraint);
- return constraint;
+ return BooleanEdge(constraint);
}
-void CSolver::addConstraint(Boolean *constraint) {
- if (constraint == boolTrue)
+void CSolver::addConstraint(BooleanEdge constraint) {
+ if (isTrue(constraint))
return;
- else if (constraint == boolFalse)
+ else if (isFalse(constraint))
setUnSAT();
else {
if (constraint->type == LOGICOP) {
- BooleanLogic *b=(BooleanLogic *) constraint;
- if (b->op==SATC_AND) {
- for(uint i=0;i<b->inputs.getSize();i++) {
- addConstraint(b->inputs.get(i));
+ BooleanLogic *b=(BooleanLogic *) constraint.getBoolean();
+ if (!constraint.isNegated()) {
+ if (b->op==SATC_AND) {
+ for(uint i=0;i<b->inputs.getSize();i++) {
+ addConstraint(b->inputs.get(i));
+ }
+ return;
}
+ }
+ if (b->replaced) {
+ addConstraint(doRewrite(constraint));
return;
}
}
-
constraints.add(constraint);
+ Boolean *ptr=constraint.getBoolean();
+
+ if (ptr->boolVal == BV_UNSAT)
+ setUnSAT();
+
+ replaceBooleanWithTrueNoRemove(constraint);
+ constraint->parents.clear();
}
}
long long startTime = getTimeNano();
computePolarities(this);
+ Preprocess pp(this);
+ pp.doTransform();
+
DecomposeOrderTransform dot(this);
dot.doTransform();
- //This leaks like crazy
- // IntegerEncodingTransform iet(this);
- //iet.doTransform();
+ IntegerEncodingTransform iet(this);
+ iet.doTransform();
naiveEncodingDecision(this);
satEncoder->encodeAllSATEncoder(this);
exit(-1);
}
-bool CSolver::getBooleanValue(Boolean *boolean) {
+bool CSolver::getBooleanValue(BooleanEdge bedge) {
+ Boolean *boolean=bedge.getBoolean();
switch (boolean->type) {
case BOOLEANVAR:
return getBooleanVariableValueSATTranslator(this, boolean);