mirror of
https://github.com/Z3Prover/z3
synced 2025-04-29 11:55:51 +00:00
revert relevancy2
This commit is contained in:
parent
76e8e57204
commit
fcee2f5aa5
4 changed files with 4 additions and 49 deletions
|
@ -89,7 +89,7 @@ namespace euf {
|
|||
m_dual_solver->track_relevancy(v);
|
||||
}
|
||||
|
||||
bool solver::init_relevancy1() {
|
||||
bool solver::init_relevancy() {
|
||||
m_relevant_expr_ids.reset();
|
||||
if (!relevancy_enabled())
|
||||
return true;
|
||||
|
@ -113,51 +113,6 @@ namespace euf {
|
|||
m_relevant_todo.push_back(e);
|
||||
}
|
||||
|
||||
|
||||
bool solver::init_relevancy2() {
|
||||
m_relevant_expr_ids.reset();
|
||||
if (!relevancy_enabled())
|
||||
return true;
|
||||
init_relevant_expr_ids();
|
||||
for (unsigned i = 0; i < s().trail_size(); ++i) {
|
||||
sat::literal l = s().trail_literal(i);
|
||||
auto v = l.var();
|
||||
auto j = s().get_justification(v);
|
||||
switch (j.get_kind()) {
|
||||
case sat::justification::kind::BINARY:
|
||||
case sat::justification::kind::TERNARY:
|
||||
case sat::justification::kind::CLAUSE:
|
||||
case sat::justification::kind::EXT_JUSTIFICATION:
|
||||
push_relevant(l.var());
|
||||
break;
|
||||
case sat::justification::kind::NONE:
|
||||
for (auto const& w : s().get_wlist(~l)) {
|
||||
if (w.is_binary_non_learned_clause()) {
|
||||
if (is_propagated(w.get_literal()))
|
||||
continue;
|
||||
}
|
||||
else if (w.is_binary_clause())
|
||||
continue;
|
||||
else if (w.is_ternary_clause()) {
|
||||
if (is_propagated(w.get_literal1()))
|
||||
continue;
|
||||
if (is_propagated(w.get_literal2()))
|
||||
continue;
|
||||
}
|
||||
else if (w.is_clause()) {
|
||||
if (is_propagated(w.get_blocked_literal()))
|
||||
continue;
|
||||
}
|
||||
push_relevant(l.var());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
relevant_subterms();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool solver::is_propagated(sat::literal lit) {
|
||||
return s().value(lit) == l_true && !s().get_justification(lit.var()).is_none();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue