Bug Fixes + add more tracing prints + turning off some optimizations

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index fe2111036f1281b8fb366cbf35d3e0f9c7782168..f1c39e0e33229648c39e97bf02460c0e0271c52a 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -260,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) {
@@ -289,7 +289,8 @@ static int ptrcompares(const void *p1, const void *p2) {
 }
 
 BooleanEdge CSolver::rewriteLogicalOperation(LogicOp op, BooleanEdge * array, uint asize) {
-       BooleanEdge newarray[asize];
+  return applyLogicalOperation(op, array, asize);
+  /*  BooleanEdge newarray[asize];
        memcpy(newarray, array, asize * sizeof(BooleanEdge));
        for(uint i=0; i < asize; i++) {
                BooleanEdge b=newarray[i];
@@ -300,7 +301,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) {
@@ -312,9 +313,9 @@ 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);
                                }
@@ -337,15 +338,20 @@ 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);
                        }
                        if (b->type == BOOLCONST) {
-                               if (b->isTrue())
+                               if (isTrue(b))
                                        continue;
-                               else
+                               else{
                                        return boolFalse;
+                                }
                        } else
                                newarray[newindex++] = b;
                }
@@ -366,47 +372,78 @@ 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(b);
-       }
+       delete boolean;*/
+               return BooleanEdge(boolean);
+               /*      }*/
 }
 
 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;
        Boolean *constraint = new BooleanOrder(order, first, second);
        allBooleans.push(constraint);
        return BooleanEdge(constraint);
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
+#ifdef TRACE_DEBUG
+        model_println("****New Constraint******");
+#endif
+        if(constraint.isNegated())
+                model_print("!");
+        constraint.getBoolean()->print();
        if (isTrue(constraint))
                return;
-       else if (isFalse(constraint))
-               setUnSAT();
+       else if (isFalse(constraint)){
+                int t=0;
+#ifdef TRACE_DEBUG
+               model_println("Adding constraint which is false :|");
+#endif
+                setUnSAT();
+        }
        else {
                if (constraint->type == LOGICOP) {
                        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
                                                addConstraint(b->inputs.get(i));
                                        }
                                        return;
                                }
                        }
                        if (b->replaced) {
+#ifdef TRACE_DEBUG
+                                model_println("While rewriting");
+#endif
                                addConstraint(doRewrite(constraint));
                                return;
                        }
@@ -414,8 +451,12 @@ void CSolver::addConstraint(BooleanEdge constraint) {
                constraints.add(constraint);
                Boolean *ptr=constraint.getBoolean();
                
-               if (ptr->boolVal == BV_UNSAT)
-                       setUnSAT();
+               if (ptr->boolVal == BV_UNSAT){
+#ifdef TRACE_DEBUG
+                       model_println("BooleanValue is Set to UnSAT");
+#endif
+                        setUnSAT();
+                }
                
                replaceBooleanWithTrueNoRemove(constraint);
                constraint->parents.clear();
@@ -442,11 +483,11 @@ int CSolver::solve() {
 //     Preprocess pp(this);
 //     pp.doTransform();
        
-       DecomposeOrderTransform dot(this);
-       dot.doTransform();
+//     DecomposeOrderTransform dot(this);
+//     dot.doTransform();
 
-       IntegerEncodingTransform iet(this);
-       iet.doTransform();
+//     IntegerEncodingTransform iet(this);
+//     iet.doTransform();
 
 //     EncodingGraph eg(this);
 //     eg.buildGraph();
@@ -454,7 +495,9 @@ int CSolver::solve() {
        
        naiveEncodingDecision(this);
        satEncoder->encodeAllSATEncoder(this);
+        model_println("Is problem UNSAT after encoding: %d", unsat);
        int result = unsat ? IS_UNSAT : satEncoder->solve();
+        model_println("Result Computed in CSolver: %d", result);
        long long finishTime = getTimeNano();
        elapsedTime = finishTime - startTime;
        if (deleteTuner) {