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

mbi

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-09-29 15:49:48 -07:00
parent 45103637ad
commit a414480274
6 changed files with 68 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/sat/smt/euf_model.cpp
View file

@ -24,11 +24,11 @@ namespace euf {
void solver::update_model(model_ref& mdl) {
deps_t deps;
expr_ref_vector values(m);
m_values.reset();
collect_dependencies(deps);
deps.topological_sort();
dependencies2values(deps, values, mdl);
values2model(deps, values, mdl);
dependencies2values(deps, mdl);
values2model(deps, mdl);
}
bool solver::include_func_interp(func_decl* f) {
@ -91,26 +91,26 @@ namespace euf {
}
};
void solver::dependencies2values(deps_t& deps, expr_ref_vector& values, model_ref& mdl) {
user_sort user_sort(*this, values, mdl);
void solver::dependencies2values(deps_t& deps, model_ref& mdl) {
user_sort user_sort(*this, m_values, mdl);
for (enode* n : deps.top_sorted()) {
unsigned id = n->get_root_id();
if (values.get(id, nullptr))
if (m_values.get(id, nullptr))
continue;
expr* e = n->get_expr();
values.reserve(id + 1);
m_values.reserve(id + 1);
if (m.is_bool(e) && is_uninterp_const(e) && mdl->get_const_interp(to_app(e)->get_decl())) {
values.set(id, mdl->get_const_interp(to_app(e)->get_decl()));
m_values.set(id, mdl->get_const_interp(to_app(e)->get_decl()));
continue;
}
// model of s() must have been fixed.
if (m.is_bool(e)) {
if (m.is_true(e)) {
values.set(id, m.mk_true());
m_values.set(id, m.mk_true());
continue;
}
if (m.is_false(e)) {
values.set(id, m.mk_false());
m_values.set(id, m.mk_false());
continue;
}
if (is_app(e) && to_app(e)->get_family_id() == m.get_basic_family_id())
@ -119,10 +119,10 @@ namespace euf {
SASSERT(v != sat::null_bool_var);
switch (s().value(v)) {
case l_true:
values.set(id, m.mk_true());
m_values.set(id, m.mk_true());
break;
case l_false:
values.set(id, m.mk_false());
m_values.set(id, m.mk_false());
break;
default:
break;
@ -134,16 +134,16 @@ namespace euf {
if (m.is_uninterp(srt))
user_sort.add(id, srt);
else if (auto* mbS = sort2solver(srt))
mbS->add_value(n, *mdl, values);
mbS->add_value(n, *mdl, m_values);
else if (auto* mbE = expr2solver(e))
mbE->add_value(n, *mdl, values);
mbE->add_value(n, *mdl, m_values);
else {
IF_VERBOSE(1, verbose_stream() << "no model values created for " << mk_pp(e, m) << "\n");
}
}
}
void solver::values2model(deps_t const& deps, expr_ref_vector const& values, model_ref& mdl) {
void solver::values2model(deps_t const& deps, model_ref& mdl) {
ptr_vector<expr> args;
for (enode* n : deps.top_sorted()) {
expr* e = n->get_expr();
@ -155,7 +155,7 @@ namespace euf {
continue;
if (m.is_bool(e) && is_uninterp_const(e) && mdl->get_const_interp(f))
continue;
expr* v = values.get(n->get_root_id());
expr* v = m_values.get(n->get_root_id());
CTRACE("euf", !v, tout << "no value for " << mk_pp(e, m) << "\n";);
if (!v)
continue;
@ -170,7 +170,7 @@ namespace euf {
}
args.reset();
for (enode* arg : enode_args(n)) {
args.push_back(values.get(arg->get_root_id()));
args.push_back(m_values.get(arg->get_root_id()));
SASSERT(args.back());
}
SASSERT(args.size() == arity);
@ -184,4 +184,13 @@ namespace euf {
// TODO
}
obj_map<expr,enode*> const& solver::values2root() {
m_values2root.reset();
for (enode* n : m_egraph.nodes())
if (n->is_root())
m_values2root.insert(m_values.get(n->get_root_id()), n);
return m_values2root;
}
}