mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-07-16 15:14:13 +00:00
fix math/comparison.hpp
This commit is contained in:
parent
1c65d59971
commit
3b6ba46f17
23 changed files with 389 additions and 175 deletions
|
@ -4,42 +4,73 @@
|
|||
#include <type_traits>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/math/not_equal_to.hpp>
|
||||
#include <sprout/math/float_promote.hpp>
|
||||
#include <sprout/type_traits/arithmetic_promote.hpp>
|
||||
#include <sprout/type_traits/enabler_if.hpp>
|
||||
|
||||
namespace sprout {
|
||||
namespace math {
|
||||
namespace detail {
|
||||
template<
|
||||
typename FloatType,
|
||||
typename sprout::enabler_if<std::is_floating_point<FloatType>::value>::type = sprout::enabler
|
||||
typename FloatType1, typename FloatType2,
|
||||
typename sprout::enabler_if<
|
||||
std::is_floating_point<typename sprout::arithmetic_promote<FloatType1, FloatType2>::type>::value
|
||||
>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
less(FloatType x, FloatType y) {
|
||||
less(FloatType1 x, FloatType2 y) {
|
||||
return sprout::math::not_equal_to(x, y) && x < y;
|
||||
}
|
||||
|
||||
template<
|
||||
typename IntType,
|
||||
typename sprout::enabler_if<std::is_integral<IntType>::value>::type = sprout::enabler
|
||||
typename IntType1, typename IntType2,
|
||||
typename sprout::enabler_if<
|
||||
std::is_integral<typename sprout::arithmetic_promote<IntType1, IntType2>::type>::value
|
||||
&& (std::is_unsigned<IntType1>::value == std::is_unsigned<IntType2>::value)
|
||||
>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
less(IntType x, IntType y) {
|
||||
less(IntType1 x, IntType2 y) {
|
||||
return x < y;
|
||||
}
|
||||
template<
|
||||
typename IntType1, typename IntType2,
|
||||
typename sprout::enabler_if<
|
||||
std::is_integral<typename sprout::arithmetic_promote<IntType1, IntType2>::type>::value
|
||||
&& std::is_signed<IntType1>::value && std::is_unsigned<IntType2>::value
|
||||
>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
less(IntType1 x, IntType2 y) {
|
||||
typedef typename std::make_unsigned<typename sprout::arithmetic_promote<IntType1, IntType2>::type>::type type;
|
||||
return x < 0 ? true
|
||||
: static_cast<type>(x) < static_cast<type>(y)
|
||||
;
|
||||
}
|
||||
template<
|
||||
typename IntType1, typename IntType2,
|
||||
typename sprout::enabler_if<
|
||||
std::is_integral<typename sprout::arithmetic_promote<IntType1, IntType2>::type>::value
|
||||
&& std::is_unsigned<IntType1>::value && std::is_signed<IntType2>::value
|
||||
>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
less(IntType1 x, IntType2 y) {
|
||||
typedef typename std::make_unsigned<typename sprout::arithmetic_promote<IntType1, IntType2>::type>::type type;
|
||||
return y < 0 ? false
|
||||
: static_cast<type>(x) < static_cast<type>(y)
|
||||
;
|
||||
}
|
||||
} // namespace detail
|
||||
//
|
||||
// less
|
||||
//
|
||||
template<
|
||||
typename T1,
|
||||
typename T2,
|
||||
typename sprout::enabler_if<std::is_arithmetic<T1>::value && std::is_arithmetic<T2>::value>::type = sprout::enabler
|
||||
typename T, typename U,
|
||||
typename sprout::enabler_if<std::is_arithmetic<T>::value && std::is_arithmetic<U>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR bool
|
||||
less(T1 x, T2 y) {
|
||||
typedef typename sprout::math::float_promote<T1, T2>::type promoted;
|
||||
return sprout::math::detail::less<promoted>(x, y);
|
||||
less(T x, U y) {
|
||||
return sprout::math::detail::less(x, y);
|
||||
}
|
||||
} // namespace math
|
||||
} // namespace sprout
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue