Fix bugs

diff --git a/src/ASTAnalyses/Encoding/subgraph.h b/src/ASTAnalyses/Encoding/subgraph.h
index 88a129129a8c3de1e8b005469727ba1656218e61..9327b977ea0581917f2aef8eae919c37c32debb5 100644 (file)
--- a/src/ASTAnalyses/Encoding/subgraph.h
+++ b/src/ASTAnalyses/Encoding/subgraph.h
@@ -9,6 +9,7 @@ public:
        NodeValuePair(EncodingNode *n, uint64_t val) : node(n), value(val) {}
        EncodingNode *node;
        uint64_t value;
+       CMEMALLOC;
 };
 
 class EncodingValue;
@@ -27,6 +28,7 @@ public:
        HashsetEncodingNode nodes;
        HashsetEncodingValue larger;
        HashsetEncodingValue notequals;
+       CMEMALLOC;
 };
 
 uint hashNodeValuePair(NodeValuePair *nvp);

diff --git a/src/config.h b/src/config.h
index 0c53dd6dbab21bb3a45e2955f0110b322a1614c3..6eafa57c3aa598c399b0c8df4ffac5bf7c9951dc 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -19,7 +19,9 @@
 //#define CONFIG_DEBUG
 #define TRACE_DEBUG
 #endif
-//#define SATCHECK_CONFIG
+
+#define SATCHECK_CONFIG
+
 #ifndef CONFIG_ASSERT
 #define CONFIG_ASSERT
 #endif

diff --git a/src/csolver.cc b/src/csolver.cc
index 8af2c71e4c5b61ec39ebcc853f107bb4a7d3c679..25c9b1e0ffc130b8851ac8a6d118083b332f4c8f 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -95,7 +95,7 @@ CSolver* CSolver::deserialize(const char * file){
 
 void CSolver::serialize() {
        model_print("serializing ...\n");
-        printConstraints();
+       printConstraints();
        Serializer serializer("dump");
        SetIteratorBooleanEdge *it = getConstraints();
        while (it->hasNext()) {
@@ -412,9 +412,6 @@ BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t seco
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
-       if(constraint.isNegated())
-               model_print("!");
-       constraint.getBoolean()->print();
        if (isTrue(constraint))
                return;
        else if (isFalse(constraint)) {
@@ -472,8 +469,8 @@ int CSolver::solve() {
        DecomposeOrderTransform dot(this);
        dot.doTransform();
 
-       //IntegerEncodingTransform iet(this);
-       //iet.doTransform();
+       IntegerEncodingTransform iet(this);
+       iet.doTransform();
 
        EncodingGraph eg(this);
        eg.buildGraph();