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

#5532

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-09-04 18:03:15 -07:00
parent 976c0a391c
commit 9c91698201
6 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sat/smt/array_axioms.cpp
View file

@ -570,7 +570,7 @@ namespace array {
expr* e2 = var2expr(v2); expr* e2 = var2expr(v2);
if (e1->get_sort() != e2->get_sort()) if (e1->get_sort() != e2->get_sort())
continue; continue;
if (have_different_model_values(v1, v2)) if (must_have_different_model_values(v1, v2))
continue; continue;
if (ctx.get_egraph().are_diseq(var2enode(v1), var2enode(v2))) if (ctx.get_egraph().are_diseq(var2enode(v1), var2enode(v2)))
continue; continue;
@ -600,7 +600,7 @@ namespace array {
r->mark1(); r->mark1();
to_unmark.push_back(r); to_unmark.push_back(r);
} }
TRACE("array", tout << "collecting shared vars...\n" << unsigned_vector(roots.size(), (unsigned*)roots.data()) << "\n";); TRACE("array", tout << "collecting shared vars...\n"; for (auto v : roots) tout << ctx.bpp(var2enode(v)) << "\n";);
for (auto* n : to_unmark) for (auto* n : to_unmark)
n->unmark1(); n->unmark1();
} }

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

@ -24,7 +24,7 @@ namespace array {
out << "array\n"; out << "array\n";
for (unsigned i = 0; i < get_num_vars(); ++i) { for (unsigned i = 0; i < get_num_vars(); ++i) {
auto& d = get_var_data(i); auto& d = get_var_data(i);
out << var2enode(i)->get_expr_id() << " " << (d.m_prop_upward?"up":"fx") << " " << mk_bounded_pp(var2expr(i), m, 2) << "\n"; out << "v" << i << ": " << var2enode(i)->get_expr_id() << " " << (d.m_prop_upward?"up":"fx") << " " << mk_bounded_pp(var2expr(i), m, 2) << "\n";
display_info(out, "parent lambdas", d.m_parent_lambdas); display_info(out, "parent lambdas", d.m_parent_lambdas);
display_info(out, "parent select", d.m_parent_selects); display_info(out, "parent select", d.m_parent_selects);
display_info(out, "lambdas", d.m_lambdas); display_info(out, "lambdas", d.m_lambdas);

9
src/sat/smt/array_internalize.cpp
View file

@ -75,10 +75,11 @@ namespace array {
} }
void solver::internalize_lambda(euf::enode* n) { void solver::internalize_lambda(euf::enode* n) {
set_prop_upward(n); SASSERT(is_lambda(n->get_expr()) || a.is_const(n->get_expr()) || a.is_as_array(n->get_expr()));
if (!a.is_store(n->get_expr())) theory_var v = n->get_th_var(get_id());
push_axiom(default_axiom(n)); push_axiom(default_axiom(n));
add_lambda(n->get_th_var(get_id()), n); add_lambda(v, n);
set_prop_upward(v);
} }
void solver::internalize_select(euf::enode* n) { void solver::internalize_select(euf::enode* n) {

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

@ -116,7 +116,7 @@ namespace array {
} }
bool solver::have_different_model_values(theory_var v1, theory_var v2) { bool solver::must_have_different_model_values(theory_var v1, theory_var v2) {
euf::enode* else1 = nullptr, * else2 = nullptr; euf::enode* else1 = nullptr, * else2 = nullptr;
euf::enode* n1 = var2enode(v1), *n2 = var2enode(v2); euf::enode* n1 = var2enode(v1), *n2 = var2enode(v2);
euf::enode* r1 = n1->get_root(), * r2 = n2->get_root(); euf::enode* r1 = n1->get_root(), * r2 = n2->get_root();

3
src/sat/smt/array_solver.h
View file

@ -222,7 +222,7 @@ namespace array {
euf::enode_vector m_defaults; // temporary field for model construction euf::enode_vector m_defaults; // temporary field for model construction
ptr_vector<expr> m_else_values; // ptr_vector<expr> m_else_values; //
svector<int> m_parents; // temporary field for model construction svector<int> m_parents; // temporary field for model construction
bool have_different_model_values(theory_var v1, theory_var v2); bool must_have_different_model_values(theory_var v1, theory_var v2);
void collect_defaults(); void collect_defaults();
void mg_merge(theory_var u, theory_var v); void mg_merge(theory_var u, theory_var v);
theory_var mg_find(theory_var n); theory_var mg_find(theory_var n);
@ -262,6 +262,7 @@ namespace array {
euf::theory_var mk_var(euf::enode* n) override; euf::theory_var mk_var(euf::enode* n) override;
void apply_sort_cnstr(euf::enode* n, sort* s) override; void apply_sort_cnstr(euf::enode* n, sort* s) override;
bool is_shared(theory_var v) const override; bool is_shared(theory_var v) const override;
bool enable_self_propagate() const override { return true; }
void merge_eh(theory_var, theory_var, theory_var v1, theory_var v2); void merge_eh(theory_var, theory_var, theory_var v1, theory_var v2);
void after_merge_eh(theory_var r1, theory_var r2, theory_var v1, theory_var v2) {} void after_merge_eh(theory_var r1, theory_var r2, theory_var v1, theory_var v2) {}

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

@ -90,6 +90,14 @@ namespace q {
univ.append(residue); univ.append(residue);
add_projection_functions(mdl, univ); add_projection_functions(mdl, univ);
for (unsigned i = mdl.get_num_functions(); i-- > 0; ) {
func_decl* f = mdl.get_function(i);
func_interp* fi = mdl.get_func_interp(f);
if (fi->is_partial())
fi->set_else(fi->get_max_occ_result());
if (fi->is_partial())
fi->set_else(mdl.get_some_value(f->get_range()));
}
TRACE("q", tout << "end: " << mdl << "\n";); TRACE("q", tout << "end: " << mdl << "\n";);
} }