diff --git a/src/sat/sat_bdd.h b/src/sat/sat_bdd.h index c0f1fc9b2..10caa0125 100644 --- a/src/sat/sat_bdd.h +++ b/src/sat/sat_bdd.h @@ -166,8 +166,6 @@ namespace sat { bdd mk_and(bdd const& a, bdd const& b); bdd mk_or(bdd const& a, bdd const& b); - std::ostream& display(std::ostream& out, bdd const& b); - public: struct mem_out {}; @@ -190,6 +188,7 @@ namespace sat { bdd mk_ite(bdd const& c, bdd const& t, bdd const& e); std::ostream& display(std::ostream& out); + std::ostream& display(std::ostream& out, bdd const& b); }; class bdd { diff --git a/src/sat/sat_elim_vars.cpp b/src/sat/sat_elim_vars.cpp index a5ca80a32..6edc125ea 100644 --- a/src/sat/sat_elim_vars.cpp +++ b/src/sat/sat_elim_vars.cpp @@ -121,7 +121,6 @@ namespace sat{ bdd b = m.mk_exists(m_var2index[v], b0); TRACE("elim_vars", tout << "eliminate " << v << "\n"; - tout << "clauses : " << clause_size << "\n"; for (watched const& w : simp.get_wlist(~pos_l)) { if (w.is_binary_non_learned_clause()) { tout << pos_l << " " << w.get_literal() << "\n"; @@ -150,7 +149,7 @@ namespace sat{ m.display(tout, b4); tout << "eliminated:\n"; tout << b << "\n"; - tout << m.cnf_size(b) << "\n"; + tout << b.cnf_size() << "\n"; ); return b; diff --git a/src/sat/sat_simplifier.cpp b/src/sat/sat_simplifier.cpp index 4bc42e76c..3bd5cefb9 100644 --- a/src/sat/sat_simplifier.cpp +++ b/src/sat/sat_simplifier.cpp @@ -1150,8 +1150,8 @@ namespace sat { void block_binary(watch_list::iterator it, literal l, model_converter::entry *& new_entry) { if (new_entry == 0) new_entry = &(mc.mk(model_converter::BLOCK_LIT, l.var())); - TRACE("blocked_clause", tout << "new blocked clause: " << l2 << " " << l << "\n";); literal l2 = it->get_literal(); + TRACE("blocked_clause", tout << "new blocked clause: " << l2 << " " << l << "\n";); s.remove_bin_clause_half(l2, l, it->is_learned()); m_queue.decreased(~l2); mc.insert(*new_entry, l, l2);