mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-22 00:07:36 +00:00
Code Activity

create separate file for expression based lookahead solver

Browse source
This commit is contained in:
Nikolaj Bjorner 2025-01-25 11:19:40 -08:00
parent f6e7dcff47
commit d805322dfb
7 changed files with 896 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ast/sls/sls_arith_clausal.cpp
View file

@ -91,7 +91,7 @@ namespace sls {
var_t v = null_arith_var;
{
a.m_best_score = 1;
m_best_score = 1;
flet<bool> _use_tabu(a.m_use_tabu, true);
if (v == null_arith_var) {
add_lookahead_on_unsat_vars();
@ -109,7 +109,7 @@ namespace sls {
ctx.shift_weights();
if (v == null_arith_var) {
a.m_best_score = -1;
m_best_score = -1;
flet<bool> _use_tabu(a.m_use_tabu, false);
add_lookahead_on_unsat_vars();
v = random_move_on_updates();
@ -245,13 +245,13 @@ namespace sls {
num_t abs_value = abs(vi.value() + delta);
unsigned last_step = vi.last_step(delta);
++m_num_lookaheads;
if (score < a.m_best_score)
if (score < m_best_score)
return;
if (score > a.m_best_score ||
if (score > m_best_score ||
(m_best_abs_value == -1) ||
(abs_value < m_best_abs_value) ||
(abs_value == m_best_abs_value && last_step < m_best_last_step)) {
a.m_best_score = score;
m_best_score = score;
m_best_var = v;
m_best_delta = delta;
m_best_last_step = last_step;
@ -357,7 +357,6 @@ namespace sls {
template<typename num_t>
void arith_clausal<num_t>::initialize() {
a.initialize_bool_assignment();
for (sat::bool_var v = 0; v < ctx.num_bool_vars(); ++v)
a.init_bool_var_assignment(v);