mirror of
https://github.com/Z3Prover/z3
synced 2025-04-15 13:28:47 +00:00
fixup parameter handling for enabling bv-lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
05f166f736
commit
710f757495
|
@ -52,6 +52,8 @@ namespace sls {
|
||||||
|
|
||||||
void bv_lookahead::search() {
|
void bv_lookahead::search() {
|
||||||
updt_params(ctx.get_params());
|
updt_params(ctx.get_params());
|
||||||
|
if (!m_config.use_lookahead_bv)
|
||||||
|
return;
|
||||||
initialize_bool_values();
|
initialize_bool_values();
|
||||||
rescore();
|
rescore();
|
||||||
m_config.max_moves = m_stats.m_moves + m_config.max_moves_base;
|
m_config.max_moves = m_stats.m_moves + m_config.max_moves_base;
|
||||||
|
@ -263,7 +265,7 @@ namespace sls {
|
||||||
if (0x1 == (m_stats.m_restarts & 0x1))
|
if (0x1 == (m_stats.m_restarts & 0x1))
|
||||||
m_config.restart_next += m_config.restart_base;
|
m_config.restart_next += m_config.restart_base;
|
||||||
else
|
else
|
||||||
m_config.restart_next += (2 << (m_stats.m_restarts >> 1)) * m_config.restart_base;
|
m_config.restart_next += (2 * (m_stats.m_restarts >> 1)) * m_config.restart_base;
|
||||||
|
|
||||||
reset_uninterp_in_false_literals();
|
reset_uninterp_in_false_literals();
|
||||||
rescore();
|
rescore();
|
||||||
|
@ -328,6 +330,7 @@ namespace sls {
|
||||||
m_config.ucb_init = p.walksat_ucb_init();
|
m_config.ucb_init = p.walksat_ucb_init();
|
||||||
m_config.ucb_noise = p.walksat_ucb_noise();
|
m_config.ucb_noise = p.walksat_ucb_noise();
|
||||||
m_config.use_top_level_assertions = p.use_top_level_assertions_bv();
|
m_config.use_top_level_assertions = p.use_top_level_assertions_bv();
|
||||||
|
m_config.use_lookahead_bv = p.use_lookahead_bv();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -47,6 +47,7 @@ namespace sls {
|
||||||
bool ucb_init = false;
|
bool ucb_init = false;
|
||||||
double ucb_noise = 0.1;
|
double ucb_noise = 0.1;
|
||||||
bool use_top_level_assertions = true;
|
bool use_top_level_assertions = true;
|
||||||
|
bool use_lookahead_bv = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct stats {
|
struct stats {
|
||||||
|
|
Loading…
Reference in a new issue