mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

no derived search

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-02-12 17:08:04 -08:00
parent b102710b2f
commit 580ebead79
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/util/lp/nla_solver.cpp
View file

@ -509,8 +509,10 @@ struct solver::imp {
void mk_ineq(lp::lar_term& t, llc cmp, const rational& rs, lemma& l) { void mk_ineq(lp::lar_term& t, llc cmp, const rational& rs, lemma& l) {
TRACE("nla_solver", m_lar_solver.print_term(t, tout << "t = ");); TRACE("nla_solver", m_lar_solver.print_term(t, tout << "t = "););
if (explain_ineq(t, cmp, rs)) if (explain_ineq(t, cmp, rs)) {
TRACE("nla_solver", tout << "explained\n";);
return; return;
}
m_lar_solver.subs_term_columns(t); m_lar_solver.subs_term_columns(t);
l.push_back(ineq(cmp, t, rs)); l.push_back(ineq(cmp, t, rs));
} }
@ -994,7 +996,7 @@ struct solver::imp {
for (unsigned i = 0; i < l.ineqs().size(); i++) { for (unsigned i = 0; i < l.ineqs().size(); i++) {
auto & in = l.ineqs()[i]; auto & in = l.ineqs()[i];
print_ineq(in, out); print_ineq(in, out);
if (i + 1 < l.size()) out << " or "; if (i + 1 < l.ineqs().size()) out << " or ";
for (const auto & p: in.m_term) for (const auto & p: in.m_term)
vars.insert(p.var()); vars.insert(p.var());
} }
@ -2644,9 +2646,9 @@ struct solver::imp {
return l_true; return l_true;
} }
init_search(); init_search();
lbool ret = inner_check(true); lbool ret = inner_check(false);
if (ret == l_undef) // if (ret == l_undef)
ret = inner_check(false); // ret = inner_check(false);
TRACE("nla_solver", tout << "ret = " << ret;); TRACE("nla_solver", tout << "ret = " << ret;);
IF_VERBOSE(2, if(ret == l_undef) {verbose_stream() << "Monomials\n"; print_monomials(verbose_stream());}); IF_VERBOSE(2, if(ret == l_undef) {verbose_stream() << "Monomials\n"; print_monomials(verbose_stream());});