adding config for model_print

diff --git a/src/common.h b/src/common.h
index 58ad1f1acdb2cbacf64c99e7b6576f4d3233134e..fac5a0bef27eaded2e5993406bf8c7a30d7c51ee 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,7 +18,7 @@
 #include "config.h"
 #include "time.h"
 
-
+#if 1
 extern int model_out;
 extern int model_err;
 extern int switch_alloc;
@@ -26,12 +26,11 @@ extern int switch_alloc;
 #define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
 
 #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
-#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
 #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
-
-
-
-//#define model_print printf
+#else
+    #define model_print printf
+#endif
+#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
 
 #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1))))
 #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))

diff --git a/src/csolver.cc b/src/csolver.cc
index 48668879610388b54f8ebe8574532ae13fb80ff0..d2e44b4fcd6030b981cc65209030bba8e9c92af1 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -36,7 +36,6 @@ CSolver::CSolver() :
 /** This function tears down the solver and the entire AST */
 
 CSolver::~CSolver() {
-        this->serialize();
        uint size = allBooleans.getSize();
        for (uint i = 0; i < size; i++) {
                delete allBooleans.get(i);
@@ -421,9 +420,6 @@ 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)){