mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-07 14:55:06 +00:00
Code Activity

na

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-12-21 13:19:49 -08:00
parent b6ba0395b4
commit bc553c1f50
1 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/solver/smtmus.cpp
View file

@ -204,6 +204,9 @@ struct smtmus::imp {
} }
void init_occurs() { void init_occurs() {
m_soft_occurs.reset();
m_hard_occurs.reset();
m_soft_vars.reset();
unsigned idx = 0; unsigned idx = 0;
for (auto const& clause : m_soft_clauses) { for (auto const& clause : m_soft_clauses) {
for (auto* lit : clause) { for (auto* lit : clause) {
@ -216,22 +219,26 @@ struct smtmus::imp {
} }
idx = 0; idx = 0;
func_decl_ref_vector vars(m); func_decl_ref_vector vars(m);
for (auto const& [v, w] : m_soft_occurs)
m_hard_occurs.insert(v, unsigned_vector());
for (auto* fml : m_hard) { for (auto* fml : m_hard) {
vars.reset(); vars.reset();
extract_vars(fml, vars); extract_vars(fml, vars);
for (auto* v : vars) for (auto* v : vars)
if (m_soft_vars.contains(v)) if (m_soft_vars.contains(v))
init_occurs(idx, v, m_hard_occurs); m_hard_occurs[v].push_back(idx);
++idx; ++idx;
} }
} }
void init_lit2ineq() { ineq* lit2ineq(expr* lit) {
for (auto const& [lit, vars] : m_lit2vars) ineq* e = nullptr;
init_lit2ineq(lit); if (m_lit2ineq.find(lit, e))
return e;
return init_lit2ineq(lit);
} }
void init_lit2ineq(expr* lit) { ineq* init_lit2ineq(expr* lit) {
bool is_not = m.is_not(lit, lit); bool is_not = m.is_not(lit, lit);
expr* x, * y; expr* x, * y;
auto mul = [&](rational const& coeff, expr* t) -> expr* { auto mul = [&](rational const& coeff, expr* t) -> expr* {
@ -286,10 +293,12 @@ struct smtmus::imp {
else else
e->m_base = a.mk_add(basis); e->m_base = a.mk_add(basis);
m_lit2ineq.insert(lit, e); m_lit2ineq.insert(lit, e);
return e;
} }
else { else {
// literals that don't correspond to inequalities are associated with null. // literals that don't correspond to inequalities are associated with null.
m_lit2ineq.insert(lit, nullptr); m_lit2ineq.insert(lit, nullptr);
return nullptr;
} }
} }
@ -311,7 +320,6 @@ struct smtmus::imp {
void init() { void init() {
init_soft_clauses(); init_soft_clauses();
init_occurs(); init_occurs();
init_lit2ineq();
} }
lbool get_mus(expr_ref_vector& mus) { lbool get_mus(expr_ref_vector& mus) {
@ -458,23 +466,23 @@ struct smtmus::imp {
} }
expr_ref_vector rotate_get_flips(expr* lit, func_decl* v, model& mdl, unsigned limit) { expr_ref_vector rotate_get_flips(expr* lit, func_decl* v, model& mdl, unsigned limit) {
expr_ref_vector result(m); expr_ref_vector flips(m);
if (m.is_bool(v->get_range())) { if (m.is_bool(v->get_range())) {
expr_ref val(m); expr_ref val(m);
expr* lit2 = lit; expr* lit2 = lit;
m.is_not(lit, lit2); m.is_not(lit, lit2);
if (is_app(lit2) && to_app(lit2)->get_decl() == v && mdl.eval(v, val)) { if (is_app(lit2) && to_app(lit2)->get_decl() == v && mdl.eval(v, val)) {
result.push_back(m.mk_bool_val(m.is_false(val))); flips.push_back(m.mk_bool_val(m.is_false(val)));
return result; return flips;
} }
} }
result = rotate_get_eq_flips(lit, v, mdl, limit); flips = rotate_get_eq_flips(lit, v, mdl, limit);
if (!result.empty()) if (!flips.empty())
return result; return flips;
result = rotate_get_ineq_flips(lit, v, mdl, limit); flips = rotate_get_ineq_flips(lit, v, mdl, limit);
if (!result.empty()) if (!flips.empty())
return result; return flips;
return rotate_get_flips_agnostic(lit, v, mdl, limit); return rotate_get_flips_agnostic(lit, v, mdl, limit);
} }
@ -495,7 +503,7 @@ struct smtmus::imp {
expr_ref_vector rotate_get_ineq_flips(expr* lit, func_decl* v, model& mdl, unsigned limit) { expr_ref_vector rotate_get_ineq_flips(expr* lit, func_decl* v, model& mdl, unsigned limit) {
ineq* e = nullptr; ineq* e = nullptr;
expr_ref_vector flips(m); expr_ref_vector flips(m);
if (m_lit2ineq.find(lit, e) && e && e->m_coeffs.contains(v)) { if ((e = lit2ineq(lit)) && e && e->m_coeffs.contains(v)) {
rational coeff = e->m_coeffs[v]; rational coeff = e->m_coeffs[v];
rational val = e->get_value(mdl, a, v); rational val = e->get_value(mdl, a, v);
bool is_int = a.is_int(v->get_range()); bool is_int = a.is_int(v->get_range());
@ -511,7 +519,7 @@ struct smtmus::imp {
s2->assert_expr(lit); s2->assert_expr(lit);
auto const& vars = get_vars(lit); auto const& vars = get_vars(lit);
expr_ref val(m); expr_ref val(m);
expr_ref_vector result(m); expr_ref_vector flips(m);
for (auto& v2 : vars) { for (auto& v2 : vars) {
if (v2 == v) if (v2 == v)
continue; continue;
@ -524,10 +532,10 @@ struct smtmus::imp {
s2->get_model(m2); s2->get_model(m2);
if (!m2->eval(v, val)) if (!m2->eval(v, val))
break; break;
result.push_back(val); flips.push_back(val);
s2->assert_expr(m.mk_not(m.mk_eq(val, m.mk_const(v)))); s2->assert_expr(m.mk_not(m.mk_eq(val, m.mk_const(v))));
} }
return result; return flips;
} }
bool rotate_get_falsified(bool_vector const& formula, model& mdl, func_decl* f, unsigned& falsified) { bool rotate_get_falsified(bool_vector const& formula, model& mdl, func_decl* f, unsigned& falsified) {
@ -595,9 +603,7 @@ struct smtmus::imp {
bool arith_are_conflicting(unsigned i, unsigned j, func_decl* v) { bool arith_are_conflicting(unsigned i, unsigned j, func_decl* v) {
auto insert_bounds = [&](vector<bound_type>& bounds, expr_ref_vector const& lits) { auto insert_bounds = [&](vector<bound_type>& bounds, expr_ref_vector const& lits) {
for (auto* lit : lits) { for (auto* lit : lits) {
ineq* e = nullptr; ineq* e = lit2ineq(lit);
if (!m_lit2ineq.find(lit, e))
return true;
if (!e) if (!e)
return true; return true;
if (!a.is_numeral(e->m_base)) if (!a.is_numeral(e->m_base))