mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-25 21:57:00 +00:00
Code Activity

sls: fix bug where unsat remains empty after a literal is flipped. The new satisfiable subset should be checked

Browse source 
refined interface between solvers to expose fixed variables for tabu objectives
This commit is contained in:
Nikolaj Bjorner 2024-12-01 18:35:56 -08:00
parent 24c3cd38d1
commit e6feb8423a
8 changed files with 118 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/ast/sls/sls_arith_base.cpp
View file

@ -1968,6 +1968,7 @@ namespace sls {
template<typename num_t>
bool arith_base<num_t>::set_value(expr* e, expr* v) {
if (!a.is_int_real(e))
return false;
var_t w = m_expr2var.get(e->get_id(), UINT_MAX);
@ -1984,7 +1985,14 @@ namespace sls {
}
if (n == value(w))
return true;
return update(w, n);
bool r = update(w, n);
if (!r) {
IF_VERBOSE(2,
verbose_stream() << "set value failed " << mk_pp(e, m) << " := " << mk_pp(v, m) << "\n";
display(verbose_stream(), w) << " := " << value(w) << "\n");
}
return r;
}
template<typename num_t>
@ -1996,6 +2004,23 @@ namespace sls {
return expr_ref(a.mk_numeral(m_vars[v].value().to_rational(), a.is_int(e)), m);
}
template<typename num_t>
bool arith_base<num_t>::is_fixed(expr* e, expr_ref& value) {
if (!a.is_int_real(e))
return false;
num_t n;
if (is_num(e, n)) {
value = expr_ref(a.mk_numeral(n.to_rational(), a.is_int(e)), m);
return true;
}
auto v = mk_term(e);
if (is_fixed(v)) {
value = expr_ref(a.mk_numeral(m_vars[v].value().to_rational(), a.is_int(e)), m);
return true;
}
return false;
}
template<typename num_t>
bool arith_base<num_t>::is_sat() {
invariant();