mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

replace __debug__ by Z3_DEBUG #2225

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-04-27 13:47:53 -07:00
parent 6af6617e36
commit 944ce1135b
4 changed files with 162 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/nlsat/nlsat_solver.cpp
View file

@ -1347,6 +1347,7 @@ namespace nlsat {
restore_order();
CTRACE("nlsat_model", r == l_true, tout << "model\n"; display_assignment(tout););
CTRACE("nlsat", r == l_false, display(tout););
VERIFY(r != l_true || check_satisfied(m_clauses));
return r;
}
@ -1867,11 +1868,17 @@ namespace nlsat {
if (m_bk != null_bool_var)
num = m_bk;
for (bool_var b = 0; b < num; b++) {
SASSERT(check_satisfied(m_bwatches[b]));
if (!check_satisfied(m_bwatches[b])) {
UNREACHABLE();
return false;
}
}
if (m_xk != null_var) {
for (var x = 0; x < m_xk; x++) {
SASSERT(check_satisfied(m_watches[x]));
if (!check_satisfied(m_watches[x])) {
UNREACHABLE();
return false;
}
}
}
return true;

7
src/nlsat/tactic/nlsat_tactic.cpp
View file

@ -85,6 +85,9 @@ class nlsat_tactic : public tactic {
for (unsigned i = 0; i < sz; i++) {
if (!model.is_true(g.form(i))) {
TRACE("nlsat", tout << mk_pp(g.form(i), m) << " -> " << model(g.form(i)) << "\n";);
IF_VERBOSE(0, verbose_stream() << mk_pp(g.form(i), m) << " -> " << model(g.form(i)) << "\n";);
IF_VERBOSE(1, verbose_stream() << model << "\n");
IF_VERBOSE(1, m_solver.display(verbose_stream()));
return false;
}
}
@ -123,6 +126,7 @@ class nlsat_tactic : public tactic {
md->register_decl(to_app(a)->get_decl(), val == l_true ? m.mk_true() : m.mk_false());
}
DEBUG_CODE(eval_model(*md.get(), g););
// VERIFY(eval_model(*md.get(), g));
mc = model2model_converter(md.get());
return ok;
}
@ -149,6 +153,9 @@ class nlsat_tactic : public tactic {
t2x.mk_inv(m_display_var.m_var2expr);
m_solver.set_display_var(m_display_var);
IF_VERBOSE(10000, m_solver.display(verbose_stream()));
IF_VERBOSE(10000, g->display(verbose_stream()));
lbool st = m_solver.check();
if (st == l_undef) {