mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 03:32:28 +00:00
Code Activity

prepare for incremental axiom propagation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-10-17 16:54:12 +02:00
parent 5169e552fa
commit aa1f1f56b6
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/smt/theory_finite_set.cpp
View file

@ -126,8 +126,14 @@ namespace smt {
void theory_finite_set::new_eq_eh(theory_var v1, theory_var v2) { void theory_finite_set::new_eq_eh(theory_var v1, theory_var v2) {
TRACE(finite_set, tout << "new_eq_eh: v" << v1 << " = v" << v2 << "\n";); TRACE(finite_set, tout << "new_eq_eh: v" << v1 << " = v" << v2 << "\n";);
// When two sets are equal, propagate membership constraints // x = y, y in S
// This is handled by congruence closure, so no additional work needed here // -------------------
// axioms for x in S
auto n1 = get_enode(v1);
auto n2 = get_enode(v2);
auto e1 = n1->get_expr();
auto e2 = n2->get_expr();
} }
void theory_finite_set::new_diseq_eh(theory_var v1, theory_var v2) { void theory_finite_set::new_diseq_eh(theory_var v1, theory_var v2) {
@ -191,6 +197,10 @@ namespace smt {
// Assert all new lemmas as clauses // Assert all new lemmas as clauses
for (unsigned i = sz; i < m_theory_axioms.size(); ++i) for (unsigned i = sz; i < m_theory_axioms.size(); ++i)
assert_clause(m_theory_axioms[i]); assert_clause(m_theory_axioms[i]);
// TODO also add axioms for x in S u T, x in S n T, etc to the stack of m_theory_axioms.
// The axioms are then instantiated if they are propagating.
} }
/** /**
@ -363,6 +373,9 @@ namespace smt {
if (!ctx.is_relevant(x)) if (!ctx.is_relevant(x))
continue; continue;
x = x->get_root(); x = x->get_root();
if (x->is_marked())
continue;
x->set_mark(); // make sure we only do this once per element
// TODO: use marking of x to avoid duplicate work // TODO: use marking of x to avoid duplicate work
for (auto p : enode::parents(x)) { for (auto p : enode::parents(x)) {
if (!ctx.is_relevant(p)) if (!ctx.is_relevant(p))
@ -381,6 +394,11 @@ namespace smt {
m_set_members.find(set)->insert(x); m_set_members.find(set)->insert(x);
} }
} }
for (auto x : m_elements) {
x = x->get_root();
if (x->is_marked())
x->unset_mark();
}
} }
struct finite_set_value_proc : model_value_proc { struct finite_set_value_proc : model_value_proc {