mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

fixes to lookahead

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-06-08 17:25:06 -07:00
parent 964102726d
commit c870b77366
11 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/sat/sat_lookahead.cpp
View file

@ -151,7 +151,7 @@ namespace sat {
}
if (m_num_tc1 < m_config.m_tc1_limit) {
++m_num_tc1;
IF_VERBOSE(3, verbose_stream() << "tc1: " << u << " " << w << "\n";);
IF_VERBOSE(30, verbose_stream() << "tc1: " << u << " " << w << "\n";);
add_binary(u, w);
}
}
@ -285,9 +285,11 @@ namespace sat {
for (bool_var const* it = m_freevars.begin(), * end = m_freevars.end(); it != end; ++it) {
SASSERT(is_undef(*it));
bool_var x = *it;
if (!m_select_lookahead_vars.empty() && m_select_lookahead_vars.contains(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
sum += m_rating[x];
if (!m_select_lookahead_vars.empty()) {
if (m_select_lookahead_vars.contains(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
sum += m_rating[x];
}
}
else if (newbies || active_prefix(x)) {
m_candidates.push_back(candidate(x, m_rating[x]));
@ -1214,7 +1216,7 @@ namespace sat {
continue;
}
if (scope_lvl() == 1) {
IF_VERBOSE(3, verbose_stream() << scope_lvl() << " " << lit << " binary: " << m_binary_trail.size() << " trail: " << m_trail_lim.back() << "\n";);
IF_VERBOSE(30, verbose_stream() << scope_lvl() << " " << lit << " binary: " << m_binary_trail.size() << " trail: " << m_trail_lim.back() << "\n";);
}
TRACE("sat", tout << "lookahead: " << lit << " @ " << m_lookahead[i].m_offset << "\n";);
reset_wnb(lit);
@ -1602,12 +1604,13 @@ namespace sat {
literal lookahead::select_lookahead(bool_var_vector const& vars) {
IF_VERBOSE(1, verbose_stream() << "(sat-select " << vars.size() << ")\n";);
scoped_ext _sext(*this);
m_search_mode = lookahead_mode::searching;
scoped_level _sl(*this, c_fixed_truth);
init();
if (inconsistent()) return null_literal;
inc_istamp();
inc_istamp();
for (auto v : vars) {
m_select_lookahead_vars.insert(v);
}

8
src/sat/sat_solver/inc_sat_solver.cpp
View file

@ -281,8 +281,10 @@ public:
}
virtual expr_ref lookahead(expr_ref_vector const& candidates) {
IF_VERBOSE(1, verbose_stream() << "(sat-lookahead " << candidates.size() << ")\n";);
sat::bool_var_vector vars;
expr_ref_vector lit2expr(m);
lit2expr.resize(m_solver.num_vars() * 2);
m_map.mk_inv(lit2expr);
for (auto c : candidates) {
sat::bool_var v = m_map.to_bool_var(c);
@ -290,17 +292,21 @@ public:
vars.push_back(v);
}
}
IF_VERBOSE(1, verbose_stream() << "vars: " << vars.size() << "\n";);
if (vars.empty()) {
return expr_ref(m.mk_true(), m);
}
sat::literal l = m_solver.select_lookahead(vars);
if (m_solver.inconsistent()) {
IF_VERBOSE(1, verbose_stream() << "(sat-lookahead inconsistent)\n";);
return expr_ref(m.mk_false(), m);
}
if (l == sat::null_literal) {
return expr_ref(m.mk_true(), m);
}
return expr_ref(lit2expr[l.index()].get(), m);
expr_ref result(lit2expr[l.index()].get(), m);
IF_VERBOSE(1, verbose_stream() << "solution: " << l << " " << result << "\n";);
return result;
}
virtual void get_lemmas(expr_ref_vector & lemmas) {
IF_VERBOSE(1, verbose_stream() << "(sat-get-lemmas " << lemmas.size() << ")\n";);