townforge/interval
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove std_min and std_max, update minmax coding guidelines

Browse Source 
[SVN r23162]
This commit is contained in:
Eric Niebler 2004-06-23 04:49:48 +00:00
parent 32f6f45018
commit 175901733e
5 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/numeric/interval/arith.hpp
View File

@ -177,6 +177,8 @@ template<class T, class Policies> inline
interval<T, Policies> operator*(const interval<T, Policies>& x,
const interval<T, Policies>& y)
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
@ -190,8 +192,8 @@ interval<T, Policies> operator*(const interval<T, Policies>& x,
if (interval_lib::user::is_pos(xu))
if (interval_lib::user::is_neg(yl))
if (interval_lib::user::is_pos(yu)) // M * M
return I(std_min(rnd.mul_down(xl, yu), rnd.mul_down(xu, yl)),
std_max(rnd.mul_up (xl, yl), rnd.mul_up (xu, yu)), true);
return I(min BOOST_PREVENT_MACRO_SUBSTITUTION(rnd.mul_down(xl, yu), rnd.mul_down(xu, yl)),
max BOOST_PREVENT_MACRO_SUBSTITUTION(rnd.mul_up (xl, yl), rnd.mul_up (xu, yu)), true);
else // M * N
return I(rnd.mul_down(xu, yl), rnd.mul_up(xl, yl), true);
else

3
include/boost/numeric/interval/arith2.hpp
View File

@ -142,6 +142,7 @@ T pow_aux(const T& x_, int pwr, Rounding& rnd) // x and pwr are positive
template<class T, class Policies> inline
interval<T, Policies> pow(const interval<T, Policies>& x, int pwr)
{
BOOST_USING_STD_MAX();
using interval_lib::detail::pow_aux;
typedef interval<T, Policies> I;
@ -170,7 +171,7 @@ interval<T, Policies> pow(const interval<T, Policies>& x, int pwr)
if (pwr & 1) { // [-1,1]^1
return I(-pow_aux(-x.lower(), pwr, rnd), pow_aux(x.upper(), pwr, rnd), true);
} else { // [-1,1]^2
return I(static_cast<T>(0), pow_aux(std_max(-x.lower(), x.upper()), pwr, rnd), true);
return I(static_cast<T>(0), pow_aux(max BOOST_PREVENT_MACRO_SUBSTITUTION(-x.lower(), x.upper()), pwr, rnd), true);
}
} else { // [1,2]
return I(pow_aux(x.lower(), pwr, rnd), pow_aux(x.upper(), pwr, rnd), true);

3
include/boost/numeric/interval/transc.hpp
View File

@ -73,11 +73,12 @@ interval<T, Policies> cos(const interval<T, Policies>& x)
T l = tmp.lower();
T u = tmp.upper();
BOOST_USING_STD_MIN();
// separate into monotone subintervals
if (u <= interval_lib::constants::pi_lower<T>())
return I(rnd.cos_down(u), rnd.cos_up(l), true);
else if (u <= pi2.lower())
return I(static_cast<T>(-1), rnd.cos_up(std_min(rnd.sub_down(pi2.lower(), u), l)), true);
return I(static_cast<T>(-1), rnd.cos_up(min BOOST_PREVENT_MACRO_SUBSTITUTION(rnd.sub_down(pi2.lower(), u), l)), true);
else
return I(static_cast<T>(-1), static_cast<T>(1), true);
}

48
include/boost/numeric/interval/utility.hpp
View File

@ -165,10 +165,12 @@ template<class T, class Policies> inline
interval<T, Policies> intersect(const interval<T, Policies>& x,
const interval<T, Policies>& y)
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
if (interval_lib::detail::test_input(x, y))
return interval<T, Policies>::empty();
const T& l = std_max(x.lower(), y.lower());
const T& u = std_min(x.upper(), y.upper());
const T& l = max BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y.lower());
const T& u = min BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y.upper());
if (l <= u) return interval<T, Policies>(l, u, true);
else return interval<T, Policies>::empty();
}
@ -177,6 +179,8 @@ template<class T, class Policies> inline
interval<T, Policies> hull(const interval<T, Policies>& x,
const interval<T, Policies>& y)
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
bool bad_x = interval_lib::detail::test_input(x);
bool bad_y = interval_lib::detail::test_input(y);
if (bad_x)
@ -184,13 +188,15 @@ interval<T, Policies> hull(const interval<T, Policies>& x,
else return y;
else
if (bad_y) return x;
return interval<T, Policies>(std_min(x.lower(), y.lower()),
std_max(x.upper(), y.upper()), true);
return interval<T, Policies>(min BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y.lower()),
max BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y.upper()), true);
}
template<class T, class Policies> inline
interval<T, Policies> hull(const interval<T, Policies>& x, const T& y)
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
bool bad_x = interval_lib::detail::test_input(x);
bool bad_y = interval_lib::detail::test_input<T, Policies>(y);
if (bad_y)
@ -198,13 +204,15 @@ interval<T, Policies> hull(const interval<T, Policies>& x, const T& y)
else return x;
else
if (bad_x) return interval<T, Policies>(y, y, true);
return interval<T, Policies>(std_min(x.lower(), y),
std_max(x.upper(), y), true);
return interval<T, Policies>(min BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y),
max BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y), true);
}
template<class T, class Policies> inline
interval<T, Policies> hull(const T& x, const interval<T, Policies>& y)
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
bool bad_x = interval_lib::detail::test_input<T, Policies>(x);
bool bad_y = interval_lib::detail::test_input(y);
if (bad_x)
@ -212,8 +220,8 @@ interval<T, Policies> hull(const T& x, const interval<T, Policies>& y)
else return y;
else
if (bad_y) return interval<T, Policies>(x, x, true);
return interval<T, Policies>(std_min(x, y.lower()),
std_max(x, y.upper()), true);
return interval<T, Policies>(min BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.lower()),
max BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.upper()), true);
}
template<class T> inline
@ -245,7 +253,8 @@ T norm(const interval<T, Policies>& x)
typedef typename Policies::checking checking;
return checking::nan();
}
return std_max(-x.lower(), x.upper());
BOOST_USING_STD_MAX();
return max BOOST_PREVENT_MACRO_SUBSTITUTION(-x.lower(), x.upper());
}
template<class T, class Policies> inline
@ -256,7 +265,8 @@ interval<T, Policies> abs(const interval<T, Policies>& x)
return I::empty();
if (!interval_lib::user::is_neg(x.lower())) return x;
if (!interval_lib::user::is_pos(x.upper())) return -x;
return I(static_cast<T>(0), std_max(-x.lower(), x.upper()), true);
BOOST_USING_STD_MAX();
return I(static_cast<T>(0), max BOOST_PREVENT_MACRO_SUBSTITUTION(-x.lower(), x.upper()), true);
}
template<class T, class Policies> inline
@ -266,7 +276,8 @@ interval<T, Policies> max BOOST_PREVENT_MACRO_SUBSTITUTION (const interval<T, Po
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_max(x.lower(), y.lower()), std_max(x.upper(), y.upper()), true);
BOOST_USING_STD_MAX();
return I(max BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y.lower()), max BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y.upper()), true);
}
template<class T, class Policies> inline
@ -275,7 +286,8 @@ interval<T, Policies> max BOOST_PREVENT_MACRO_SUBSTITUTION (const interval<T, Po
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_max(x.lower(), y), std_max(x.upper(), y), true);
BOOST_USING_STD_MAX();
return I(max BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y), max BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y), true);
}
template<class T, class Policies> inline
@ -284,7 +296,8 @@ interval<T, Policies> max BOOST_PREVENT_MACRO_SUBSTITUTION (const T& x, const in
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_max(x, y.lower()), std_max(x, y.upper()), true);
BOOST_USING_STD_MAX();
return I(max BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.lower()), max BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.upper()), true);
}
template<class T, class Policies> inline
@ -294,7 +307,8 @@ interval<T, Policies> min BOOST_PREVENT_MACRO_SUBSTITUTION (const interval<T, Po
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_min(x.lower(), y.lower()), std_min(x.upper(), y.upper()), true);
BOOST_USING_STD_MIN();
return I(min BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y.lower()), min BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y.upper()), true);
}
template<class T, class Policies> inline
@ -303,7 +317,8 @@ interval<T, Policies> min BOOST_PREVENT_MACRO_SUBSTITUTION (const interval<T, Po
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_min(x.lower(), y), std_min(x.upper(), y), true);
BOOST_USING_STD_MIN();
return I(min BOOST_PREVENT_MACRO_SUBSTITUTION(x.lower(), y), min BOOST_PREVENT_MACRO_SUBSTITUTION(x.upper(), y), true);
}
template<class T, class Policies> inline
@ -312,7 +327,8 @@ interval<T, Policies> min BOOST_PREVENT_MACRO_SUBSTITUTION (const T& x, const in
typedef interval<T, Policies> I;
if (interval_lib::detail::test_input(x, y))
return I::empty();
return I(std_min(x, y.lower()), std_min(x, y.upper()), true);
BOOST_USING_STD_MIN();
return I(min BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.lower()), min BOOST_PREVENT_MACRO_SUBSTITUTION(x, y.upper()), true);
}
} // namespace numeric

5
test/mul.cpp
View File

@ -16,17 +16,16 @@
#include <boost/numeric/interval.hpp>
#include <boost/test/minimal.hpp>
#include <boost/minmax.hpp>
#include "bugs.hpp"
typedef boost::numeric::interval<double> I;
static double min BOOST_PREVENT_MACRO_SUBSTITUTION (double a, double b, double c, double d) {
return boost::std_min(boost::std_min(a, b), boost::std_min(c, d));
return (std::min)((std::min)(a, b), (std::min)(c, d));
}
static double max BOOST_PREVENT_MACRO_SUBSTITUTION (double a, double b, double c, double d) {
return boost::std_max(boost::std_max(a, b), boost::std_max(c, d));
return (std::max)((std::max)(a, b), (std::max)(c, d));
}
static bool test_mul(double al, double au, double bl, double bu) {