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

Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2014-04-25 22:03:49 +01:00
parent da4a2d6426 39b562da44
commit 0915e6fcd7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -595,7 +595,7 @@ lbool sls_engine::operator()() {
} }
/* Andreas: Needed for Armin's restart scheme if we don't want to use loops. /* Andreas: Needed for Armin's restart scheme if we don't want to use loops.
inline double sls_engine::get_restart_armin(unsigned cnt_restarts) double sls_engine::get_restart_armin(unsigned cnt_restarts)
{ {
unsigned outer_id = (unsigned)(0.5 + sqrt(0.25 + 2 * cnt_restarts)); unsigned outer_id = (unsigned)(0.5 + sqrt(0.25 + 2 * cnt_restarts));
unsigned inner_id = cnt_restarts - (outer_id - 1) * outer_id / 2; unsigned inner_id = cnt_restarts - (outer_id - 1) * outer_id / 2;
@ -603,7 +603,7 @@ inline double sls_engine::get_restart_armin(unsigned cnt_restarts)
} }
*/ */
inline unsigned sls_engine::check_restart(unsigned curr_value) unsigned sls_engine::check_restart(unsigned curr_value)
{ {
if (curr_value > m_restart_next) if (curr_value > m_restart_next)
{ {