mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 19:02:02 +00:00
Code Activity

clean up debug output

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-08 10:47:15 -07:00
parent c1b243a8e3
commit 356835533a
3 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/model/model_core.cpp
View file

@ -86,18 +86,18 @@ void model_core::register_decl(func_decl * d, func_interp * fi) {
void model_core::unregister_decl(func_decl * d) { void model_core::unregister_decl(func_decl * d) {
decl2expr::obj_map_entry * ec = m_interp.find_core(d); decl2expr::obj_map_entry * ec = m_interp.find_core(d);
if (ec && ec->get_data().m_value != 0) { if (ec && ec->get_data().m_value != 0) {
m_manager.dec_ref(ec->get_data().m_key);
m_manager.dec_ref(ec->get_data().m_value);
m_interp.remove(d); m_interp.remove(d);
m_const_decls.erase(d); m_const_decls.erase(d);
m_manager.dec_ref(ec->get_data().m_key);
m_manager.dec_ref(ec->get_data().m_value);
return; return;
} }
decl2finterp::obj_map_entry * ef = m_finterp.find_core(d); decl2finterp::obj_map_entry * ef = m_finterp.find_core(d);
if (ef && ef->get_data().m_value != 0) { if (ef && ef->get_data().m_value != 0) {
m_manager.dec_ref(ef->get_data().m_key);
dealloc(ef->get_data().m_value);
m_finterp.remove(d); m_finterp.remove(d);
m_func_decls.erase(d); m_func_decls.erase(d);
m_manager.dec_ref(ef->get_data().m_key);
dealloc(ef->get_data().m_value);
} }
} }

36
src/sat/ba_solver.cpp
View file

@ -381,7 +381,7 @@ namespace sat {
} }
else if (slack + true_val < p.k()) { else if (slack + true_val < p.k()) {
if (p.lit() != null_literal) { if (p.lit() != null_literal) {
display(std::cout << "assign false literal ", p, true); IF_VERBOSE(10, display(verbose_stream() << "assign false literal ", p, true););
s().assign(~p.lit(), justification()); s().assign(~p.lit(), justification());
} }
else { else {
@ -392,7 +392,6 @@ namespace sat {
} }
else if (slack + true_val == p.k()) { else if (slack + true_val == p.k()) {
literal_vector lits(p.literals()); literal_vector lits(p.literals());
display(std::cout << "replace", p, true);
assert_unconstrained(p.lit(), lits); assert_unconstrained(p.lit(), lits);
remove_constraint(p, "is tight"); remove_constraint(p, "is tight");
} }
@ -1075,7 +1074,6 @@ namespace sat {
int64 new_bound = m_bound; int64 new_bound = m_bound;
new_bound += i; new_bound += i;
if (new_bound < 0) { if (new_bound < 0) {
// std::cout << "new negative bound " << new_bound << "\n";
m_overflow = true; m_overflow = true;
} }
else if (new_bound > UINT_MAX) { else if (new_bound > UINT_MAX) {
@ -1547,7 +1545,6 @@ namespace sat {
} }
void ba_solver::add_constraint(constraint* c) { void ba_solver::add_constraint(constraint* c) {
// display(std::cout << "add " << c->learned() << " " << c->id() << "\n", *c, true);
literal_vector lits(c->literals()); literal_vector lits(c->literals());
if (c->learned()) { if (c->learned()) {
m_learned.push_back(c); m_learned.push_back(c);
@ -3093,7 +3090,6 @@ namespace sat {
remove_constraint(c2, "subsumed"); remove_constraint(c2, "subsumed");
++m_stats.m_num_pb_subsumes; ++m_stats.m_num_pb_subsumes;
c1.set_learned(false); c1.set_learned(false);
std::cout << c1 << " subsumes " << c2 << "\n";
} }
else { else {
TRACE("ba", tout << "self subsume cardinality\n";); TRACE("ba", tout << "self subsume cardinality\n";);
@ -3130,7 +3126,6 @@ namespace sat {
removed_clauses.push_back(&c2); removed_clauses.push_back(&c2);
++m_stats.m_num_clause_subsumes; ++m_stats.m_num_clause_subsumes;
c1.set_learned(false); c1.set_learned(false);
std::cout << c1 << " subsumes " << c2 << "\n";
} }
else { else {
IF_VERBOSE(0, verbose_stream() << "self-subsume clause is TBD\n";); IF_VERBOSE(0, verbose_stream() << "self-subsume clause is TBD\n";);
@ -3157,7 +3152,6 @@ namespace sat {
// IF_VERBOSE(10, verbose_stream() << c1 << " subsumes (" << lit << " " << w.get_literal() << ")\n";); // IF_VERBOSE(10, verbose_stream() << c1 << " subsumes (" << lit << " " << w.get_literal() << ")\n";);
if (!w.is_binary_non_learned_clause()) { if (!w.is_binary_non_learned_clause()) {
c1.set_learned(false); c1.set_learned(false);
std::cout << c1 << " subsumes " << lit << " " << w.get_literal() << "\n";
} }
} }
else { else {
@ -3216,7 +3210,6 @@ namespace sat {
\brief lit <=> conjunction of unconstrained lits \brief lit <=> conjunction of unconstrained lits
*/ */
void ba_solver::assert_unconstrained(literal lit, literal_vector const& lits) { void ba_solver::assert_unconstrained(literal lit, literal_vector const& lits) {
std::cout << "assert unconstrained\n";
if (lit == null_literal) { if (lit == null_literal) {
for (literal l : lits) { for (literal l : lits) {
if (value(l) == l_undef) { if (value(l) == l_undef) {
@ -3519,14 +3512,15 @@ namespace sat {
// all elements of r are true, // all elements of r are true,
for (literal l : r) { for (literal l : r) {
if (value(l) != l_true) { if (value(l) != l_true) {
std::cout << "value of " << l << " is " << value(l) << "\n"; IF_VERBOSE(0, verbose_stream() << "value of " << l << " is " << value(l) << "\n";
display(std::cout, p, true); display(verbose_stream(), p, true););
return false; return false;
} }
if (value(alit) == l_true && lvl(l) > lvl(alit)) { if (value(alit) == l_true && lvl(l) > lvl(alit)) {
std::cout << "level of premise " << l << " is " << lvl(l) << "\n"; IF_VERBOSE(0,
std::cout << "level of asserting literal " << alit << " is " << lvl(alit) << "\n"; verbose_stream() << "level of premise " << l << " is " << lvl(l) << "\n";
display(std::cout, p, true); verbose_stream() << "level of asserting literal " << alit << " is " << lvl(alit) << "\n";
display(verbose_stream(), p, true););
return false; return false;
} }
// if (value(alit) == l_true && lvl(l) == lvl(alit)) { // if (value(alit) == l_true && lvl(l) == lvl(alit)) {
@ -3547,14 +3541,15 @@ namespace sat {
} }
} }
if (sum >= p.k()) { if (sum >= p.k()) {
std::cout << "sum is " << sum << " >= " << p.k() << "\n"; IF_VERBOSE(0,
display(std::cout, p, true); verbose_stream() << "sum is " << sum << " >= " << p.k() << "\n";
std::cout << "id: " << p.id() << "\n"; display(verbose_stream(), p, true);
verbose_stream() << "id: " << p.id() << "\n";
sum = 0; sum = 0;
for (wliteral wl : p) sum += wl.first; for (wliteral wl : p) sum += wl.first;
std::cout << "overall sum " << sum << "\n"; verbose_stream() << "overall sum " << sum << "\n";
std::cout << "asserting literal: " << alit << "\n"; verbose_stream() << "asserting literal: " << alit << "\n";
std::cout << "reason: " << r << "\n"; verbose_stream() << "reason: " << r << "\n";);
return false; return false;
} }
for (wliteral wl : p) { for (wliteral wl : p) {
@ -3562,7 +3557,7 @@ namespace sat {
return true; return true;
} }
} }
std::cout << alit << " not found among literals\n"; IF_VERBOSE(0, verbose_stream() << alit << " not found among literals\n";);
return false; return false;
} }
@ -3728,7 +3723,6 @@ namespace sat {
constraint* c = add_at_least(null_literal, lits, k, true); constraint* c = add_at_least(null_literal, lits, k, true);
if (c) { if (c) {
std::cout << *c << "\n";
lits.reset(); lits.reset();
for (wliteral wl : m_wlits) { for (wliteral wl : m_wlits) {
if (value(wl.second) == l_false) lits.push_back(wl.second); if (value(wl.second) == l_false) lits.push_back(wl.second);

1
src/smt/theory_pb.cpp
View file

@ -474,7 +474,6 @@ namespace smt {
if (pb.is_aux_bool(atom)) { if (pb.is_aux_bool(atom)) {
bool_var abv = ctx.mk_bool_var(atom); bool_var abv = ctx.mk_bool_var(atom);
ctx.set_var_theory(abv, get_id()); ctx.set_var_theory(abv, get_id());
std::cout << "aux bool " << ctx.get_scope_level() << " " << mk_pp(atom, get_manager()) << " " << literal(abv) << "\n";
return true; return true;
} }