mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-03 12:51:22 +00:00
Code Activity

use same interval manager in pdd_interval as caller

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-13 16:52:29 -07:00 • committed by Lev Nachmanson
parent f76432933f
commit 1aaf6d879f
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/math/dd/pdd_interval.h
View file

@ -25,27 +25,27 @@ typedef dep_intervals::interval interval;
typedef dep_intervals::with_deps_t w_dep; typedef dep_intervals::with_deps_t w_dep;
// calculates the interval of a pdd expression based on the given intervals of the variables // calculates the interval of a pdd expression based on the given intervals of the variables
class pdd_interval { class pdd_interval {
dep_intervals m_dep_intervals; dep_intervals& m_dep_intervals;
std::function<interval (unsigned, bool)> m_var2interval; std::function<void (unsigned, bool, scoped_dep_interval&)> m_var2interval;
public: public:
pdd_interval(reslimit& lim): m_dep_intervals(lim) {} pdd_interval(dep_intervals& d): m_dep_intervals(d) {}
dep_intervals& m() { return m_dep_intervals; } dep_intervals& m() { return m_dep_intervals; }
std::function<interval (unsigned, bool)>& var2interval() { return m_var2interval; } // setter std::function<void (unsigned, bool, scoped_dep_interval&)>& var2interval() { return m_var2interval; } // setter
const std::function<interval (unsigned, bool)>& var2interval() const { return m_var2interval; } // getter const std::function<void (unsigned, bool, scoped_dep_interval&)>& var2interval() const { return m_var2interval; } // getter
template <w_dep wd> template <w_dep wd>
void get_interval(pdd const& p, scoped_dep_interval& ret) { void get_interval(pdd const& p, scoped_dep_interval& ret) {
if (p.is_val()) { if (p.is_val()) {
m_dep_intervals.set_interval_for_scalar(ret.get(), p.val()); m_dep_intervals.set_interval_for_scalar(ret, p.val());
return; return;
} }
bool deps = wd == w_dep::with_deps; bool deps = wd == w_dep::with_deps;
interval a = m_var2interval(p.var(), deps); scoped_dep_interval hi(m()), lo(m()), t(m()), a(m());
scoped_dep_interval hi(m()), lo(m()), t(m()); m_var2interval(p.var(), deps, a);
get_interval<wd>(p.hi(), hi); get_interval<wd>(p.hi(), hi);
get_interval<wd>(p.lo(), lo); get_interval<wd>(p.lo(), lo);
if (deps) { if (deps) {

28
src/math/lp/nla_core.cpp
View file

@ -1485,24 +1485,24 @@ std::ostream& core::diagnose_pdd_miss(std::ostream& out) {
} }
bool core::check_pdd_eq(const dd::solver::equation* e) { bool core::check_pdd_eq(const dd::solver::equation* e) {
dd::pdd_interval eval(m_reslim); auto& di = m_intervals.get_dep_intervals();
dd::pdd_interval eval(di);
eval.var2interval() = eval.var2interval() =
[this](lpvar j, bool deps) { [this](lpvar j, bool deps, scoped_dep_interval& a) {
intervals::interval a; if (deps) m_intervals.set_var_interval<dd::w_dep::with_deps>(j, a);
if (deps) m_intervals.set_var_interval<dd::w_dep::with_deps>(j, a); else m_intervals.set_var_interval<dd::w_dep::without_deps>(j, a);
else m_intervals.set_var_interval<dd::w_dep::without_deps>(j, a); };
return a; scoped_dep_interval i(di), i_wd(di);
};
scoped_dep_interval i(eval.m()), i_wd(eval.m());
eval.get_interval<dd::w_dep::without_deps>(e->poly(), i); eval.get_interval<dd::w_dep::without_deps>(e->poly(), i);
if (!eval.m().separated_from_zero(i)) if (!di.separated_from_zero(i))
return false; return false;
eval.get_interval<dd::w_dep::with_deps>(e->poly(), i_wd); eval.get_interval<dd::w_dep::with_deps>(e->poly(), i_wd);
std::function<void (const lp::explanation&)> f = [this](const lp::explanation& e) { std::function<void (const lp::explanation&)> f =
add_empty_lemma(); [this](const lp::explanation& e) {
current_expl().add(e); add_empty_lemma();
}; current_expl().add(e);
if (eval.m().check_interval_for_conflict_on_zero(i_wd, e->dep(), f)) { };
if (di.check_interval_for_conflict_on_zero(i_wd, e->dep(), f)) {
lp_settings().stats().m_grobner_conflicts++; lp_settings().stats().m_grobner_conflicts++;
return true; return true;
} }