mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 00:48:45 +00:00
Code Activity

fix nlsat regression

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-12-15 06:54:02 -08:00
parent 397cdfc608
commit 21f685fa5a
2 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/nlsat/nlsat_solver.cpp
View file

@ -732,19 +732,19 @@ namespace nlsat {
} }
void undo_set_updt(interval_set * old_set) { void undo_set_updt(interval_set * old_set) {
if (m_xk == null_var) return; if (m_xk == null_var) return;
var x = m_xk; var x = m_xk;
if (x < m_infeasible.size()) { if (x < m_infeasible.size()) {
m_ism.dec_ref(m_infeasible[x]); m_ism.dec_ref(m_infeasible[x]);
m_infeasible[x] = old_set; m_infeasible[x] = old_set;
} }
} }
void undo_new_stage() { void undo_new_stage() {
if (m_xk == 0 || m_xk == null_var) { if (m_xk == 0) {
m_xk = null_var; m_xk = null_var;
} }
else { else if (m_xk != null_var) {
m_xk--; m_xk--;
m_assignment.reset(m_xk); m_assignment.reset(m_xk);
} }
@ -757,7 +757,7 @@ namespace nlsat {
} }
void undo_updt_eq(atom * a) { void undo_updt_eq(atom * a) {
if (m_var2eq.size() > m_xk) if (m_var2eq.size() > m_xk)
m_var2eq[m_xk] = a; m_var2eq[m_xk] = a;
} }
@ -1241,50 +1241,47 @@ namespace nlsat {
while (true) { while (true) {
r = search(); r = search();
if (r != l_true) break; if (r != l_true) break;
random_gen r(++m_random_seed); vector<rational> lows;
unsigned start = r(num_vars()); vector<var> vars;
for (var y = 0; y < num_vars(); y++) {
var x = (y + start) % num_vars();
if (m_is_int[x] && m_assignment.is_assigned(x) && !m_am.is_int(m_assignment.value(x))) {
scoped_anum v(m_am), vlo(m_am), vhi(m_am);
rational lo, hi;
bool is_even = false;
v = m_assignment.value(x);
init_search();
m_am.int_lt(v, vlo);
m_am.int_gt(v, vhi);
if (!m_am.is_int(vlo)) break;
if (!m_am.is_int(vhi)) break;
m_am.to_rational(vlo, lo);
m_am.to_rational(vhi, hi);
for (var x = 0; x < num_vars(); x++) {
if (m_is_int[x] && m_assignment.is_assigned(x) && !m_am.is_int(m_assignment.value(x))) {
scoped_anum v(m_am), vlo(m_am);
v = m_assignment.value(x);
rational lo;
m_am.int_lt(v, vlo);
if (!m_am.is_int(vlo)) continue;
// derive tight bounds. // derive tight bounds.
while (true) { while (true) {
lo++; lo++;
if (!m_am.gt(v, lo.to_mpq())) { lo--; break; } if (!m_am.gt(v, lo.to_mpq())) { lo--; break; }
} }
while (true) { lows.push_back(lo);
hi--; vars.push_back(x);
if (!m_am.lt(v, hi.to_mpq())) { hi++; break; } }
} }
if (lows.empty()) break;
polynomial_ref p(m_pm); init_search();
rational one(1); for (unsigned i = 0; i < lows.size(); ++i) {
m_lemma.reset(); rational lo = lows[i];
p = m_pm.mk_linear(1, &one, &x, -lo); rational hi = lo + rational::one();
poly* p1 = p.get(); var x = vars[i];
m_lemma.push_back(~mk_ineq_literal(atom::GT, 1, &p1, &is_even)); bool is_even = false;
p = m_pm.mk_linear(1, &one, &x, -hi); polynomial_ref p(m_pm);
poly* p2 = p.get(); rational one(1);
m_lemma.push_back(~mk_ineq_literal(atom::LT, 1, &p2, &is_even)); m_lemma.reset();
p = m_pm.mk_linear(1, &one, &x, -lo);
poly* p1 = p.get();
m_lemma.push_back(~mk_ineq_literal(atom::GT, 1, &p1, &is_even));
p = m_pm.mk_linear(1, &one, &x, -hi);
poly* p2 = p.get();
m_lemma.push_back(~mk_ineq_literal(atom::LT, 1, &p2, &is_even));
// perform branch and bound // perform branch and bound
clause * cls = mk_clause(m_lemma.size(), m_lemma.c_ptr(), false, 0); clause * cls = mk_clause(m_lemma.size(), m_lemma.c_ptr(), false, 0);
if (cls) { if (cls) {
TRACE("nlsat", display(tout << "conflict " << lo << " " << hi, *cls); tout << "\n";); TRACE("nlsat", display(tout << "conflict " << lo << " " << hi, *cls); tout << "\n";);
}
r = l_undef;
break;
} }
} }
} }

2
src/tactic/smtlogics/qfnia_tactic.cpp
View file

@ -98,7 +98,7 @@ static tactic * mk_qfnia_nlsat_solver(ast_manager & m, params_ref const & p) {
return and_then(using_params(mk_simplify_tactic(m), simp_p), return and_then(using_params(mk_simplify_tactic(m), simp_p),
try_for(mk_qfnra_nlsat_tactic(m, simp_p), 10000), try_for(mk_qfnra_nlsat_tactic(m, simp_p), 3000),
mk_fail_if_undecided_tactic()); mk_fail_if_undecided_tactic());
} }