michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix interval<T>::operator- and interval<T>::operator/

Browse source
This commit is contained in:
Soonho Kong 2013-08-13 20:05:54 -07:00
parent 02900e2c83
commit 8eb87fbeae
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/interval/interval.h
View file

@ -214,9 +214,9 @@ public:
friend interval<T> operator/(interval<T> a, T const & b) { return a /= b; }
friend interval<T> operator+(T const & a, interval<T> b) { return b += a; }
friend interval<T> operator-(T const & a, interval<T> b) { return b += -a; }
friend interval<T> operator-(T const & a, interval<T> b) { b.neg(); return b += a; }
friend interval<T> operator*(T const & a, interval<T> b) { return b *= a; }
friend interval<T> operator/(T const & a, interval<T> b) { b = b / a; return b; }
friend interval<T> operator/(T const & a, interval<T> b) { b.inv(); return b *= a; }
bool check_invariant() const;

32
src/interval/interval_def.h
View file

@ -625,6 +625,38 @@ interval<T> & interval<T>::operator*=(T const & o) {
template<typename T>
interval<T> & interval<T>::operator/=(T const & o) {
xnumeral_kind new_l_kind, new_u_kind;
static thread_local T tmp1;
if (this->is_zero()) {
return *this;
}
if (numeric_traits<T>::is_zero(o)) {
numeric_traits<T>::reset(m_lower);
numeric_traits<T>::reset(m_upper);
m_lower_open = m_upper_open = true;
m_lower_inf = m_upper_inf = true;
return *this;
}
if(numeric_traits<T>::is_pos(o)) {
// [a, b] / c = [a/c, b/c] when c > 0
round_to_minus_inf();
div(m_lower, new_l_kind, m_lower, lower_kind(), o, XN_NUMERAL);
round_to_plus_inf();
div(m_upper, new_u_kind, m_upper, upper_kind(), o, XN_NUMERAL);
m_lower_inf = new_l_kind == XN_MINUS_INFINITY;
m_upper_inf = new_u_kind == XN_PLUS_INFINITY;
}
else {
// [a, b] / c = [b/c, a/c] when c < 0
round_to_minus_inf();
div(tmp1, new_l_kind, m_upper, upper_kind(), o, XN_NUMERAL);
round_to_plus_inf();
div(m_upper, new_u_kind, m_lower, lower_kind(), o, XN_NUMERAL);
m_lower = tmp1;
m_lower_inf = new_l_kind == XN_MINUS_INFINITY;
m_upper_inf = new_u_kind == XN_PLUS_INFINITY;
}
return *this;
}