3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-12 20:04:08 +00:00

fix build warnings and scoop up after Nuno's leaks

This commit is contained in:
Nikolaj Bjorner 2026-02-10 09:25:37 -08:00
parent bcca975d2d
commit a7b9df14f4
6 changed files with 14 additions and 12 deletions

View file

@ -72,7 +72,7 @@ namespace sat {
double m_reward = 0;
double m_last_reward = 0;
unsigned m_make_count = 0;
unsigned m_timestamp = 0;
uint64_t m_timestamp = 0;
int m_bias = 0;
ema m_reward_avg = 1e-5;
};
@ -282,7 +282,7 @@ namespace sat {
inline int& bias(bool_var v) { return m_vars[v].m_bias; }
unsigned timestamp(bool_var v) { return m_vars[v].m_timestamp; }
uint64_t timestamp(bool_var v) { return m_vars[v].m_timestamp; }
void reserve_vars(unsigned n);

View file

@ -86,7 +86,7 @@ namespace sls {
virtual void force_restart() = 0;
virtual std::ostream& display(std::ostream& out) = 0;
virtual reslimit& rlimit() = 0;
virtual unsigned timestamp(sat::bool_var v) = 0;
virtual uint64_t timestamp(sat::bool_var v) = 0;
};
class context {
@ -196,7 +196,7 @@ namespace sls {
void shift_weights() { s.shift_weights(); }
bool try_rotate(sat::bool_var v, sat::bool_var_set& rotated, unsigned& budget) { return s.try_rotate(v, rotated, budget); }
double reward(sat::bool_var v) { return s.reward(v); }
unsigned timestamp(sat::bool_var v) { return s.timestamp(v); }
uint64_t timestamp(sat::bool_var v) { return s.timestamp(v); }
indexed_uint_set const& unsat() const { return s.unsat(); }
indexed_uint_set const& unsat_vars() const { return s.unsat_vars(); }
unsigned num_external_in_unsat_vars() const { return s.num_external_in_unsat_vars(); }

View file

@ -186,6 +186,6 @@ namespace sls {
m_new_clause_added = true;
}
void force_restart() override { m_ddfw->force_restart(); }
unsigned timestamp(sat::bool_var v) override { return m_ddfw->timestamp(v); }
uint64_t timestamp(sat::bool_var v) override { return m_ddfw->timestamp(v); }
};
}

View file

@ -102,7 +102,7 @@ namespace sls {
void add_input_assertion(expr* f) { m_context.add_input_assertion(f); }
reslimit& rlimit() override { return m_ddfw.rlimit(); }
void shift_weights() override { m_ddfw.shift_weights(); }
unsigned timestamp(sat::bool_var v) override { return m_ddfw.timestamp(v); }
uint64_t timestamp(sat::bool_var v) override { return m_ddfw.timestamp(v); }
void force_restart() override { m_ddfw.force_restart(); }