mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

#6364

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-10-20 16:39:43 -07:00
parent 354bc50400
commit 6d6752b2aa
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -82,6 +82,7 @@ src/api/js/build/
src/api/js/**/*.__GENERATED__.* src/api/js/**/*.__GENERATED__.*
debug/* debug/*
examples/python/z3 examples/python/z3
examples/python/libz3.dll
out/** out/**
*.bak *.bak

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

@ -125,7 +125,11 @@ namespace q {
} }
if (m.is_model_value(e)) if (m.is_model_value(e))
return expr_ref(m.mk_model_value(0, e->get_sort()), m); return expr_ref(m.mk_model_value(0, e->get_sort()), m);
return expr_ref(e, m);
expr_ref e1 = m_model->unfold_as_array(e);
if (e1 == e)
return e1;
return replace_model_value(e1);
} }
expr_ref mbqi::choose_term(euf::enode* r) { expr_ref mbqi::choose_term(euf::enode* r) {
@ -355,8 +359,8 @@ namespace q {
for (app* v : vars) { for (app* v : vars) {
expr_ref term(m); expr_ref term(m);
expr_ref val = (*m_model)(v); expr_ref val = (*m_model)(v);
val = m_model->unfold_as_array(val);
term = replace_model_value(val); term = replace_model_value(val);
TRACE("euf", tout << "replaced model value " << term << "\nfrom\n" << val << "\n");
rep.insert(v, term); rep.insert(v, term);
if (ctx.use_drat()) if (ctx.use_drat())
m_defs.push_back(mbp::def(expr_ref(v, m), term)); m_defs.push_back(mbp::def(expr_ref(v, m), term));
@ -407,10 +411,13 @@ namespace q {
auto* n = nodes[i]; auto* n = nodes[i];
expr* e = n->get_expr(); expr* e = n->get_expr();
expr* val = ctx.node2value(n); expr* val = ctx.node2value(n);
if (val && e->get_sort() == srt && !m.is_value(e) && !visited.is_marked(val)) { if (val && e->get_sort() == srt &&
!m.is_value(e) &&
!visited.is_marked(val)) {
visited.mark(val); visited.mark(val);
expr_ref value = replace_model_value(val);
veqs.push_back(m.mk_eq(v, e)); veqs.push_back(m.mk_eq(v, e));
meqs.push_back(m.mk_eq(v, val)); meqs.push_back(m.mk_eq(v, value));
--bound; --bound;
} }
} }
@ -473,6 +480,7 @@ namespace q {
expr_ref _term = subst(e, qb.vars); expr_ref _term = subst(e, qb.vars);
app_ref term(to_app(_term), m); app_ref term(to_app(_term), m);
expr_ref value = (*m_model)(term); expr_ref value = (*m_model)(term);
value = replace_model_value(value);
expr* s = m_model_fixer.invert_app(term, value); expr* s = m_model_fixer.invert_app(term, value);
rep.insert(term, s); rep.insert(term, s);
expr_ref eq(m.mk_eq(term, s), m); expr_ref eq(m.mk_eq(term, s), m);

2
src/sat/smt/q_model_fixer.cpp
View file

@ -253,7 +253,7 @@ namespace q {
euf::enode* r = nullptr; euf::enode* r = nullptr;
auto& v2r = ctx.values2root(); auto& v2r = ctx.values2root();
TRACE("q", TRACE("q",
tout << "invert-app " << mk_pp(t, m) << " = " << mk_pp(value, m) << "\n"; tout << "invert-app " << mk_pp(t, m) << " =\n" << mk_pp(value, m) << "\n";
if (v2r.find(value, r)) if (v2r.find(value, r))
tout << "inverse " << mk_pp(r->get_expr(), m) << "\n"; tout << "inverse " << mk_pp(r->get_expr(), m) << "\n";
/*ctx.display(tout); */ /*ctx.display(tout); */

2
src/sat/smt/q_theory_checker.cpp
View file

@ -24,7 +24,7 @@ namespace q {
expr_ref_vector theory_checker::clause(app* jst) { expr_ref_vector theory_checker::clause(app* jst) {
expr_ref_vector result(m); expr_ref_vector result(m);
for (expr* arg : *jst) for (expr* arg : *jst)
if (!is_bind(arg)) if (m.is_bool(arg))
result.push_back(mk_not(m, arg)); result.push_back(mk_not(m, arg));
return result; return result;
} }