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

mss and mss-mus-maxres

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-03 20:23:10 -07:00
parent d429e72e92
commit 317e76a11b
2 changed files with 64 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/opt/mss.cpp
View file

@ -19,7 +19,6 @@ Notes:
--*/ --*/
#include "solver.h" #include "solver.h"
#include "smt_literal.h"
#include "mss.h" #include "mss.h"
#include "ast_pp.h" #include "ast_pp.h"
#include "model_smt2_pp.h" #include "model_smt2_pp.h"
@ -76,7 +75,10 @@ namespace opt {
core_lits.insert(n); core_lits.insert(n);
VERIFY(m_model->eval(n, tmp)); VERIFY(m_model->eval(n, tmp));
if (m.is_true(tmp)) { if (m.is_true(tmp)) {
m_mss.push_back(n); add_mss(n);
}
else {
m_todo.push_back(n);
} }
} }
} }
@ -91,40 +93,60 @@ namespace opt {
else { else {
rest_core.push_back(n); rest_core.push_back(n);
core_lits.insert(n); core_lits.insert(n);
m_todo.push_back(n);
} }
} }
} }
cores.push_back(rest_core); cores.push_back(rest_core);
} }
void mss::update_set(exprs& lits) { void mss::add_mss(expr* n) {
expr_ref tmp(m); if (!m_mss_set.contains(n)) {
unsigned sz = lits.size(); m_mss_set.insert(n);
m_mss.push_back(n);
}
}
void mss::update_core(exprs& core) {
unsigned j = 0; unsigned j = 0;
for (unsigned i = 0; i < lits.size(); ++i) { for (unsigned i = 0; i < core.size(); ++i) {
expr* n = lits[i]; expr* n = core[i];
if (m_mcs.contains(n)) { if (!m_mss_set.contains(n)) {
// remove from todo. if (i != j) {
continue; core[j] = core[i];
}
VERIFY(m_model->eval(n, tmp));
if (!m.is_true(tmp)) {
if (j != i) {
lits[j] = lits[i];
} }
++j; ++j;
} }
}
core.resize(j);
}
void mss::update_mss() {
expr_ref tmp(m);
unsigned j = 0;
for (unsigned i = 0; i < m_todo.size(); ++i) {
expr* n = m_todo[i];
SASSERT(!m_mss_set.contains(n));
if (m_mcs.contains(n)) {
continue; // remove from cores.
}
VERIFY(m_model->eval(n, tmp));
if (m.is_true(tmp)) {
add_mss(n);
}
else { else {
m_mss.push_back(n); if (j != i) {
m_todo[j] = m_todo[i];
}
++j;
} }
} }
lits.resize(j); m_todo.resize(j);
} }
lbool mss::operator()(vector<exprs> const& _cores, exprs& literals) { lbool mss::operator()(vector<exprs> const& _cores, exprs& literals) {
m_mss.reset(); m_mss.reset();
m_mcs.reset(); m_todo.reset();
m_s->get_model(m_model); m_s->get_model(m_model);
SASSERT(m_model); SASSERT(m_model);
vector<exprs> cores(_cores); vector<exprs> cores(_cores);
@ -141,8 +163,8 @@ namespace opt {
bool has_mcs = false; bool has_mcs = false;
bool is_last = i + 1 < cores.size(); bool is_last = i + 1 < cores.size();
SASSERT(check_invariant()); SASSERT(check_invariant());
update_set(cores[i]); update_core(cores[i]); // remove members of mss
is_sat = process_core(1, cores[i], has_mcs, is_last); is_sat = process_core(1, cores[i], has_mcs, is_last);
} }
if (is_sat == l_true) { if (is_sat == l_true) {
SASSERT(check_invariant()); SASSERT(check_invariant());
@ -151,6 +173,8 @@ namespace opt {
literals.append(m_mss); literals.append(m_mss);
SASSERT(check_result()); SASSERT(check_result());
} }
m_mcs.reset();
m_mss_set.reset();
return is_sat; return is_sat;
} }
@ -160,7 +184,6 @@ namespace opt {
// pick literals in core that are not yet in mss. // pick literals in core that are not yet in mss.
// //
lbool mss::process_core(unsigned sz, exprs& core, bool& has_mcs, bool is_last) { lbool mss::process_core(unsigned sz, exprs& core, bool& has_mcs, bool is_last) {
TRACE("opt", tout << "process: " << sz << " out of " << core.size() << " literals\n";);
SASSERT(sz > 0); SASSERT(sz > 0);
if (core.empty()) { if (core.empty()) {
return l_true; return l_true;
@ -168,13 +191,15 @@ namespace opt {
if (m_cancel) { if (m_cancel) {
return l_undef; return l_undef;
} }
if (sz == 1 && is_last && !has_mcs) { if (sz == 1 && core.size() == 1 && is_last && !has_mcs) {
// there has to be at least one false // there has to be at least one false
// literal in the core. // literal in the core.
TRACE("opt", tout << "mcs: " << mk_pp(core[0], m) << "\n";);
m_mcs.insert(core[0]); m_mcs.insert(core[0]);
return l_true; return l_true;
} }
sz = std::min(sz, core.size()); sz = std::min(sz, core.size());
TRACE("opt", display_vec(tout << "process (total " << core.size() << ") :", sz, core.c_ptr()););
unsigned sz_save = m_mss.size(); unsigned sz_save = m_mss.size();
m_mss.append(sz, core.c_ptr()); m_mss.append(sz, core.c_ptr());
lbool is_sat = m_s->check_sat(m_mss.size(), m_mss.c_ptr()); lbool is_sat = m_s->check_sat(m_mss.size(), m_mss.c_ptr());
@ -182,7 +207,13 @@ namespace opt {
switch (is_sat) { switch (is_sat) {
case l_true: case l_true:
m_s->get_model(m_model); m_s->get_model(m_model);
update_set(core); update_mss();
// sz entries from core should now be in mss.
DEBUG_CODE(
for (unsigned i = 0; i < sz; ++i) {
SASSERT(m_mss_set.contains(core[i]));
});
update_core(core);
return process_core(2*sz, core, has_mcs, is_last); return process_core(2*sz, core, has_mcs, is_last);
case l_false: case l_false:
if (sz == 1) { if (sz == 1) {
@ -199,6 +230,7 @@ namespace opt {
if (is_sat != l_true) { if (is_sat != l_true) {
return is_sat; return is_sat;
} }
update_core(core);
} }
return process_core(1, core, has_mcs, is_last); return process_core(1, core, has_mcs, is_last);
case l_undef: case l_undef:
@ -241,7 +273,6 @@ namespace opt {
CTRACE("opt", !m.is_true(tmp), tout << mk_pp(n, m) << " |-> " << mk_pp(tmp, m) << "\n";); CTRACE("opt", !m.is_true(tmp), tout << mk_pp(n, m) << " |-> " << mk_pp(tmp, m) << "\n";);
SASSERT(!m.is_false(tmp)); SASSERT(!m.is_false(tmp));
} }
return true; return true;
} }
} }

8
src/opt/mss.h
View file

@ -28,6 +28,8 @@ namespace opt {
typedef obj_hashtable<expr> expr_set; typedef obj_hashtable<expr> expr_set;
exprs m_mss; exprs m_mss;
expr_set m_mcs; expr_set m_mcs;
expr_set m_mss_set;
exprs m_todo;
model_ref m_model; model_ref m_model;
public: public:
mss(ref<solver>& s, ast_manager& m); mss(ref<solver>& s, ast_manager& m);
@ -42,9 +44,9 @@ namespace opt {
private: private:
void initialize(vector<exprs>& cores, exprs& literals); void initialize(vector<exprs>& cores, exprs& literals);
bool check_result(); bool check_result();
void update_model(); void add_mss(expr* n);
void update_set(exprs& lits); void update_mss();
lbool process_core(exprs const& _core); void update_core(exprs& core);
lbool process_core(unsigned sz, exprs& core, bool& has_mcs, bool is_last); lbool process_core(unsigned sz, exprs& core, bool& has_mcs, bool is_last);
void display(std::ostream& out) const; void display(std::ostream& out) const;
void display_vec(std::ostream& out, unsigned sz, expr* const* args) const; void display_vec(std::ostream& out, unsigned sz, expr* const* args) const;