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 #2238

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-05-08 10:15:57 +02:00
parent 3e059a3a3b
commit f79dccccfe
4 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/nlsat/nlsat_evaluator.cpp
View file

@ -384,7 +384,8 @@ namespace nlsat {
int eval_sign(poly * p) { int eval_sign(poly * p) {
// TODO: check if it is useful to cache results // TODO: check if it is useful to cache results
SASSERT(m_assignment.is_assigned(max_var(p))); SASSERT(m_assignment.is_assigned(max_var(p)));
return m_am.eval_sign_at(polynomial_ref(p, m_pm), m_assignment); int r = m_am.eval_sign_at(polynomial_ref(p, m_pm), m_assignment);
return r > 0 ? +1 : (r < 0 ? 0 : -1);
} }
bool satisfied(int sign, atom::kind k) { bool satisfied(int sign, atom::kind k) {

36
src/nlsat/nlsat_solver.cpp
View file

@ -920,7 +920,7 @@ namespace nlsat {
m_justifications[b] = j; m_justifications[b] = j;
save_assign_trail(b); save_assign_trail(b);
updt_eq(b); updt_eq(b);
TRACE("nlsat_assign", tout << "b" << b << " -> " << m_bvalues[b] << " " << m_atoms[b] << "\n";); TRACE("nlsat_assign", tout << "b" << b << " -> " << m_bvalues[b] << "\n";);
} }
/** /**
@ -936,20 +936,23 @@ namespace nlsat {
*/ */
lbool value(literal l) { lbool value(literal l) {
lbool val = assigned_value(l); lbool val = assigned_value(l);
TRACE("nlsat_verbose", display(tout << " assigned value " << val << " for ", l) << "\n";);
if (val != l_undef) { if (val != l_undef) {
TRACE("nlsat_verbose", display(tout << " assigned value " << val << " for ", l) << "\n";);
return val; return val;
} }
bool_var b = l.var(); bool_var b = l.var();
atom * a = m_atoms[b]; atom * a = m_atoms[b];
if (a == nullptr) { if (a == nullptr) {
TRACE("nlsat_verbose", display(tout << " no atom for ", l) << "\n";);
return l_undef; return l_undef;
} }
var max = a->max_var(); var max = a->max_var();
if (!m_assignment.is_assigned(max)) { if (!m_assignment.is_assigned(max)) {
TRACE("nlsat_verbose", display(tout << " maximal variable not assigned ", l) << "\n";);
return l_undef; return l_undef;
} }
val = to_lbool(m_evaluator.eval(a, l.sign())); val = to_lbool(m_evaluator.eval(a, l.sign()));
TRACE("nlsat_verbose", display(tout << " evaluated value " << val << " for ", l) << "\n";);
TRACE("value_bug", tout << "value of: "; display(tout, l); tout << " := " << val << "\n"; TRACE("value_bug", tout << "value of: "; display(tout, l); tout << " := " << val << "\n";
tout << "xk: " << m_xk << ", a->max_var(): " << a->max_var() << "\n"; tout << "xk: " << m_xk << ", a->max_var(): " << a->max_var() << "\n";
display_assignment(tout);); display_assignment(tout););
@ -1086,7 +1089,7 @@ namespace nlsat {
SASSERT(max_var(l) == m_xk); SASSERT(max_var(l) == m_xk);
bool_var b = l.var(); bool_var b = l.var();
atom * a = m_atoms[b]; atom * a = m_atoms[b];
SASSERT(a != 0); SASSERT(a != nullptr);
interval_set_ref curr_set(m_ism); interval_set_ref curr_set(m_ism);
TRACE("nlsat_inf_set", tout << "xk: " << m_xk << ", max_var(l): " << max_var(l) << ", l: "; display(tout, l); tout << "\n";); TRACE("nlsat_inf_set", tout << "xk: " << m_xk << ", max_var(l): " << max_var(l) << ", l: "; display(tout, l); tout << "\n";);
curr_set = m_evaluator.infeasible_intervals(a, l.sign()); curr_set = m_evaluator.infeasible_intervals(a, l.sign());
@ -1148,7 +1151,7 @@ namespace nlsat {
If satisfy_learned is true, then (arithmetic) learned clauses are satisfied even if m_lazy > 0 If satisfy_learned is true, then (arithmetic) learned clauses are satisfied even if m_lazy > 0
*/ */
bool process_clause(clause const & cls, bool satisfy_learned) { bool process_clause(clause const & cls, bool satisfy_learned) {
TRACE("nlsat", tout << "processing clause: "; display(tout, cls); tout << "\n";); TRACE("nlsat", display(tout << "processing clause: ", cls) << "sat: " << is_satisfied(cls) << "\n";);
if (is_satisfied(cls)) if (is_satisfied(cls))
return true; return true;
if (m_xk == null_var) if (m_xk == null_var)
@ -1175,7 +1178,7 @@ namespace nlsat {
*/ */
void peek_next_bool_var() { void peek_next_bool_var() {
while (m_bk < m_atoms.size()) { while (m_bk < m_atoms.size()) {
if (!m_dead[m_bk] && m_atoms[m_bk] == 0 && m_bvalues[m_bk] == l_undef) { if (!m_dead[m_bk] && m_atoms[m_bk] == nullptr && m_bvalues[m_bk] == l_undef) {
return; return;
} }
m_bk++; m_bk++;
@ -1235,11 +1238,19 @@ namespace nlsat {
if (m_bk == null_bool_var && m_xk >= num_vars()) { if (m_bk == null_bool_var && m_xk >= num_vars()) {
TRACE("nlsat", tout << "found model\n"; display_assignment(tout);); TRACE("nlsat", tout << "found model\n"; display_assignment(tout););
fix_patch(); fix_patch();
SASSERT(check_satisfied(m_clauses));
return l_true; // all variables were assigned, and all clauses were satisfied. return l_true; // all variables were assigned, and all clauses were satisfied.
} }
TRACE("nlsat", tout << "processing variable ";
if (m_xk != null_var) m_display_var(tout, m_xk); else tout << "boolean b" << m_bk; tout << "\n";);
while (true) { while (true) {
TRACE("nlsat", tout << "processing variable ";
if (m_xk != null_var) {
m_display_var(tout, m_xk); tout << " " << m_watches[m_xk].size();
}
else {
tout << m_bwatches[m_bk].size() << " boolean b" << m_bk;
}
tout << "\n";
);
checkpoint(); checkpoint();
clause * conflict_clause; clause * conflict_clause;
if (m_xk == null_var) if (m_xk == null_var)
@ -1856,7 +1867,7 @@ namespace nlsat {
clause const & c = *(cs[i]); clause const & c = *(cs[i]);
if (!is_satisfied(c)) { if (!is_satisfied(c)) {
TRACE("nlsat", tout << "not satisfied\n"; display(tout, c); tout << "\n";); TRACE("nlsat", tout << "not satisfied\n"; display(tout, c); tout << "\n";);
UNREACHABLE(); return false;
} }
} }
return true; return true;
@ -2091,7 +2102,10 @@ namespace nlsat {
del_ill_formed_lemmas(); del_ill_formed_lemmas();
TRACE("nlsat_bool_assignment_bug", tout << "before reinit cache\n"; display_bool_assignment(tout);); TRACE("nlsat_bool_assignment_bug", tout << "before reinit cache\n"; display_bool_assignment(tout););
reinit_cache(); reinit_cache();
m_assignment.swap(new_assignment); for (var x = 0; x < num_vars(); x++) {
if (new_assignment.is_assigned(x))
m_assignment.set(x, new_assignment.value(x));
}
reattach_arith_clauses(m_clauses); reattach_arith_clauses(m_clauses);
reattach_arith_clauses(m_learned); reattach_arith_clauses(m_learned);
TRACE("nlsat_reorder", tout << "solver after variable reorder\n"; display(tout); display_vars(tout);); TRACE("nlsat_reorder", tout << "solver after variable reorder\n"; display(tout); display_vars(tout););
@ -2586,7 +2600,9 @@ namespace nlsat {
} }
TRACE("nlsat_bool_assignment", TRACE("nlsat_bool_assignment",
for (bool_var b = 0; b < sz; b++) { for (bool_var b = 0; b < sz; b++) {
out << "b" << b << " -> " << m_bvalues[b] << " " << m_atoms[b] << "\n"; out << "b" << b << " -> " << m_bvalues[b] << " ";
if (m_atoms[b]) display(out, *m_atoms[b]);
out << "\n";
}); });
return out; return out;
} }

9
src/tactic/arith/purify_arith_tactic.cpp
View file

@ -401,15 +401,18 @@ struct purify_arith_proc {
return BR_DONE; return BR_DONE;
bool is_int = u().is_int(args[0]); bool is_int = u().is_int(args[0]);
expr * x = args[0];
rational xr;
if (u().is_numeral(x, xr) && xr.is_zero())
return BR_FAILED;
expr * k = mk_fresh_var(is_int); expr * k = mk_fresh_var(is_int);
result = k; result = k;
mk_def_proof(k, t, result_pr); mk_def_proof(k, t, result_pr);
cache_result(t, result, result_pr); cache_result(t, result, result_pr);
expr * x = args[0]; expr_ref zero(u().mk_numeral(rational(0), is_int), m());
expr * zero = u().mk_numeral(rational(0), is_int); expr_ref one(u().mk_numeral(rational(1), is_int), m());
expr * one = u().mk_numeral(rational(1), is_int);
if (y.is_zero()) { if (y.is_zero()) {
// (^ x 0) --> k | x != 0 implies k = 1, x = 0 implies k = 0^0 // (^ x 0) --> k | x != 0 implies k = 1, x = 0 implies k = 0^0
push_cnstr(OR(EQ(x, zero), EQ(k, one))); push_cnstr(OR(EQ(x, zero), EQ(k, one)));

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

@ -98,7 +98,6 @@ static tactic * mk_qfnia_nlsat_solver(ast_manager & m, params_ref const & p) {
simp_p.set_bool("som", true); // expand into sums of monomials simp_p.set_bool("som", true); // expand into sums of monomials
simp_p.set_bool("factor", false); simp_p.set_bool("factor", false);
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), 3000), try_for(mk_qfnra_nlsat_tactic(m, simp_p), 3000),
mk_fail_if_undecided_tactic()); mk_fail_if_undecided_tactic());