mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-02 20:47:52 +00:00
Code Activity

fix disequality conflict shortcut

Browse source
This commit is contained in:
Jakob Rath 2023-07-20 15:10:58 +02:00
parent ec4be975ee
commit 4142201d88
3 changed files with 50 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/math/polysat/slicing.cpp
View file

@ -185,7 +185,6 @@ namespace polysat {
auto args = {x, y};
eqn = m_egraph.mk(eq, 0, args.size(), args.begin());
auto j = euf::justification::external(encode_dep(lit));
LOG("calling set_value");
m_egraph.set_value(eqn, l_false, j);
SASSERT(eqn->is_equality());
SASSERT_EQ(eqn->value(), l_false);
@ -233,6 +232,13 @@ namespace polysat {
m_egraph.merge(sv, concat, encode_dep(dep_t()));
}
void slicing::add_congruence_if_needed(pvar v) {
if (!m_needs_congruence.contains(v))
return;
m_needs_congruence.remove(v);
add_congruence(v);
}
void slicing::update_var_congruences() {
for (pvar v : m_needs_congruence)
add_congruence(v);
@ -764,9 +770,10 @@ namespace polysat {
else {
SASSERT(c.is_negative());
enode* n = find_or_alloc_disequality(sy, sx, c.blit());
if (is_equal(sx, sy)) {
SASSERT_EQ(m_disequality_conflict, n); // already discovered by egraph in simple examples... TODO: probably not when we need the slice congruences
// m_disequality_conflict = n;
if (!m_disequality_conflict && is_equal(sx, sy)) {
add_congruence_if_needed(x);
add_congruence_if_needed(y);
m_disequality_conflict = n;
}
}
// without this check, when p = x - y we would handle both x = y and y = x separately

1
src/math/polysat/slicing.h
View file

@ -101,6 +101,7 @@ namespace polysat {
// for each variable v with base slices s1, ..., sn
void update_var_congruences();
void add_congruence(pvar v);
void add_congruence_if_needed(pvar v);
func_decl* mk_concat_decl(ptr_vector<expr> const& args);