From 54ba3c780c1bc435cbb6b202f2f0ee222df0a120 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Mon, 23 Oct 2017 15:16:21 -0700 Subject: [PATCH] Edits --- src/common.h | 3 +-- src/csolver.cc | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/common.h b/src/common.h index 3d3adba..c94d6bd 100644 --- 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 printf +#define model_print printf #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 71205f6..8af2c71 100644 --- 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) { -#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)) { -- 2.34.1