mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-23 19:47:52 +00:00
Code Activity

fixes to mostly solver arith/euf and backtracking scopes

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-10-26 11:06:34 -07:00
parent 1ee2ba2a9b
commit 8d76470a8a
25 changed files with 189 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/sat/smt/arith_solver.cpp
View file

@ -32,11 +32,6 @@ namespace arith {
{
reset_variable_values();
m_solver = alloc(lp::lar_solver);
// initialize 0, 1 variables:
get_one(true);
get_one(false);
get_zero(true);
get_zero(false);
smt_params_helper lpar(ctx.s().params());
lp().settings().set_resource_limit(m_resource_limit);
@ -556,8 +551,35 @@ namespace arith {
return end;
}
void solver::init_model() {
init_variable_values();
void solver::dbg_finalize_model(model& mdl) {
bool found_bad = false;
for (unsigned v = 0; v < get_num_vars(); ++v) {
if (!is_bool(v))
continue;
euf::enode* n = var2enode(v);
api_bound* b = nullptr;
if (!m_bool_var2bound.find(n->bool_var(), b)) {
IF_VERBOSE(0, verbose_stream() << "no boolean variable\n";);
continue;
}
lbool value = n->value();
expr_ref eval = mdl(var2expr(v));
if (m.is_true(eval) && l_false == value)
found_bad = true;
if (m.is_false(eval) && l_true == value)
found_bad = true;
if (b->get_lit().sign())
value = ~value;
if (!found_bad && value == get_phase(n->bool_var()))
continue;
IF_VERBOSE(0,
verbose_stream() << eval << " " << value << " " << ctx.bpp(n) << "\n";
verbose_stream() << n->bool_var() << " " << n->value() << " " << get_phase(n->bool_var()) << " " << ctx.bpp(n) << "\n";
verbose_stream() << *b << "\n";);
IF_VERBOSE(0, ctx.display(verbose_stream()));
UNREACHABLE();
}
}
void solver::add_value(euf::enode* n, model& mdl, expr_ref_vector& values) {