Merge branch 'hamed' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler into...

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 58177a55647a3fe0f7f344955ccfbacf3efe2757..9dff5570277b7ecd3839aa4e67e101bb74aae22e 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -512,7 +512,6 @@ void CSolver::addConstraint(BooleanEdge constraint) {
        if (isTrue(constraint))
                return;
        else if (isFalse(constraint)) {
-               int t = 0;
                setUnSAT();
        }
        else {
@@ -614,7 +613,7 @@ int CSolver::solve() {
 
        ElementOpt eop(this);
        eop.doTransform();
-       
+
        EncodingGraph eg(this);
        eg.buildGraph();
        eg.encode();
@@ -645,10 +644,7 @@ void CSolver::printConstraints() {
        SetIteratorBooleanEdge *it = getConstraints();
        while (it->hasNext()) {
                BooleanEdge b = it->next();
-               if (b.isNegated())
-                       model_print("!");
-               b->print();
-               model_print("\n");
+               b.print();
        }
        delete it;
 }
@@ -698,20 +694,4 @@ void CSolver::autoTune(uint budget) {
        delete autotuner;
 }
 
-//Set* CSolver::addItemsToRange(Element* element, uint num, ...){
-//        va_list args;
-//        va_start(args, num);
-//        element->getRange()
-//        uint setSize = set->getSize();
-//        uint newSize = setSize+ num;
-//        uint64_t members[newSize];
-//        for(uint i=0; i<setSize; i++){
-//                members[i] = set->getElement(i);
-//        }
-//        for( uint i=0; i< num; i++){
-//                uint64_t arg = va_arg(args, uint64_t);
-//                members[setSize+i] = arg;
-//        }
-//        va_end(args);
-//        return createSet(set->getType(), members, newSize);
-//}
+