Refactoring ...

diff --git a/src/Collections/corestructs.cc b/src/Collections/corestructs.cc
new file mode 100644 (file)
index 0000000..ba9bf91
--- /dev/null
+++ b/src/Collections/corestructs.cc
@@ -0,0 +1,10 @@
+#include "classlist.h"
+#include "corestructs.h"
+#include "boolean.h"
+
+void BooleanEdge::print(){
+       if (isNegated())
+               model_print("!");
+       b->print();
+       model_print("\n");
+}
\ No newline at end of file

diff --git a/src/Collections/corestructs.h b/src/Collections/corestructs.h
index b0ff8198c7d5e11a75beaaff5742c1c267ee1285..8f34078056b7f30a751d4e7200f447c0608b8431 100644 (file)
--- a/src/Collections/corestructs.h
+++ b/src/Collections/corestructs.h
@@ -23,10 +23,13 @@ public:
        operator bool() {
                return getBoolean() != NULL;
        }
+        void print();
 private:
        Boolean *b;
 };
 
+
+
 inline bool boolEdgeEquals(BooleanEdge b1, BooleanEdge b2) {
        return b1 == b2;
 }

diff --git a/src/csolver.cc b/src/csolver.cc
index b42dbe0974224df3560d5f95b96aed1e5fce56f2..f7ea1018c5e456f2d9a234a45b1ae5f3e575fca9 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 {
@@ -608,7 +607,7 @@ int CSolver::solve() {
 
        ElementOpt eop(this);
        eop.doTransform();
-       
+
        EncodingGraph eg(this);
        eg.buildGraph();
        eg.encode();
@@ -639,10 +638,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;
 }
@@ -692,20 +688,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);
-//}
+