After resolving conflicts
[satune.git] / src / csolver.cc
index d2e44b4fcd6030b981cc65209030bba8e9c92af1..81329914c80acea519b310c0bad122328876aff8 100644 (file)
@@ -106,7 +106,6 @@ void CSolver::serialize() {
 //             Deserializer deserializer("dump");
 //             deserializer.deserialize();
 //     }
-       
 }
 
 Set *CSolver::createSet(VarType type, uint64_t *elements, uint numelements) {
@@ -121,7 +120,7 @@ Set *CSolver::createRangeSet(VarType type, uint64_t lowrange, uint64_t highrange
        return set;
 }
 
-VarType CSolver::getSetVarType(Set *set){
+VarType CSolver::getSetVarType(Set *set) {
        return set->getType();
 }
 
@@ -146,7 +145,7 @@ uint64_t CSolver::createUniqueItem(MutableSet *set) {
        return element;
 }
 
-void CSolver::finalizeMutableSet(MutableSet* set){
+void CSolver::finalizeMutableSet(MutableSet *set) {
        set->finalize();
 }
 
@@ -157,7 +156,7 @@ Element *CSolver::getElementVar(Set *set) {
        return element;
 }
 
-Set* CSolver::getElementRange (Element* element){
+Set *CSolver::getElementRange (Element *element) {
        return element->getRange();
 }
 
@@ -266,11 +265,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) {
@@ -285,7 +284,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)
@@ -294,12 +293,11 @@ static int ptrcompares(const void *p1, const void *p2) {
                return 1;
 }
 
-BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {
-  return applyLogicalOperation(op, array, asize);
-  /*  BooleanEdge 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];
+       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]);
@@ -307,7 +305,7 @@ BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, ui
                        }
                }
        }
-       return applyLogicalOperation(op, newarray, asize);*/
+       return applyLogicalOperation(op, newarray, asize);
 }
 
 BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint asize) {
@@ -319,14 +317,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 (isTrue(array[i])) { // It can be undefined
+                               if (isTrue(array[i])) { // It can be undefined
                                        return array[1 - i];
-                               } else if(isFalse(array[i])) {
+                               } 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);
                                }
@@ -335,7 +333,7 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
                break;
        }
        case SATC_OR: {
-               for (uint i =0; i <asize; i++) {
+               for (uint i = 0; i < asize; i++) {
                        newarray[i] = applyLogicalOperation(SATC_NOT, array[i]);
                }
                return applyLogicalOperation(SATC_NOT, applyLogicalOperation(SATC_AND, newarray, asize));
@@ -344,10 +342,6 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
                uint newindex = 0;
                for (uint i = 0; i < asize; i++) {
                        BooleanEdge b = array[i];
-//                        model_print("And: Argument %u:", i);
-//                        if(b.isNegated())
-//                                model_print("!");
-//                        b->print();
                        if (b->type == LOGICOP) {
                                if (((BooleanLogic *)b.getBoolean())->replaced)
                                        return rewriteLogicalOperation(op, array, asize);
@@ -355,9 +349,9 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
                        if (b->type == BOOLCONST) {
                                if (isTrue(b))
                                        continue;
-                               else{
+                               else {
                                        return boolFalse;
-                                }
+                               }
                        } else
                                newarray[newindex++] = b;
                }
@@ -378,39 +372,26 @@ BooleanEdge CSolver::applyLogicalOperation(LogicOp op, BooleanEdge *array, uint
        }
        case SATC_IMPLIES: {
                //handle by translation
-//                model_print("Implies: first:");
-//                if(array[0].isNegated())
-//                        model_print("!");
-//                array[0]->print();
-//                model_print("Implies: second:");
-//                if(array[1].isNegated())
-//                        model_print("!");
-//                array[1]->print();
-//                model_println("##### OK let's get the operation done");
                return applyLogicalOperation(SATC_OR, applyLogicalOperation(SATC_NOT, array[0]), array[1]);
        }
        }
 
        ASSERT(asize != 0);
        Boolean *boolean = new BooleanLogic(this, op, array, asize);
-       /*      Boolean *b = boolMap.get(boolean);
+       Boolean *b = boolMap.get(boolean);
        if (b == NULL) {
                boolean->updateParents();
                boolMap.put(boolean, boolean);
                allBooleans.push(boolean);
                return BooleanEdge(boolean);
        } else {
-       delete boolean;*/
-               return BooleanEdge(boolean);
-               /*      }*/
+               delete boolean;
+               return BooleanEdge(b);
+       }
 }
 
 BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t second) {
-#ifdef TRACE_DEBUG
-        model_println("Creating order: From:%lu => To:%lu", first, second);
-#endif
-        if(first == second)
-                return boolFalse;
+       ASSERT(first != second);
        Boolean *constraint = new BooleanOrder(order, first, second);
        allBooleans.push(constraint);
        return BooleanEdge(constraint);
@@ -422,45 +403,33 @@ void CSolver::addConstraint(BooleanEdge constraint) {
 #endif
        if (isTrue(constraint))
                return;
-       else if (isFalse(constraint)){
-                int t=0;
-#ifdef TRACE_DEBUG
-               model_println("Adding constraint which is false :|");
-#endif
-                setUnSAT();
-        }
+       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;i<b->inputs.getSize();i++) {
-#ifdef TRACE_DEBUG
-                                                model_println("In loop");
-#endif
+                               if (b->op == SATC_AND) {
+                                       for (uint i = 0; i < b->inputs.getSize(); i++) {
                                                addConstraint(b->inputs.get(i));
                                        }
                                        return;
                                }
                        }
                        if (b->replaced) {
-#ifdef TRACE_DEBUG
-                                model_println("While rewriting");
-#endif
                                addConstraint(doRewrite(constraint));
                                return;
                        }
                }
                constraints.add(constraint);
