mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add sprout::math::float_promote

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-05-05 17:35:33 +09:00
parent 2fb6cea457
commit feba220da4
3 changed files with 61 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sprout/math/atan2.hpp
View file

@ -5,6 +5,7 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/math/atan.hpp> #include <sprout/math/atan.hpp>
#include <sprout/math/constants.hpp> #include <sprout/math/constants.hpp>
#include <sprout/math/float_promote.hpp>
#include <sprout/utility/enabler_if.hpp> #include <sprout/utility/enabler_if.hpp>
#if SPROUT_USE_BUILTIN_CMATH_FUNCTION #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
# include <cmath> # include <cmath>
@ -12,45 +13,6 @@
namespace sprout { namespace sprout {
namespace math { namespace math {
namespace detail {
template<typename Y, typename X, typename Enable = void>
struct atan2_promoted {};
template<typename Y, typename X>
struct atan2_promoted<
Y,
X,
typename std::enable_if<
std::is_arithmetic<Y>::value && std::is_arithmetic<X>::value
&& (std::is_same<Y, long double>::value || std::is_same<X, long double>::value)
>::type
> {
public:
typedef long double type;
};
template<typename Y, typename X>
struct atan2_promoted<
Y,
X,
typename std::enable_if<
std::is_arithmetic<Y>::value && std::is_arithmetic<X>::value
&& !(std::is_same<Y, long double>::value || std::is_same<X, long double>::value)
>::type
> {
public:
typedef double type;
};
} // namespace detail
//
// atan2_promoted
//
template<typename Y, typename X>
struct atan2_promoted
: public sprout::math::detail::atan2_promoted<
typename std::remove_cv<Y>::type,
typename std::remove_cv<X>::type
>
{};
namespace detail { namespace detail {
template< template<
typename FloatType, typename FloatType,
@ -71,9 +33,9 @@ namespace sprout {
std::is_arithmetic<ArithmeticType1>::value && std::is_arithmetic<ArithmeticType2>::value std::is_arithmetic<ArithmeticType1>::value && std::is_arithmetic<ArithmeticType2>::value
>::type = sprout::enabler >::type = sprout::enabler
> >
inline SPROUT_CONSTEXPR typename sprout::math::atan2_promoted<ArithmeticType1, ArithmeticType2>::type inline SPROUT_CONSTEXPR typename sprout::math::float_promote<ArithmeticType1, ArithmeticType2>::type
atan2(ArithmeticType1 y, ArithmeticType2 x) { atan2(ArithmeticType1 y, ArithmeticType2 x) {
typedef typename sprout::math::atan2_promoted<ArithmeticType1, ArithmeticType2>::type type; typedef typename sprout::math::float_promote<ArithmeticType1, ArithmeticType2>::type type;
return sprout::math::detail::atan2(static_cast<type>(y), static_cast<type>(x)); return sprout::math::detail::atan2(static_cast<type>(y), static_cast<type>(x));
} }
} // namespace detail } // namespace detail

55
sprout/math/float_promote.hpp Normal file
View file

@ -0,0 +1,55 @@
#ifndef SPROUT_MATH_FLOAT_PROMOTE_HPP
#define SPROUT_MATH_FLOAT_PROMOTE_HPP
#include <type_traits>
#include <sprout/config.hpp>
namespace sprout {
namespace math {
namespace detail {
template<bool IsArithmetic, typename Current, typename Head, typename... Tail>
struct float_promote_impl {};
template<typename Current, typename Head>
struct float_promote_impl<true, Current, Head>
: public std::conditional<
(std::is_same<Current, long double>::value || std::is_same<Head, long double>::value),
long double,
double
>
{};
template<typename Current, typename Head, typename... Tail>
struct float_promote_impl<true, Current, Head, Tail...>
: public sprout::math::detail::float_promote_impl<
std::is_arithmetic<Head>::value,
typename std::conditional<
(std::is_same<Current, long double>::value || std::is_same<Head, long double>::value),
long double,
double
>::type,
Tail...
>
{};
template<typename Head, typename... Tail>
struct float_promote
: public sprout::math::detail::float_promote_impl<
std::is_arithmetic<Head>::value,
double,
Head, Tail...
>
{};
} // namespace detail
//
// float_promote
//
template<typename... Types>
struct float_promote
: public sprout::math::detail::float_promote<
typename std::remove_cv<Types>::type...
>
{};
} // namespace math
} // namespace sprout
#endif // #ifndef SPROUT_MATH_FLOAT_PROMOTE_HPP

44
sprout/math/pow.hpp
View file

@ -6,6 +6,7 @@
#include <sprout/math/exp.hpp> #include <sprout/math/exp.hpp>
#include <sprout/math/log.hpp> #include <sprout/math/log.hpp>
#include <sprout/math/constants.hpp> #include <sprout/math/constants.hpp>
#include <sprout/math/float_promote.hpp>
#include <sprout/utility/enabler_if.hpp> #include <sprout/utility/enabler_if.hpp>
#if SPROUT_USE_BUILTIN_CMATH_FUNCTION #if SPROUT_USE_BUILTIN_CMATH_FUNCTION
# include <cmath> # include <cmath>
@ -13,45 +14,6 @@
namespace sprout { namespace sprout {
namespace math { namespace math {
namespace detail {
template<typename X, typename Y, typename Enable = void>
struct pow_promoted {};
template<typename X, typename Y>
struct pow_promoted<
X,
Y,
typename std::enable_if<
std::is_arithmetic<X>::value && std::is_arithmetic<Y>::value
&& (std::is_same<X, long double>::value || std::is_same<Y, long double>::value)
>::type
> {
public:
typedef long double type;
};
template<typename X, typename Y>
struct pow_promoted<
X,
Y,
typename std::enable_if<
std::is_arithmetic<X>::value && std::is_arithmetic<Y>::value
&& !(std::is_same<X, long double>::value || std::is_same<Y, long double>::value)
>::type
> {
public:
typedef double type;
};
} // namespace detail
//
// pow_promoted
//
template<typename X, typename Y>
struct pow_promoted
: public sprout::math::detail::pow_promoted<
typename std::remove_cv<X>::type,
typename std::remove_cv<Y>::type
>
{};
namespace detail { namespace detail {
template< template<
typename FloatType, typename FloatType,
@ -69,9 +31,9 @@ namespace sprout {
std::is_arithmetic<ArithmeticType1>::value && std::is_arithmetic<ArithmeticType2>::value std::is_arithmetic<ArithmeticType1>::value && std::is_arithmetic<ArithmeticType2>::value
>::type = sprout::enabler >::type = sprout::enabler
> >
inline SPROUT_CONSTEXPR typename sprout::math::pow_promoted<ArithmeticType1, ArithmeticType2>::type inline SPROUT_CONSTEXPR typename sprout::math::float_promote<ArithmeticType1, ArithmeticType2>::type
pow(ArithmeticType1 x, ArithmeticType2 y) { pow(ArithmeticType1 x, ArithmeticType2 y) {
typedef typename sprout::math::pow_promoted<ArithmeticType1, ArithmeticType2>::type type; typedef typename sprout::math::float_promote<ArithmeticType1, ArithmeticType2>::type type;
return sprout::math::detail::pow(static_cast<type>(x), static_cast<type>(y)); return sprout::math::detail::pow(static_cast<type>(x), static_cast<type>(y));
} }
} // namespace detail } // namespace detail