mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-01 13:39:28 +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 8a30a2caa9
commit 39ea6234a4
3 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,12 @@ void sls_engine::updt_params(params_ref const & _p) {
m_restart_base = p.restart_base();
m_restart_next = m_restart_base;
m_restart_init = p.restart_init();
// Andreas: Would cause trouble because repick requires an assertion being picked before which is not the case in GSAT.
if (m_walksat_repick && !m_walksat)
NOT_IMPLEMENTED_YET();
if (m_vns_repick && !m_walksat)
NOT_IMPLEMENTED_YET();
}
void sls_engine::checkpoint() {
@ -435,19 +441,25 @@ lbool sls_engine::search() {
if (m_vns_mc && (new_const == static_cast<unsigned>(-1)))
score = find_best_move_mc(to_evaluate, score, new_const, new_value);
/*if (m_vns_repick && (new_const == static_cast<unsigned>(-1)))
if (m_vns_repick && (new_const == static_cast<unsigned>(-1)))
{
expr * q = m_tracker.get_new_unsat_assertion(m_assertions, e);
expr * q = m_tracker.get_new_unsat_assertion(m_assertions);
if (q)
{
ptr_vector<func_decl> & to_evaluate2 = m_tracker.get_unsat_constants_walksat(e);
ptr_vector<func_decl> & to_evaluate2 = m_tracker.get_unsat_constants_walksat(q);
score = find_best_move(to_evaluate2, score, new_const, new_value, new_bit, move);
if (new_const != static_cast<unsigned>(-1)) {
func_decl * fd = to_evaluate2[new_const];
score = serious_score(fd, new_value);
continue;
}
}
}*/
}
if (new_const == static_cast<unsigned>(-1)) {
score = old_score;
if (m_walksat && m_walksat_repick)
if (m_walksat_repick)
m_evaluator.randomize_local(m_assertions);
else
m_evaluator.randomize_local(to_evaluate);