mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

bvsls refactoring

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2014-03-28 14:58:59 +00:00
parent 1b98e6002b
commit ad412d4f08
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tactic/sls/sls_engine.cpp
View file

@ -1069,6 +1069,16 @@ bailout:
} }
#endif #endif
void sls_engine::init_tracker() {
#if _WEIGHT_DIST_ == 4
m_tracker.set_weight_dist_factor(m_stats.m_stopwatch.get_current_seconds() / _TIMELIMIT_);
#endif
#if _WEIGHT_TOGGLE_
m_tracker.set_weight_dist_factor(_WEIGHT_DIST_FACTOR_);
#endif
m_tracker.initialize(m_assertions);
}
void sls_engine::operator()(goal_ref const & g, model_converter_ref & mc) { void sls_engine::operator()(goal_ref const & g, model_converter_ref & mc) {
if (g->inconsistent()) { if (g->inconsistent()) {
mc = 0; mc = 0;
@ -1078,8 +1088,7 @@ void sls_engine::operator()(goal_ref const & g, model_converter_ref & mc) {
m_produce_models = g->models_enabled(); m_produce_models = g->models_enabled();
for (unsigned i = 0; i < g->size(); i++) for (unsigned i = 0; i < g->size(); i++)
assert_expr(g->form(i)); assert_expr(g->form(i));
verbose_stream() << "_BFS_ " << _BFS_ << std::endl; verbose_stream() << "_BFS_ " << _BFS_ << std::endl;
verbose_stream() << "_FOCUS_ " << _FOCUS_ << std::endl; verbose_stream() << "_FOCUS_ " << _FOCUS_ << std::endl;
@ -1118,13 +1127,7 @@ void sls_engine::operator()(goal_ref const & g, model_converter_ref & mc) {
verbose_stream() << "_EARLY_PRUNE_ " << _EARLY_PRUNE_ << std::endl; verbose_stream() << "_EARLY_PRUNE_ " << _EARLY_PRUNE_ << std::endl;
verbose_stream() << "_CACHE_TOP_SCORE_ " << _CACHE_TOP_SCORE_ << std::endl; verbose_stream() << "_CACHE_TOP_SCORE_ " << _CACHE_TOP_SCORE_ << std::endl;
#if _WEIGHT_DIST_ == 4 init_tracker();
m_tracker.set_weight_dist_factor(m_stats.m_stopwatch.get_current_seconds() / _TIMELIMIT_);
#endif
#if _WEIGHT_TOGGLE_
m_tracker.set_weight_dist_factor(_WEIGHT_DIST_FACTOR_);
#endif
m_tracker.initialize(m_assertions);
lbool res = l_undef; lbool res = l_undef;
m_restart_limit = _RESTART_LIMIT_; m_restart_limit = _RESTART_LIMIT_;

2
src/tactic/sls/sls_engine.h
View file

@ -109,6 +109,8 @@ public:
void mk_inv(unsigned bv_sz, const mpz & old_value, mpz & inverted); void mk_inv(unsigned bv_sz, const mpz & old_value, mpz & inverted);
void mk_flip(sort * s, const mpz & old_value, unsigned bit, mpz & flipped); void mk_flip(sort * s, const mpz & old_value, unsigned bit, mpz & flipped);
void init_tracker(void);
lbool search(void); lbool search(void);
void operator()(goal_ref const & g, model_converter_ref & mc); void operator()(goal_ref const & g, model_converter_ref & mc);