X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcsolver.cc;h=be4a3a88063882cc05f5cfafca9218724b870f72;hp=ce749b13c27b20d1645383f86e27f5101e3a6234;hb=77f32c79afdf12f29c040d511cd84f15d703ceb9;hpb=cb887a9e8e6cc23c2e09638a1f7bceed4ce1868a diff --git a/src/csolver.cc b/src/csolver.cc index ce749b1..be4a3a8 100644 --- a/src/csolver.cc +++ b/src/csolver.cc @@ -21,6 +21,7 @@ #include "preprocess.h" #include "serializer.h" #include "deserializer.h" +#include "encodinggraph.h" CSolver::CSolver() : boolTrue(BooleanEdge(new BooleanConst(true))), @@ -102,7 +103,7 @@ void CSolver::serialize() { Deserializer deserializer("dump"); deserializer.deserialize(); } - + } Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) { @@ -117,6 +118,10 @@ Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange return set; } +VarType CSolver::getSetVarType(Set *set) { + return set->getType(); +} + Element *CSolver::createRangeVar(VarType type, uint64_t lowrange, uint64_t highrange) { Set *s = createRangeSet(type, lowrange, highrange); return getElementVar(s); @@ -138,12 +143,21 @@ uint64_t CSolver::createUniqueItem(MutableSet *set) { return element; } +void CSolver::finalizeMutableSet(MutableSet *set) { + set->finalize(); +} + Element *CSolver::getElementVar(Set *set) { Element *element = new ElementSet(set); allElements.push(element); return element; } +Set *CSolver::getElementRange (Element *element) { + return element->getRange(); +} + + Element *CSolver::getElementConst(VarType type, uint64_t value) { uint64_t array[] = {value}; Set *set = new Set(type, array, 1); @@ -228,7 +242,7 @@ BooleanEdge CSolver::getBooleanFalse() { } BooleanEdge CSolver::applyPredicate(Predicate *predicate, Element **inputs, uint numInputs) { - return applyPredicateTable(predicate, inputs, numInputs, NULL); + return applyPredicateTable(predicate, inputs, numInputs, BooleanEdge(NULL)); } BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, uint numInputs, BooleanEdge undefinedStatus) { @@ -246,11 +260,11 @@ BooleanEdge CSolver::applyPredicateTable(Predicate *predicate, Element **inputs, } bool CSolver::isTrue(BooleanEdge b) { - return b.isNegated()?b->isFalse():b->isTrue(); + return b.isNegated() ? b->isFalse() : b->isTrue(); } bool CSolver::isFalse(BooleanEdge b) { - return b.isNegated()?b->isTrue():b->isFalse(); + return b.isNegated() ? b->isTrue() : b->isFalse(); } BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg1, BooleanEdge arg2) { @@ -265,7 +279,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge arg) { static int ptrcompares(const void *p1, const void *p2) { uintptr_t b1 = *(uintptr_t const *) p1; - uintptr_t b2 = *(uintptr_t const *) p2; + uintptr_t b2 = *(uintptr_t const *) p2; if (b1 < b2) return -1; else if (b1 == b2) @@ -274,11 +288,11 @@ static int ptrcompares(const void *p1, const void *p2) { return 1; } -BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint 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]; + 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]); @@ -298,14 +312,14 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint case SATC_IFF: { for (uint i = 0; i < 2; i++) { if (array[i]->type == BOOLCONST) { - if (array[i]->isTrue()) { + if (isTrue(array[i])) { // It can be undefined return array[1 - i]; - } else { + } else if (isFalse(array[i])) { newarray[0] = array[1 - i]; return applyLogicalOperation(SATC_NOT, newarray, 1); } } else if (array[i]->type == LOGICOP) { - BooleanLogic *b =(BooleanLogic *)array[i].getBoolean(); + BooleanLogic *b = (BooleanLogic *)array[i].getBoolean(); if (b->replaced) { return rewriteLogicalOperation(op, array, asize); } @@ -314,7 +328,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint break; } case SATC_OR: { - for (uint i =0; i type == BOOLCONST) { - if (b->isTrue()) + if (isTrue(b)) continue; - else + else { return boolFalse; + } } else newarray[newindex++] = b; } @@ -371,22 +386,48 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint } BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) { + // ASSERT(first != second); + if (first == second) + return getBooleanFalse(); + + bool negate = false; + if (order->type == SATC_TOTAL) { + if (first > second) { + uint64_t tmp = first; + first = second; + second = tmp; + negate = true; + } + } Boolean *constraint = new BooleanOrder(order, first, second); - allBooleans.push(constraint); - return BooleanEdge(constraint); + Boolean *b = boolMap.get(constraint); + + if (b == NULL) { + allBooleans.push(constraint); + boolMap.put(constraint, constraint); + constraint->updateParents(); + } else { + delete constraint; + constraint = b; + } + + BooleanEdge be = BooleanEdge(constraint); + return negate ? be.negate() : be; } void CSolver::addConstraint(BooleanEdge constraint) { if (isTrue(constraint)) return; - else if (isFalse(constraint)) + else if (isFalse(constraint)) { + int t = 0; setUnSAT(); + } else { if (constraint->type == LOGICOP) { - BooleanLogic *b=(BooleanLogic *) constraint.getBoolean(); + BooleanLogic *b = (BooleanLogic *) constraint.getBoolean(); if (!constraint.isNegated()) { - if (b->op==SATC_AND) { - for(uint i=0;iinputs.getSize();i++) { + if (b->op == SATC_AND) { + for (uint i = 0; i < b->inputs.getSize(); i++) { addConstraint(b->inputs.get(i)); } return; @@ -398,11 +439,12 @@ void CSolver::addConstraint(BooleanEdge constraint) { } } constraints.add(constraint); - Boolean *ptr=constraint.getBoolean(); - - if (ptr->boolVal == BV_UNSAT) + Boolean *ptr = constraint.getBoolean(); + + if (ptr->boolVal == BV_UNSAT) { setUnSAT(); - + } + replaceBooleanWithTrueNoRemove(constraint); constraint->parents.clear(); } @@ -427,16 +469,22 @@ int CSolver::solve() { Preprocess pp(this); pp.doTransform(); - + DecomposeOrderTransform dot(this); dot.doTransform(); - IntegerEncodingTransform iet(this); - iet.doTransform(); + //IntegerEncodingTransform iet(this); + //iet.doTransform(); + //EncodingGraph eg(this); + //eg.buildGraph(); + //eg.encode(); + //printConstraints(); naiveEncodingDecision(this); satEncoder->encodeAllSATEncoder(this); + model_print("Is problem UNSAT after encoding: %d\n", unsat); int result = unsat ? IS_UNSAT : satEncoder->solve(); + model_print("Result Computed in CSolver: %d\n", result); long long finishTime = getTimeNano(); elapsedTime = finishTime - startTime; if (deleteTuner) { @@ -446,6 +494,26 @@ int CSolver::solve() { return result; } +void CSolver::printConstraints() { + SetIteratorBooleanEdge *it = getConstraints(); + while (it->hasNext()) { + BooleanEdge b = it->next(); + if (b.isNegated()) + model_print("!"); + b->print(); + model_print("\n"); + } + delete it; + +} + +void CSolver::printConstraint(BooleanEdge b) { + if (b.isNegated()) + model_print("!"); + b->print(); + model_print("\n"); +} + uint64_t CSolver::getElementValue(Element *element) { switch (element->type) { case ELEMSET: @@ -459,7 +527,7 @@ uint64_t CSolver::getElementValue(Element *element) { } bool CSolver::getBooleanValue(BooleanEdge bedge) { - Boolean *boolean=bedge.getBoolean(); + Boolean *boolean = bedge.getBoolean(); switch (boolean->type) { case BOOLEANVAR: return getBooleanVariableValueSATTranslator(this, boolean);