Edits

diff --git a/src/common.h b/src/common.h
index 3d3adba8cb5df9e6956731cef0d6227cdb795f72..c94d6bdf4a5b8a9d51241f64253c50acaf55c591 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -29,9 +29,8 @@ extern int switch_alloc;
 #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
 #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
 #else
 #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
 #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
 #else

-    #define model_print printf
+#define model_print printf

 #endif
 #endif

-#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)

 
 
 
 
 
 

diff --git a/src/csolver.cc b/src/csolver.cc
index 71205f68aab557baf933689510435ee4f312d328..8af2c71e4c5b61ec39ebcc853f107bb4a7d3c679 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -412,12 +412,9 @@ BooleanEdge CSolver::orderConstraint(Order *order, uint64_t first, uint64_t seco
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {
 }
 
 void CSolver::addConstraint(BooleanEdge constraint) {

-#ifdef TRACE_DEBUG
-        model_println("****New Constraint******");
-#endif
-        if(constraint.isNegated())
-                model_print("!");
-        constraint.getBoolean()->print();
+       if(constraint.isNegated())
+               model_print("!");
+       constraint.getBoolean()->print();

        if (isTrue(constraint))
                return;
        else if (isFalse(constraint)) {
        if (isTrue(constraint))
                return;
        else if (isFalse(constraint)) {