-               Boolean *ptr=constraint.getBoolean();
-               
-               if (ptr->boolVal == BV_UNSAT){
-#ifdef TRACE_DEBUG
-                       model_println("BooleanValue is Set to UnSAT");
-#endif
-                        setUnSAT();
-                }
-               
+               Boolean *ptr = constraint.getBoolean();
+
+               if (ptr->boolVal == BV_UNSAT) {
+                       setUnSAT();
+               }
+
                replaceBooleanWithTrueNoRemove(constraint);
                constraint->parents.clear();
        }
@@ -483,24 +452,24 @@ int CSolver::solve() {
        long long startTime = getTimeNano();
        computePolarities(this);
 
-//     Preprocess pp(this);
-//     pp.doTransform();
-       
-//     DecomposeOrderTransform dot(this);
-//     dot.doTransform();
+       Preprocess pp(this);
+       pp.doTransform();
 
-//     IntegerEncodingTransform iet(this);
-//     iet.doTransform();
+       DecomposeOrderTransform dot(this);
+       dot.doTransform();
 
-//     EncodingGraph eg(this);
-//     eg.buildGraph();
-//     eg.encode();
-       
+       IntegerEncodingTransform iet(this);
+       iet.doTransform();
+
+       EncodingGraph eg(this);
+       eg.buildGraph();
+       eg.encode();
+       printConstraints();
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
-        model_println("Is problem UNSAT after encoding: %d", unsat);
+       model_print("Is problem UNSAT after encoding: %d\n", unsat);
        int result = unsat ? IS_UNSAT : satEncoder->solve();
-        model_println("Result Computed in CSolver: %d", result);
+       model_print("Result Computed in CSolver: %d\n", result);
        long long finishTime = getTimeNano();
        elapsedTime = finishTime - startTime;
        if (deleteTuner) {
@@ -510,6 +479,19 @@ 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;
+
+}
+
 uint64_t CSolver::getElementValue(Element *element) {
        switch (element->type) {
        case ELEMSET:
@@ -523,7 +505,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);