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

fix #4057 fix #4061

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-05-01 13:16:56 -07:00
parent dcb75c4b31
commit 8dd522d805
1 changed files with 53 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/smt/smt_consequences.cpp
View file

@ -28,7 +28,7 @@ namespace smt {
expr_ref context::antecedent2fml(index_set const& vars) { expr_ref context::antecedent2fml(index_set const& vars) {
expr_ref_vector premises(m); expr_ref_vector premises(m);
for (unsigned v : vars) { for (unsigned v : vars) {
expr* e = bool_var2expr(v); expr* e = bool_var2expr(v);
e = m_assumption2orig.find(e); e = m_assumption2orig.find(e);
premises.push_back(get_assignment(v) != l_false ? e : m.mk_not(e)); premises.push_back(get_assignment(v) != l_false ? e : m.mk_not(e));
@ -159,11 +159,16 @@ namespace smt {
unsigned context::delete_unfixed(expr_ref_vector& unfixed) { unsigned context::delete_unfixed(expr_ref_vector& unfixed) {
ptr_vector<expr> to_delete; ptr_vector<expr> to_delete;
for (auto const& kv : m_var2val) { for (auto const& kv : m_var2val) {
expr* k = kv.m_key; expr* k = kv.m_key;
expr* v = kv.m_value; expr* v = kv.m_value;
if (m.is_bool(k)) { if (m.is_bool(k)) {
literal lit = get_literal(k); literal lit = get_literal(k);
TRACE("context",
tout << "checking " << mk_pp(k, m) << " "
<< mk_pp(v, m) << " " << get_assignment(lit) << "\n";
display(tout);
);
switch (get_assignment(lit)) { switch (get_assignment(lit)) {
case l_true: case l_true:
if (m.is_false(v)) { if (m.is_false(v)) {
@ -193,15 +198,13 @@ namespace smt {
to_delete.push_back(k); to_delete.push_back(k);
} }
} }
for (unsigned i = 0; i < to_delete.size(); ++i) { for (expr* e : to_delete) {
m_var2val.remove(to_delete[i]); m_var2val.remove(e);
unfixed.push_back(to_delete[i]); unfixed.push_back(e);
} }
return to_delete.size(); return to_delete.size();
} }
#define are_equal(v, k) (e_internalized(k) && e_internalized(v) && get_enode(k)->get_root() == get_enode(v)->get_root())
// //
// Extract equalities that are congruent at the search level. // Extract equalities that are congruent at the search level.
// Add a clause to short-circuit the congruence justifications for // Add a clause to short-circuit the congruence justifications for
@ -209,18 +212,23 @@ namespace smt {
// //
unsigned context::extract_fixed_eqs(expr_ref_vector& conseq) { unsigned context::extract_fixed_eqs(expr_ref_vector& conseq) {
TRACE("context", tout << "extract fixed consequences\n";); TRACE("context", tout << "extract fixed consequences\n";);
auto are_equal = [&](expr* k, expr* v) {
return e_internalized(k) &&
e_internalized(v) &&
get_enode(k)->get_root() == get_enode(v)->get_root();
};
ptr_vector<expr> to_delete; ptr_vector<expr> to_delete;
expr_ref fml(m), eq(m); expr_ref fml(m), eq(m);
for (auto const& kv : m_var2val) { for (auto const& kv : m_var2val) {
expr* k = kv.m_key; expr* k = kv.m_key;
expr* v = kv.m_value; expr* v = kv.m_value;
if (!m.is_bool(k) && are_equal(k, v)) { if (!m.is_bool(k) && are_equal(k, v)) {
literal_vector literals; literal_vector literals;
m_conflict_resolution->eq2literals(get_enode(v), get_enode(k), literals); m_conflict_resolution->eq2literals(get_enode(v), get_enode(k), literals);
index_set s; index_set s;
for (unsigned i = 0; i < literals.size(); ++i) { for (literal lit : literals) {
SASSERT(get_assign_level(literals[i]) <= get_search_level()); SASSERT(get_assign_level(lit) <= get_search_level());
s |= m_antecedents.find(literals[i].var()); s |= m_antecedents.find(lit.var());
} }
fml = m.mk_eq(m_var2orig.find(k), v); fml = m.mk_eq(m_var2orig.find(k), v);
@ -228,17 +236,17 @@ namespace smt {
conseq.push_back(fml); conseq.push_back(fml);
to_delete.push_back(k); to_delete.push_back(k);
for (unsigned i = 0; i < literals.size(); ++i) { for (literal& lit : literals)
literals[i].neg(); lit.neg();
}
literal lit = mk_diseq(k, v); literal lit = mk_diseq(k, v);
literals.push_back(lit); literals.push_back(lit);
mk_clause(literals.size(), literals.c_ptr(), nullptr); mk_clause(literals.size(), literals.c_ptr(), nullptr);
TRACE("context", display_literals_verbose(tout, literals.size(), literals.c_ptr());); TRACE("context", display_literals_verbose(tout, literals.size(), literals.c_ptr()););
} }
} }
for (unsigned i = 0; i < to_delete.size(); ++i) { for (expr* e : to_delete) {
m_var2val.remove(to_delete[i]); m_var2val.remove(e);
} }
return to_delete.size(); return to_delete.size();
} }
@ -270,18 +278,25 @@ namespace smt {
m_var2val.reset(); m_var2val.reset();
m_var2orig.reset(); m_var2orig.reset();
m_assumption2orig.reset(); m_assumption2orig.reset();
bool pushed = false; struct scoped_level {
for (unsigned i = 0; i < vars0.size(); ++i) { context& c;
expr* v = vars0[i]; unsigned lvl;
scoped_level(context& c):
c(c), lvl(c.get_scope_level()) {}
~scoped_level() {
if (c.get_scope_level() > lvl)
c.pop_scope(c.get_scope_level() - lvl);
}
};
scoped_level _lvl(*this);
for (expr* v : vars0) {
if (is_uninterp_const(v)) { if (is_uninterp_const(v)) {
vars.push_back(v); vars.push_back(v);
m_var2orig.insert(v, v); m_var2orig.insert(v, v);
} }
else { else {
if (!pushed) { push();
pushed = true;
push();
}
expr_ref c(m.mk_fresh_const("v", m.get_sort(v)), m); expr_ref c(m.mk_fresh_const("v", m.get_sort(v)), m);
expr_ref eq(m.mk_eq(c, v), m); expr_ref eq(m.mk_eq(c, v), m);
assert_expr(eq); assert_expr(eq);
@ -295,10 +310,7 @@ namespace smt {
m_assumption2orig.insert(a, a); m_assumption2orig.insert(a, a);
} }
else { else {
if (!pushed) { push();
pushed = true;
push();
}
expr_ref c(m.mk_fresh_const("a", m.get_sort(a)), m); expr_ref c(m.mk_fresh_const("a", m.get_sort(a)), m);
expr_ref eq(m.mk_eq(c, a), m); expr_ref eq(m.mk_eq(c, a), m);
assert_expr(eq); assert_expr(eq);
@ -309,9 +321,13 @@ namespace smt {
lbool is_sat = check(assumptions.size(), assumptions.c_ptr()); lbool is_sat = check(assumptions.size(), assumptions.c_ptr());
if (is_sat != l_true) { if (is_sat != l_true) {
TRACE("context", tout << is_sat << "\n";); TRACE("context", tout << is_sat << "\n";);
if (pushed) pop(1);
return is_sat; return is_sat;
} }
if (m_qmanager->has_quantifiers()) {
IF_VERBOSE(1, verbose_stream() << "(get-consequences :unsupported-quantifiers)\n";);
return l_undef;
}
TRACE("context", display(tout);); TRACE("context", display(tout););
index_set _assumptions; index_set _assumptions;
@ -352,7 +368,6 @@ namespace smt {
if (num_vars >= chunk_size) if (num_vars >= chunk_size)
break; break;
if (get_cancel_flag()) { if (get_cancel_flag()) {
if (pushed) pop(1);
return l_undef; return l_undef;
} }
expr* e = kv.m_key; expr* e = kv.m_key;
@ -365,12 +380,14 @@ namespace smt {
++num_vars; ++num_vars;
push_scope(); push_scope();
assign(lit, b_justification::mk_axiom(), true); assign(lit, b_justification::mk_axiom(), true);
if (!propagate() && (!resolve_conflict() || inconsistent())) { while (can_propagate()) {
TRACE("context", tout << "inconsistent\n";); if (!propagate() && (!resolve_conflict() || inconsistent())) {
SASSERT(inconsistent()); TRACE("context", tout << "inconsistent\n";);
m_conflict = null_b_justification; SASSERT(inconsistent());
m_not_l = null_literal; m_conflict = null_b_justification;
SASSERT(m_search_lvl == get_search_level()); m_not_l = null_literal;
SASSERT(m_search_lvl == get_search_level());
}
} }
} }
SASSERT(!inconsistent()); SASSERT(!inconsistent());
@ -380,11 +397,10 @@ namespace smt {
while (true) { while (true) {
is_sat = bounded_search(); is_sat = bounded_search();
if (is_sat != l_true && m_last_search_failure != OK) { if (is_sat != l_true && m_last_search_failure != OK) {
if (pushed) pop(1);
return is_sat; return is_sat;
} }
if (is_sat == l_undef) { if (is_sat == l_undef) {
IF_VERBOSE(1, verbose_stream() << "(get-consequences inc-limits)\n";); IF_VERBOSE(0, verbose_stream() << "(get-consequences inc-limits)\n";);
inc_limits(); inc_limits();
continue; continue;
} }
@ -408,9 +424,6 @@ namespace smt {
end_search(); end_search();
DEBUG_CODE(validate_consequences(assumptions, vars, conseq, unfixed);); DEBUG_CODE(validate_consequences(assumptions, vars, conseq, unfixed););
if (pushed) {
pop(1);
}
return l_true; return l_true;
} }