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

Fixed bug with VNS repick.

Browse source
This commit is contained in:
Andreas Froehlich 2014-04-22 01:07:30 +01:00 • committed by Christoph M. Wintersteiger
parent de028e7a30
commit fb18547a5f
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tactic/sls/sls_tracker.h
View file

@ -76,7 +76,7 @@ private:
ptr_vector<func_decl> m_constants;
ptr_vector<func_decl> m_temp_constants;
occ_type m_constants_occ;
unsigned m_last_pos;
unsigned m_walksat;
unsigned m_ucb;
double m_ucb_constant;
@ -1082,6 +1082,7 @@ public:
return 0;
}
m_last_pos = pos;
return as[pos];
#if _REAL_RS_
//unsigned pos = m_false_list[get_random_uint(16) % m_cnt_false];
@ -1093,7 +1094,7 @@ public:
#endif
}
expr * get_new_unsat_assertion(ptr_vector<expr> const & as, expr * e) {
expr * get_new_unsat_assertion(ptr_vector<expr> const & as) {
unsigned sz = as.size();
if (sz == 1)
return 0;
@ -1101,7 +1102,7 @@ public:
unsigned cnt_unsat = 0, pos = -1;
for (unsigned i = 0; i < sz; i++)
if (m_mpz_manager.neq(get_value(as[i]), m_one) && (get_random_uint(16) % ++cnt_unsat == 0) && (as[i] != e)) pos = i;
if ((i != m_last_pos) && m_mpz_manager.neq(get_value(as[i]), m_one) && (get_random_uint(16) % ++cnt_unsat == 0)) pos = i;
if (pos == static_cast<unsigned>(-1))
return 0;