mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

fix #4359 and regression to #3270

Browse source
This commit is contained in:
Nikolaj Bjorner 2020-05-18 12:41:42 -07:00
parent 1c760b04cf
commit 78a4717c06
4 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/math/interval/dep_intervals.cpp
View file

@ -101,12 +101,16 @@ std::ostream& dep_intervals::display(std::ostream& out, const interval& i) const
out << rational(m_imanager.upper(i)) << (m_imanager.upper_is_open(i)? ")":"]");
}
if (i.m_lower_dep) {
// out << "\nlower deps\n";
// TBD: print_dependencies(i.m_lower_dep, out);
vector<unsigned, false> ex;
linearize(i.m_lower_dep, ex);
out << " ld";
for (unsigned d : ex) out << " " << d;
}
if (i.m_upper_dep) {
// out << "\nupper deps\n";
// TBD: print_dependencies(i.m_upper_dep, out);
vector<unsigned, false> ex;
linearize(i.m_upper_dep, ex);
out << " ud";
for (unsigned d : ex) out << " " << d;
}
return out;
}

25
src/math/interval/dep_intervals.h
View file

@ -55,13 +55,17 @@ private:
};
void add_deps(interval const& a, interval const& b, interval_deps_combine_rule const& deps, interval& i) const {
i.m_lower_dep = lower_is_inf(i) ? nullptr : mk_dependency(a, b, deps.m_lower_combine);
i.m_upper_dep = upper_is_inf(i) ? nullptr : mk_dependency(a, b, deps.m_upper_combine);
auto lower_dep = lower_is_inf(i) ? nullptr : mk_dependency(a, b, deps.m_lower_combine);
auto upper_dep = upper_is_inf(i) ? nullptr : mk_dependency(a, b, deps.m_upper_combine);
i.m_lower_dep = lower_dep;
i.m_upper_dep = upper_dep;
}
void add_deps(interval const& a, interval_deps_combine_rule const& deps, interval& i) const {
i.m_lower_dep = lower_is_inf(i) ? nullptr : mk_dependency(a, deps.m_lower_combine);
i.m_upper_dep = upper_is_inf(i) ? nullptr : mk_dependency(a, deps.m_upper_combine);
auto lower_dep = lower_is_inf(i) ? nullptr : mk_dependency(a, deps.m_lower_combine);
auto upper_dep = upper_is_inf(i) ? nullptr : mk_dependency(a, deps.m_upper_combine);
i.m_lower_dep = lower_dep;
i.m_upper_dep = upper_dep;
}
@ -221,14 +225,13 @@ public:
if (r.is_zero()) return;
m_imanager.mul(r.to_mpq(), a, b);
if (wd == with_deps) {
if (r.is_pos()) {
b.m_lower_dep = a.m_lower_dep;
b.m_upper_dep = a.m_upper_dep;
}
else {
b.m_upper_dep = a.m_lower_dep;
b.m_lower_dep = a.m_upper_dep;
auto lower_dep = a.m_lower_dep;
auto upper_dep = a.m_upper_dep;
if (!r.is_pos()) {
std::swap(lower_dep, upper_dep);
}
b.m_lower_dep = lower_dep;
b.m_upper_dep = upper_dep;
}
}