mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-23 20:58:54 +00:00
Code Activity

fix #1908

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-10-30 14:15:29 -05:00
parent 5d06fa2347
commit 3c1c3d5987
12 changed files with 103 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/sat/sat_local_search.cpp
View file

@ -553,6 +553,7 @@ namespace sat {
PROGRESS(tries, total_flips);
for (tries = 1; !m_unsat_stack.empty() && m_limit.inc(); ++tries) {
++m_stats.m_num_restarts;
for (step = 0; step < m_max_steps && !m_unsat_stack.empty(); ++step) {
pick_flip_walksat();
if (m_unsat_stack.size() < m_best_unsat) {
@ -622,7 +623,6 @@ namespace sat {
break;
}
// remove unit clauses from assumptions.
m_constraints.shrink(num_constraints() - sz);
@ -779,8 +779,11 @@ namespace sat {
}
void local_search::flip_walksat(bool_var flipvar) {
++m_stats.m_num_flips;
VERIFY(!is_unit(flipvar));
m_vars[flipvar].m_value = !cur_solution(flipvar);
m_vars[flipvar].m_flips++;
m_vars[flipvar].m_slow_break.update(abs(m_vars[flipvar].m_slack_score));
bool flip_is_true = cur_solution(flipvar);
coeff_vector const& truep = m_vars[flipvar].m_watch[flip_is_true];
@ -1062,6 +1065,19 @@ namespace sat {
return out << "v" << v << " := " << (vi.m_value?"true":"false") << " bias: " << vi.m_bias << "\n";
}
void local_search::collect_statistics(statistics& st) const {
if (m_config.dbg_flips()) {
unsigned i = 0;
for (var_info const& vi : m_vars) {
IF_VERBOSE(0, verbose_stream() << "flips: " << i << " " << vi.m_flips << " " << vi.m_slow_break << "\n");
++i;
}
}
st.update("local-search-flips", m_stats.m_num_flips);
st.update("local-search-restarts", m_stats.m_num_restarts);
}
bool local_search::check_goodvar() {
unsigned g = 0;
for (unsigned v = 0; v < num_vars(); ++v) {