mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-14 18:06:15 +00:00
Code Activity

#5420

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-07-20 15:29:24 -07:00
parent 134562162a
commit 574246ff7a
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/model/model_evaluator.cpp
View file

@ -150,9 +150,9 @@ struct evaluator_cfg : public default_rewriter_cfg {
br_status reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) { br_status reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, proof_ref & result_pr) {
auto st = reduce_app_core(f, num, args, result, result_pr); auto st = reduce_app_core(f, num, args, result, result_pr);
CTRACE("model_evaluator", st != BR_FAILED, CTRACE("model_evaluator", st != BR_FAILED,
tout << f->get_name() << "\n"; tout << f->get_name() << " ";
for (unsigned i = 0; i < num; ++i) tout << mk_pp(args[i], m) << "\n"; for (unsigned i = 0; i < num; ++i) tout << mk_pp(args[i], m) << " ";
tout << result << "\n";); tout << "\n--> " << result << "\n";);
return st; return st;
} }

7
src/sat/smt/q_mbi.cpp
View file

@ -300,12 +300,11 @@ namespace q {
if (p && !fmls_extracted) { if (p && !fmls_extracted) {
TRACE("q", tout << "domain eqs\n" << qb.domain_eqs << "\n";); TRACE("q", tout << "domain eqs\n" << qb.domain_eqs << "\n";);
for (expr* e : qb.domain_eqs)
if (!m_model->is_true(e))
return expr_ref(nullptr, m);
fmls.append(qb.domain_eqs); fmls.append(qb.domain_eqs);
eliminate_nested_vars(fmls, qb); eliminate_nested_vars(fmls, qb);
for (expr* e : fmls)
if (!m_model->is_true(e))
return expr_ref(nullptr, m);
mbp::project_plugin proj(m); mbp::project_plugin proj(m);
proj.extract_literals(*m_model, vars, fmls); proj.extract_literals(*m_model, vars, fmls);
fmls_extracted = true; fmls_extracted = true;