mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

perf improvements, mus

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2014-08-01 16:11:52 -07:00
parent 6438c477b3
commit b928734348
7 changed files with 242 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/opt/inc_sat_solver.cpp
View file

@ -43,7 +43,6 @@ class inc_sat_solver : public solver {
model_ref m_model;
model_converter_ref m_mc;
tactic_ref m_preprocess;
statistics m_stats;
unsigned m_num_scopes;
sat::literal_vector m_asms;
goal_ref_buffer m_subgoals;
@ -89,7 +88,8 @@ public:
virtual lbool check_sat(unsigned num_assumptions, expr * const * assumptions) {
m_solver.pop_to_base_level();
dep2asm_t dep2asm;
m_model.reset();
lbool r = internalize_formulas();
if (r != l_true) return r;
r = internalize_assumptions(num_assumptions, assumptions, dep2asm);
@ -98,7 +98,6 @@ public:
r = m_solver.check(m_asms.size(), m_asms.c_ptr());
switch (r) {
case l_true:
extract_model();
break;
case l_false:
// TBD: expr_dependency core is not accounted for.
@ -109,7 +108,6 @@ public:
default:
break;
}
m_solver.collect_statistics(m_stats);
return r;
}
virtual void set_cancel(bool f) {
@ -155,13 +153,17 @@ public:
}
virtual void collect_statistics(statistics & st) const {
st.copy(m_stats);
m_preprocess->collect_statistics(st);
m_solver.collect_statistics(st);
}
virtual void get_unsat_core(ptr_vector<expr> & r) {
r.reset();
r.append(m_core.size(), m_core.c_ptr());
}
virtual void get_model(model_ref & m) {
if (!m_model) {
extract_model();
}
m = m_model;
}
virtual proof * get_proof() {
@ -190,7 +192,6 @@ private:
}
catch (tactic_exception & ex) {
IF_VERBOSE(0, verbose_stream() << "exception in tactic " << ex.msg() << "\n";);
m_preprocess->collect_statistics(m_stats);
return l_undef;
}
m_mc = concat(m_mc.get(), m_mc2.get());
@ -270,6 +271,9 @@ private:
}
// TBD: this is super-expensive because of the
// bit-blasting model converter.
void extract_model() {
model_ref md = alloc(model, m);
sat::model const & ll_m = m_solver.get_model();

4
src/opt/mus.cpp
View file

@ -123,7 +123,7 @@ struct mus::imp {
TRACE("opt",
display_vec(tout << "core: ", core);
display_vec(tout << "mus: ", mus);
display_vec(tout << "model: ", model);
// display_vec(tout << "model: ", model);
);
core.pop_back();
expr* cls = m_cls2expr[cls_id].get();
@ -140,8 +140,8 @@ struct mus::imp {
case l_true:
assumptions.push_back(cls);
mus.push_back(cls_id);
extract_model(model);
if (m_rmr_enabled) {
extract_model(model);
sz = core.size();
core.append(mus);
rmr(core, mus, model);