mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +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

3
src/sat/sat_config.cpp
View file

@ -61,9 +61,10 @@ namespace sat {
else if (s == symbol("random"))
m_phase = PS_RANDOM;
else
throw sat_param_exception("invalid phase selection strategy");
throw sat_param_exception("invalid phase selection strategy: always_false, always_true, basic_caching, caching, random");
m_rephase_base = p.rephase_base();
m_reorder_base = p.reorder_base();
m_search_sat_conflicts = p.search_sat_conflicts();
m_search_unsat_conflicts = p.search_unsat_conflicts();
m_phase_sticky = p.phase_sticky();

1
src/sat/sat_config.h
View file

@ -91,6 +91,7 @@ namespace sat {
unsigned m_search_unsat_conflicts;
bool m_phase_sticky;
unsigned m_rephase_base;
unsigned m_reorder_base;
bool m_propagate_prefetch;
restart_strategy m_restart;
bool m_restart_fast;

1
src/sat/sat_params.pyg
View file

@ -7,6 +7,7 @@ def_module_params('sat',
('search.unsat.conflicts', UINT, 400, 'period for solving for unsat (in number of conflicts)'),
('search.sat.conflicts', UINT, 400, 'period for solving for sat (in number of conflicts)'),
('rephase.base', UINT, 1000, 'number of conflicts per rephase '),
('reorder.base', UINT, UINT_MAX, 'number of conflicts per random reorder '),
('propagate.prefetch', BOOL, True, 'prefetch watch lists for assigned literals'),
('restart', SYMBOL, 'ema', 'restart strategy: static, luby, ema or geometric'),
('restart.initial', UINT, 2, 'initial restart (number of conflicts)'),

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()) {

4
src/sat/sat_solver.h
View file

@ -146,6 +146,8 @@ namespace sat {
unsigned m_best_phase_size;
unsigned m_rephase_lim;
unsigned m_rephase_inc;
unsigned m_reorder_lim;
unsigned m_reorder_inc;
var_queue m_case_split_queue;
unsigned m_qhead;
unsigned m_scope_lvl;
@ -562,6 +564,8 @@ namespace sat {
bool is_two_phase() const;
bool should_rephase();
void do_rephase();
bool should_reorder();
void do_reorder();
svector<char> m_diff_levels;
unsigned num_diff_levels(unsigned num, literal const * lits);
bool num_diff_levels_below(unsigned num, literal const* lits, unsigned max_glue, unsigned& glue);