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

making simplifier code exception friendlier. Towards getting a handle on #939

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-03-22 19:06:59 -07:00
parent e47e8c67c0
commit 26ae3a5abb
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/sat/sat_simplifier.cpp
View file

@ -168,14 +168,13 @@ namespace sat {
m_need_cleanup = false; m_need_cleanup = false;
m_use_list.init(s.num_vars()); m_use_list.init(s.num_vars());
init_visited(); init_visited();
bool learned_in_use_lists = false; m_learned_in_use_lists = false;
if (learned) { if (learned) {
register_clauses(s.m_learned); register_clauses(s.m_learned);
learned_in_use_lists = true; m_learned_in_use_lists = true;
} }
register_clauses(s.m_clauses); register_clauses(s.m_clauses);
if (!learned && (m_elim_blocked_clauses || m_elim_blocked_clauses_at == m_num_calls)) if (!learned && (m_elim_blocked_clauses || m_elim_blocked_clauses_at == m_num_calls))
elim_blocked_clauses(); elim_blocked_clauses();
@ -184,7 +183,9 @@ namespace sat {
m_sub_counter = m_subsumption_limit; m_sub_counter = m_subsumption_limit;
m_elim_counter = m_res_limit; m_elim_counter = m_res_limit;
unsigned old_num_elim_vars = m_num_elim_vars; m_old_num_elim_vars = m_num_elim_vars;
scoped_finalize _scoped_finalize(*this);
do { do {
if (m_subsumption) if (m_subsumption)
@ -199,20 +200,22 @@ namespace sat {
break; break;
} }
while (!m_sub_todo.empty()); while (!m_sub_todo.empty());
}
bool vars_eliminated = m_num_elim_vars > old_num_elim_vars; void simplifier::scoped_finalize_fn() {
bool vars_eliminated = m_num_elim_vars > m_old_num_elim_vars;
if (m_need_cleanup) { if (m_need_cleanup) {
TRACE("after_simplifier", tout << "cleanning watches...\n";); TRACE("after_simplifier", tout << "cleanning watches...\n";);
cleanup_watches(); cleanup_watches();
cleanup_clauses(s.m_learned, true, vars_eliminated, learned_in_use_lists); cleanup_clauses(s.m_learned, true, vars_eliminated, m_learned_in_use_lists);
cleanup_clauses(s.m_clauses, false, vars_eliminated, true); cleanup_clauses(s.m_clauses, false, vars_eliminated, true);
} }
else { else {
TRACE("after_simplifier", tout << "skipping cleanup...\n";); TRACE("after_simplifier", tout << "skipping cleanup...\n";);
if (vars_eliminated) { if (vars_eliminated) {
// must remove learned clauses with eliminated variables // must remove learned clauses with eliminated variables
cleanup_clauses(s.m_learned, true, true, learned_in_use_lists); cleanup_clauses(s.m_learned, true, true, m_learned_in_use_lists);
} }
} }
CASSERT("sat_solver", s.check_invariant()); CASSERT("sat_solver", s.check_invariant());

11
src/sat/sat_simplifier.h
View file

@ -91,6 +91,9 @@ namespace sat {
unsigned m_num_sub_res; unsigned m_num_sub_res;
unsigned m_num_elim_lits; unsigned m_num_elim_lits;
bool m_learned_in_use_lists;
unsigned m_old_num_elim_vars;
struct size_lt { struct size_lt {
bool operator()(clause const * c1, clause const * c2) const { return c1->size() > c2->size(); } bool operator()(clause const * c1, clause const * c2) const { return c1->size() > c2->size(); }
}; };
@ -170,6 +173,14 @@ namespace sat {
struct subsumption_report; struct subsumption_report;
struct elim_var_report; struct elim_var_report;
class scoped_finalize {
simplifier& s;
public:
scoped_finalize(simplifier& s) : s(s) {}
~scoped_finalize() { s.scoped_finalize_fn(); }
};
void scoped_finalize_fn();
public: public:
simplifier(solver & s, params_ref const & p); simplifier(solver & s, params_ref const & p);
~simplifier(); ~simplifier();