mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-13 01:16:15 +00:00
Code Activity

create a more precize lemma for the empty intersection case

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2020-04-09 10:23:46 -07:00
parent 99c328b6ef
commit 21b7dc627e
2 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/math/lp/nla_intervals.cpp
View file

@ -344,6 +344,26 @@ bool intervals::interval_of_sum_no_term(const nex_sum& e, scoped_dep_interval &
return true; // no conflict return true; // no conflict
} }
// return true iff a.upper < b.lower, or a.upper == b.lower and one of these bounds is open
bool intervals::conflict_u_l(const interval& a, const interval& b) const {
if (a.m_upper_inf) {
return false;
}
if (b.m_lower_inf) {
return false;
}
if (m_dep_intervals.num_manager().lt(a.m_upper, b.m_lower)) {
return true;
}
if (m_dep_intervals.num_manager().gt(a.m_upper, b.m_lower)) {
return false;
}
return a.m_upper_open || b.m_upper_open;
}
template <e_with_deps wd, typename T> template <e_with_deps wd, typename T>
bool intervals::interval_of_sum(const nex_sum& e, scoped_dep_interval& a, const std::function<void (const T&)>& f) { bool intervals::interval_of_sum(const nex_sum& e, scoped_dep_interval& a, const std::function<void (const T&)>& f) {
TRACE("nla_intervals_details", tout << "e=" << e << "\n";); TRACE("nla_intervals_details", tout << "e=" << e << "\n";);
@ -362,10 +382,13 @@ bool intervals::interval_of_sum(const nex_sum& e, scoped_dep_interval& a, const
TRACE("nla_intervals_details", tout << "empty\n";); TRACE("nla_intervals_details", tout << "empty\n";);
if (wd == e_with_deps::with_deps) { if (wd == e_with_deps::with_deps) {
T expl; T expl;
get_dep_intervals().linearize(r.m_upper_dep, expl); if (conflict_u_l(a, i_from_term)) {
get_dep_intervals().linearize(r.m_lower_dep, expl); get_dep_intervals().linearize(a.get().m_upper_dep, expl);
get_dep_intervals().linearize(a.get().m_upper_dep, expl); get_dep_intervals().linearize(r.m_lower_dep, expl);
get_dep_intervals().linearize(a.get().m_lower_dep, expl); } else {
get_dep_intervals().linearize(r.m_upper_dep, expl);
get_dep_intervals().linearize(a.get().m_lower_dep, expl);
}
f(expl); f(expl);
} else { } else {
// need to recalculate the interval with dependencies // need to recalculate the interval with dependencies

2
src/math/lp/nla_intervals.h
View file

@ -100,5 +100,7 @@ public:
static void add_mul_of_degree_one_to_vector(const nex_mul*, vector<std::pair<rational, lpvar>>&); static void add_mul_of_degree_one_to_vector(const nex_mul*, vector<std::pair<rational, lpvar>>&);
lpvar find_term_column(const lp::lar_term&, rational& a) const; lpvar find_term_column(const lp::lar_term&, rational& a) const;
std::ostream& display_separating_interval(std::ostream& out, const nex*n, const scoped_dep_interval& interv_wd, u_dependency* initial_deps); std::ostream& display_separating_interval(std::ostream& out, const nex*n, const scoped_dep_interval& interv_wd, u_dependency* initial_deps);
bool conflict_u_l(const interval& a, const interval& b) const;
}; // end of intervals }; // end of intervals
} // end of namespace nla } // end of namespace nla