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

na

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-07-05 14:40:20 +07:00
parent 6bbe8e2619
commit cd93cdd819
7 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/sat/sat_solver.cpp
View file

@ -1230,6 +1230,7 @@ namespace sat {
else if (do_cleanup(false)) continue;
else if (should_gc()) do_gc();
else if (should_rephase()) do_rephase();
else if (should_reorder()) do_reorder();
else if (should_restart()) do_restart(!m_config.m_restart_fast);
else if (should_simplify()) do_simplify();
else if (!decide()) is_sat = final_check();
@ -1806,6 +1807,8 @@ namespace sat {
m_best_phase_size = 0;
m_rephase_lim = 0;
m_rephase_inc = 0;
m_reorder_lim = 0;
m_reorder_inc = 0;
m_conflicts_since_restart = 0;
m_force_conflict_analysis = false;
m_restart_threshold = m_config.m_restart_initial;
@ -3146,6 +3149,25 @@ namespace sat {
m_rephase_lim += m_rephase_inc;
}
bool solver::should_reorder() {
return m_conflicts_since_init > m_reorder_lim;
}
void solver::do_reorder() {
IF_VERBOSE(1, verbose_stream() << "(reorder)\n");
m_activity_inc = 128;
svector<bool_var> vars;
for (bool_var v = num_vars(); v-- > 0; ) {
vars.push_back(v);
}
shuffle(vars.size(), vars.c_ptr(), m_rand);
for (bool_var v : vars) {
update_activity(v, m_rand(10));
}
m_reorder_inc += m_config.m_reorder_base;
m_reorder_lim += m_reorder_inc;
}
void solver::updt_phase_counters() {
m_phase_counter++;
if (should_toggle_search_state()) {