mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 20:05:51 +00:00
Code Activity

change gc strategy for user-push/pop

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-01-18 16:55:29 -08:00
parent b87405cc92
commit 990aecceb7
7 changed files with 9 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/sat/smt/euf_solver.cpp
View file

@ -464,10 +464,13 @@ namespace euf {
e->pop(n);
si.pop(n);
m_egraph.pop(n);
scope const & s = m_scopes[m_scopes.size() - n];
for (unsigned i = m_var_trail.size(); i-- > s.m_var_lim; )
m_bool_var2expr[m_var_trail[i]] = nullptr;
m_var_trail.shrink(s.m_var_lim);
scope const & sc = m_scopes[m_scopes.size() - n];
for (unsigned i = m_var_trail.size(); i-- > sc.m_var_lim; ) {
bool_var v = m_var_trail[i];
m_bool_var2expr[v] = nullptr;
s().set_non_external(v);
}
m_var_trail.shrink(sc.m_var_lim);
m_scopes.shrink(m_scopes.size() - n);
SASSERT(m_egraph.num_scopes() == m_scopes.size());
TRACE("euf_verbose", display(tout << "pop to: " << m_scopes.size() << "\n"););
@ -476,7 +479,7 @@ namespace euf {
void solver::user_push() {
push();
if (m_dual_solver)
m_dual_solver->push();
m_dual_solver->push();
}
void solver::user_pop(unsigned n) {
@ -725,20 +728,7 @@ namespace euf {
return false;
return true;
}
unsigned solver::max_var(unsigned w) const {
for (auto* e : m_solvers)
w = e->max_var(w);
for (unsigned sz = m_bool_var2expr.size(); sz > w && sz-- > 0; ) {
expr* n = m_bool_var2expr[sz];
if (n && m.is_bool(n)) {
w = std::max(w, sz);
break;
}
}
return w;
}
double solver::get_reward(literal l, ext_constraint_idx idx, sat::literal_occs_fun& occs) const {
auto* ext = sat::constraint_base::to_extension(idx);
SASSERT(ext);