mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-02 14:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sprout::detail::distance のADL追加

Browse source 
sprout/numeric/fixed/partial_sum.hpp 修正
sprout/numeric/fixed/adjacent_difference.hpp 修正
This commit is contained in:
bolero-MURAKAMI 2012-02-25 11:51:23 +09:00
parent bbe932a452
commit aa96f9ce73
13 changed files with 496 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

197
sprout/numeric/fixed/adjacent_difference.hpp
View file

@ -11,61 +11,6 @@
namespace sprout {
namespace fixed {
namespace detail {
template<typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_3(
Result const& result,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_3(
Result const& result,
Args const&... args
)
{
return adjacent_difference_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
? adjacent_difference_impl_2(sprout::next(first), last, result, *first, offset, args..., *first - value)
: adjacent_difference_impl_3(result, args...)
;
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
@ -74,7 +19,8 @@ namespace sprout {
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
@ -88,25 +34,44 @@ namespace sprout {
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
return sizeof...(Args) < static_cast<std::size_t>(offset)
? adjacent_difference_impl_1(first, last, result, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
: first != last
? adjacent_difference_impl_2(sprout::next(first), last, result, *first, offset + sprout::size(result), args..., *first)
: adjacent_difference_impl_3(result, args...)
return first != last && sizeof...(Args) < size
? adjacent_difference_impl_1(sprout::next(first), last, result, size, *first, args..., *first - value)
: sprout::detail::container_complate(result, args...)
;
}
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type adjacent_difference_impl(
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl(
InputIterator first,
InputIterator last,
Result const& result
Result const& result,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return adjacent_difference_impl_1(first, last, result, sprout::fixed_begin_offset(result));
return sprout::remake_clone<Result>(result, sprout::size(result));
}
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return first != last
? adjacent_difference_impl_1(sprout::next(first), last, result, size, *first, *first)
: sprout::detail::container_complate(result)
;
}
} // namespace detail
//
@ -119,67 +84,10 @@ namespace sprout {
Result const& result
)
{
return sprout::fixed::detail::adjacent_difference_impl(first, last, result);
return sprout::fixed::detail::adjacent_difference_impl(first, last, result, sprout::size(result));
}
namespace detail {
template<typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_3(
Result const& result,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_3(
Result const& result,
Args const&... args
)
{
return adjacent_difference_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
? adjacent_difference_impl_2(sprout::next(first), last, result, binary_op, *first, offset, args..., binary_op(*first, value))
: adjacent_difference_impl_3(result, args...)
;
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
@ -189,7 +97,8 @@ namespace sprout {
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
@ -204,26 +113,46 @@ namespace sprout {
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
return sizeof...(Args) < static_cast<std::size_t>(offset)
? adjacent_difference_impl_1(first, last, result, binary_op, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
: first != last
? adjacent_difference_impl_2(sprout::next(first), last, result, binary_op, *first, offset + sprout::size(result), args..., *first)
: adjacent_difference_impl_3(result, args...)
return first != last && sizeof...(Args) < size
? adjacent_difference_impl_1(sprout::next(first), last, result, binary_op, size, *first, args..., binary_op(*first, value))
: sprout::detail::container_complate(result, args...)
;
}
template<typename InputIterator, typename Result, typename BinaryOperation>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type adjacent_difference_impl(
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return adjacent_difference_impl_1(first, last, result, binary_op, sprout::fixed_begin_offset(result));
return sprout::remake_clone<Result>(result, sprout::size(result));
}
template<typename InputIterator, typename Result, typename BinaryOperation>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type adjacent_difference_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return first != last
? adjacent_difference_impl_1(sprout::next(first), last, result, binary_op, size, *first, *first)
: sprout::detail::container_complate(result)
;
}
} // namespace detail
//
@ -237,7 +166,7 @@ namespace sprout {
BinaryOperation binary_op
)
{
return sprout::fixed::detail::adjacent_difference_impl(first, last, result, binary_op);
return sprout::fixed::detail::adjacent_difference_impl(first, last, result, binary_op, sprout::size(result));
}
} // namespace fixed

205
sprout/numeric/fixed/partial_sum.hpp
View file

@ -11,70 +11,16 @@
namespace sprout {
namespace fixed {
namespace detail {
template<typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_3(
Result const& result,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_3(
Result const& result,
Args const&... args
)
{
return partial_sum_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
? partial_sum_impl_2(sprout::next(first), last, result, value + *first, offset, args..., value)
: partial_sum_impl_3(result, args..., value)
;
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
@ -82,31 +28,50 @@ namespace sprout {
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
return sizeof...(Args) < static_cast<std::size_t>(offset)
? partial_sum_impl_1(first, last, result, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
: first != last
? partial_sum_impl_2(sprout::next(first), last, result, *first, offset + sprout::size(result), args...)
: partial_sum_impl_3(result, args...)
return first != last && sizeof...(Args) + 1 < size
? partial_sum_impl_1(sprout::next(first), last, result, size, value + *first, args..., value)
: sprout::detail::container_complate(result, args..., value)
;
}
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type partial_sum_impl(
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl(
InputIterator first,
InputIterator last,
Result const& result
Result const& result,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return partial_sum_impl_1(first, last, result, sprout::fixed_begin_offset(result));
return sprout::remake_clone<Result>(result, sprout::size(result));
}
template<typename InputIterator, typename Result>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return first != last
? partial_sum_impl_1(sprout::next(first), last, result, size, *first)
: sprout::detail::container_complate(result)
;
}
} // namespace detail
//
@ -119,77 +84,21 @@ namespace sprout {
Result const& result
)
{
return sprout::fixed::detail::partial_sum_impl(first, last, result);
return sprout::fixed::detail::partial_sum_impl(first, last, result, sprout::size(result));
}
namespace detail {
template<typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_3(
Result const& result,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_3(
Result const& result,
Args const&... args
)
{
return partial_sum_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_2(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::value_type const& value,
typename sprout::fixed_container_traits<Result>::difference_type offset,
Args const&... args
)
{
return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
? partial_sum_impl_2(sprout::next(first), last, result, binary_op, binary_op(value, *first), offset, args..., value)
: partial_sum_impl_3(result, args..., value)
;
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
@ -197,33 +106,53 @@ namespace sprout {
}
template<typename InputIterator, typename Result, typename BinaryOperation, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args) + 1,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::value_type const& value,
Args const&... args
)
{
return sizeof...(Args) < static_cast<std::size_t>(offset)
? partial_sum_impl_1(first, last, result, binary_op, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
: first != last
? partial_sum_impl_2(sprout::next(first), last, result, binary_op, *first, offset + sprout::size(result), args...)
: partial_sum_impl_3(result, args...)
return first != last && sizeof...(Args) + 1 < size
? partial_sum_impl_1(sprout::next(first), last, result, size, binary_op(value, *first), args..., value)
: sprout::detail::container_complate(result, args..., value)
;
}
template<typename InputIterator, typename Result, typename BinaryOperation>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type partial_sum_impl(
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return partial_sum_impl_1(first, last, result, binary_op, sprout::fixed_begin_offset(result));
return sprout::remake_clone<Result>(result, sprout::size(result));
}
template<typename InputIterator, typename Result, typename BinaryOperation>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != 0,
typename sprout::fixed::result_of::algorithm<Result>::type
>::type partial_sum_impl_1(
InputIterator first,
InputIterator last,
Result const& result,
BinaryOperation binary_op,
typename sprout::fixed_container_traits<Result>::size_type size
)
{
return first != last
? partial_sum_impl_1(sprout::next(first), last, result, binary_op, size, *first)
: sprout::detail::container_complate(result)
;
}
} // namespace detail
//
@ -237,7 +166,7 @@ namespace sprout {
BinaryOperation binary_op
)
{
return sprout::fixed::detail::partial_sum_impl(first, last, result, binary_op);
return sprout::fixed::detail::partial_sum_impl(first, last, result, binary_op, sprout::size(result));
}
} // namespace fixed