mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

#6429

Browse source
This commit is contained in:
Nikolaj Bjorner 2022-11-23 18:35:17 +07:00
parent f87e187b62
commit 4ac5e51e3a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,11 +365,12 @@ namespace euf {
continue; continue;
if (k->value() == new_value) if (k->value() == new_value)
continue; continue;
literal litk(k->bool_var(), sign);
if (s().value(litk) == l_true)
continue;
auto& c = lit_constraint(n); auto& c = lit_constraint(n);
propagate(literal(k->bool_var(), sign), c.to_index()); propagate(litk, c.to_index());
if (k->value() == l_undef) if (s().value(litk) == l_false)
m_egraph.set_value(k, new_value, justification::external(to_ptr(l)));
else
return; return;
} }
} }
@ -591,15 +592,18 @@ namespace euf {
euf::enode* n = m_egraph.nodes()[i]; euf::enode* n = m_egraph.nodes()[i];
if (!m.is_bool(n->get_expr()) || !is_shared(n)) if (!m.is_bool(n->get_expr()) || !is_shared(n))
continue; continue;
if (n->value() == l_true && !m.is_true(n->get_root()->get_expr())) { if (n->value() == l_true && n->cgc_enabled() && !m.is_true(n->get_root()->get_expr())) {
TRACE("euf", tout << "merge " << bpp(n) << "\n");
m_egraph.merge(n, mk_true(), to_ptr(sat::literal(n->bool_var()))); m_egraph.merge(n, mk_true(), to_ptr(sat::literal(n->bool_var())));
merged = true; merged = true;
} }
if (n->value() == l_false && !m.is_false(n->get_root()->get_expr())) { if (n->value() == l_false && n->cgc_enabled() && !m.is_false(n->get_root()->get_expr())) {
TRACE("euf", tout << "merge " << bpp(n) << "\n");
m_egraph.merge(n, mk_false(), to_ptr(~sat::literal(n->bool_var()))); m_egraph.merge(n, mk_false(), to_ptr(~sat::literal(n->bool_var())));
merged = true; merged = true;
} }
} }
CTRACE("euf", merged, tout << "shared bools merged\n");
return merged; return merged;
} }