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

Fix log/exp in interval

Browse source
This commit is contained in:
Soonho Kong 2013-08-13 23:04:55 -07:00
parent 60ee5e08fb
commit e0ffaed41a
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/interval/interval_def.h
View file

@ -880,8 +880,6 @@ template<typename T> void interval<T>::fmod(T y) {
} }
template<typename T> void interval<T>::exp() { template<typename T> void interval<T>::exp() {
if(is_empty())
return;
if(m_lower_inf) { if(m_lower_inf) {
numeric_traits<T>::reset(m_lower); numeric_traits<T>::reset(m_lower);
} else { } else {
@ -898,8 +896,6 @@ template<typename T> void interval<T>::exp() {
return; return;
} }
template<typename T> void interval<T>::exp2() { template<typename T> void interval<T>::exp2() {
if(is_empty())
return;
if(m_lower_inf) { if(m_lower_inf) {
numeric_traits<T>::reset(m_lower); numeric_traits<T>::reset(m_lower);
} else { } else {
@ -916,8 +912,6 @@ template<typename T> void interval<T>::exp2() {
return; return;
} }
template<typename T> void interval<T>::exp10() { template<typename T> void interval<T>::exp10() {
if(is_empty())
return;
if(m_lower_inf) { if(m_lower_inf) {
numeric_traits<T>::reset(m_lower); numeric_traits<T>::reset(m_lower);
} else { } else {
@ -934,12 +928,12 @@ template<typename T> void interval<T>::exp10() {
return; return;
} }
template<typename T> void interval<T>::log() { template<typename T> void interval<T>::log() {
if(is_empty()) lean_assert(lower_kind() == XN_NUMERAL);
return; // lower_open => lower >= 0
if(is_N0()) { lean_assert(!m_lower_open || numeric_traits<T>::is_pos(m_lower) || numeric_traits<T>::is_zero(m_lower));
set_empty(); // !lower_open => lower > 0
return; lean_assert( m_lower_open || numeric_traits<T>::is_pos(m_lower));
}
if(is_lower_pos()) { if(is_lower_pos()) {
numeric_traits<T>::set_rounding(false); numeric_traits<T>::set_rounding(false);
numeric_traits<T>::log(m_lower); numeric_traits<T>::log(m_lower);
@ -957,12 +951,12 @@ template<typename T> void interval<T>::log() {
return; return;
} }
template<typename T> void interval<T>::log2() { template<typename T> void interval<T>::log2() {
if(is_empty()) lean_assert(lower_kind() == XN_NUMERAL);
return; // lower_open => lower >= 0
if(is_N0()) { lean_assert(!m_lower_open || numeric_traits<T>::is_pos(m_lower) || numeric_traits<T>::is_zero(m_lower));
set_empty(); // !lower_open => lower > 0
return; lean_assert( m_lower_open || numeric_traits<T>::is_pos(m_lower));
}
if(is_lower_pos()) { if(is_lower_pos()) {
numeric_traits<T>::set_rounding(false); numeric_traits<T>::set_rounding(false);
numeric_traits<T>::log2(m_lower); numeric_traits<T>::log2(m_lower);
@ -980,12 +974,12 @@ template<typename T> void interval<T>::log2() {
return; return;
} }
template<typename T> void interval<T>::log10() { template<typename T> void interval<T>::log10() {
if(is_empty()) lean_assert(lower_kind() == XN_NUMERAL);
return; // lower_open => lower >= 0
if(is_N0()) { lean_assert(!m_lower_open || numeric_traits<T>::is_pos(m_lower) || numeric_traits<T>::is_zero(m_lower));
set_empty(); // !lower_open => lower > 0
return; lean_assert( m_lower_open || numeric_traits<T>::is_pos(m_lower));
}
if(is_lower_pos()) { if(is_lower_pos()) {
numeric_traits<T>::set_rounding(false); numeric_traits<T>::set_rounding(false);
numeric_traits<T>::log10(m_lower); numeric_traits<T>::log10(m_lower);