mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-11 05:30:51 +00:00
Code Activity

use dep_intervals inside of nla_intervals

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2019-12-24 15:44:46 -08:00
parent ee255ef8b3
commit 22bec010ba
10 changed files with 260 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,27 +35,6 @@ void dep_intervals::set_interval_for_scalar(interval& a, const rational& v) {
set_upper_is_inf(a, false);
}
template <e_with_deps wd>
void dep_intervals::copy_upper_bound(const interval& a, interval& i) const {
SASSERT(a.m_upper_inf == false);
i.m_upper_inf = false;
m_config.set_upper(i, a.m_upper);
i.m_upper_open = a.m_upper_open;
if (wd == with_deps) {
i.m_upper_dep = a.m_upper_dep;
}
}
template <e_with_deps wd>
void dep_intervals::copy_lower_bound(const interval& a, interval& i) const {
SASSERT(a.m_lower_inf == false);
i.m_lower_inf = false;
m_config.set_lower(i, a.m_lower);
i.m_lower_open = a.m_lower_open;
if (wd == with_deps) {
i.m_lower_dep = a.m_lower_dep;
}
}
@ -75,88 +54,6 @@ void dep_intervals::set_zero_interval_deps_for_mult(interval& a) {
a.m_upper_dep = a.m_lower_dep;
}
template <e_with_deps wd>
void dep_intervals::mul(const rational& r, const interval& a, interval& b) const {
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;
}
}
}
template <e_with_deps wd>
dep_intervals::interval dep_intervals::intersect(const interval& a, const interval& b) const {
interval i;
update_lower_for_intersection<wd>(a, b, i);
update_upper_for_intersection<wd>(a, b, i);
return i;
}
template <e_with_deps wd>
void dep_intervals::update_lower_for_intersection(const interval& a, const interval& b, interval& i) const {
if (a.m_lower_inf) {
if (b.m_lower_inf)
return;
copy_lower_bound<wd>(b, i);
return;
}
if (b.m_lower_inf) {
SASSERT(!a.m_lower_inf);
copy_lower_bound<wd>(a, i);
return;
}
if (m_num_manager.lt(a.m_lower, b.m_lower)) {
copy_lower_bound<wd>(b, i);
return;
}
if (m_num_manager.gt(a.m_lower, b.m_lower)) {
copy_lower_bound<wd>(a, i);
return;
}
SASSERT(m_num_manager.eq(a.m_lower, b.m_lower));
if (a.m_lower_open) { // we might consider to look at b.m_lower_open too here
copy_lower_bound<wd>(a, i);
return;
}
copy_lower_bound<wd>(b, i);
}
template <e_with_deps wd>
void dep_intervals::update_upper_for_intersection(const interval& a, const interval& b, interval& i) const {
if (a.m_upper_inf) {
if (b.m_upper_inf)
return;
copy_upper_bound<wd>(b, i);
return;
}
if (b.m_upper_inf) {
SASSERT(!a.m_upper_inf);
copy_upper_bound<wd>(a, i);
return;
}
if (m_num_manager.gt(a.m_upper, b.m_upper)) {
copy_upper_bound<wd>(b, i);
return;
}
if (m_num_manager.lt(a.m_upper, b.m_upper)) {
copy_upper_bound<wd>(a, i);
return;
}
SASSERT(m_num_manager.eq(a.m_upper, b.m_upper));
if (a.m_upper_open) { // we might consider to look at b.m_upper_open too here
copy_upper_bound<wd>(a, i);
return;
}
copy_upper_bound<wd>(b, i);
}
void dep_intervals::add(const rational& r, interval& a) const {
@ -168,23 +65,6 @@ void dep_intervals::add(const rational& r, interval& a) const {
}
}
template <e_with_deps wd>
dep_intervals::interval dep_intervals::power(const interval& a, unsigned n) {
interval b;
if (with_deps == wd) {
interval_deps_combine_rule combine_rule;
m_imanager.power(a, n, b, combine_rule);
combine_deps(a, combine_rule, b);
}
else {
m_imanager.power(a, n, b);
}
TRACE("dep_intervals", tout << "power of "; display(tout, a) << " = ";
display(tout, b) << "\n"; );
return b;
}
bool dep_intervals::separated_from_zero_on_lower(const interval& i) const {
if (lower_is_inf(i))
return false;