sprout::detail::distance のADL追加

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

View file

@ -7,6 +7,28 @@
namespace sprout { namespace sprout {
namespace detail { namespace detail {
namespace detail_ {
template<typename Iterator>
SPROUT_CONSTEXPR typename std::iterator_traits<Iterator>::difference_type distance(
Iterator first,
Iterator last
)
{
return first == last
? 0
: 1 + sprout::detail::detail_::distance(sprout::next(first), last)
;
}
template<typename Iterator>
SPROUT_CONSTEXPR typename std::iterator_traits<Iterator>::difference_type distance_impl(
Iterator first,
Iterator last
)
{
using sprout::detail::detail_::distance;
return distance(first, last);
}
} // namespace detail_
// //
// distance // distance
// //
@ -16,7 +38,7 @@ namespace sprout {
Iterator last Iterator last
) )
{ {
return first == last ? 0 : 1 + sprout::detail::distance(sprout::next(first), last); return sprout::detail::detail_::distance_impl(first, last);
} }
template<typename Iterator> template<typename Iterator>
@ -43,7 +65,10 @@ namespace sprout {
Iterator last Iterator last
) )
{ {
return first == last ? 0 : sprout::detail::bidirectional_distance_impl(sprout::next(first), sprout::prev(first), last); return first == last
? 0
: sprout::detail::bidirectional_distance_impl(sprout::next(first), sprout::prev(first), last)
;
} }
} // namespace detail } // namespace detail
} // namespace sprout } // namespace sprout

View file

@ -0,0 +1,8 @@
#ifndef SPROUT_FFT_BITREV_TABLE_HPP
#define SPROUT_FFT_BITREV_TABLE_HPP
#include <sprout/config.hpp>
#include <sprout/fft/fixed/bitrev_table.hpp>
#include <sprout/fft/fit/bitrev_table.hpp>
#endif // #ifndef SPROUT_FFT_BITREV_TABLE_HPP

View file

@ -0,0 +1,41 @@
#ifndef SPROUT_FFT_FIT_BITREV_TABLE_HPP
#define SPROUT_FFT_FIT_BITREV_TABLE_HPP
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/fixed_container/traits.hpp>
#include <sprout/fixed_container/functions.hpp>
#include <sprout/fft/fixed/bitrev_table.hpp>
#include <sprout/algorithm/fit/result_of.hpp>
#include <sprout/sub_array.hpp>
namespace sprout {
namespace fit {
namespace detail {
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Container>::type bitrev_table_impl(
Container const& cont,
typename sprout::fixed_container_traits<Container>::difference_type offset
)
{
return sprout::sub_copy(
sprout::get_fixed(sprout::fixed::bitrev_table(cont)),
offset,
offset + sprout::size(cont)
);
}
} // namespace detail
//
// bitrev_table
//
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Container>::type bitrev_table(
Container const& cont
)
{
return sprout::fit::detail::bitrev_table_impl(cont, sprout::fixed_begin_offset(cont));
}
} // namespace fit
} // namespace sprout
#endif // #ifndef SPROUT_FFT_FIT_BITREV_TABLE_HPP

View file

@ -0,0 +1,64 @@
#ifndef SPROUT_FFT_FIXED_BITREV_TABLE_HPP
#define SPROUT_FFT_FIXED_BITREV_TABLE_HPP
#include <cstddef>
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/index_tuple.hpp>
#include <sprout/fixed_container/traits.hpp>
#include <sprout/fixed_container/functions.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include <sprout/integer/bit_reverse.hpp>
#include <sprout/integer/bit_length.hpp>
namespace sprout {
namespace fixed {
namespace detail {
template<typename Container, std::ptrdiff_t... Indexes>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type bitrev_table_impl(
Container const& cont,
sprout::index_tuple<Indexes...>,
std::size_t bit_length,
typename sprout::fixed_container_traits<Container>::difference_type offset,
typename sprout::fixed_container_traits<Container>::size_type size
)
{
return sprout::remake_clone<Container>(
cont,
sprout::size(cont),
(Indexes >= offset && Indexes < offset + size
? sprout::bit_reverse_in(
static_cast<typename sprout::fixed_container_traits<Container>::value_type>(Indexes - offset),
bit_length
)
: *sprout::next(sprout::fixed_begin(cont), Indexes)
)...
);
}
} // namespace detail
//
// bitrev_table
//
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type bitrev_table(
Container const& cont
)
{
return sprout::fixed::detail::bitrev_table_impl(
cont,
typename sprout::index_range<0, sprout::fixed_container_traits<Container>::fixed_size>::type(),
sprout::empty(cont)
? 0
: sprout::bit_length(sprout::size(cont) - 1)
,
sprout::fixed_begin_offset(cont),
sprout::size(cont)
);
}
} // namespace fixed
using sprout::fixed::bitrev_table;
} // namespace sprout
#endif // #ifndef SPROUT_FFT_FIXED_BITREV_TABLE_HPP

View file

@ -0,0 +1,70 @@
#ifndef SPROUT_INTEGER_BIT_LENGTH_HPP
#define SPROUT_INTEGER_BIT_LENGTH_HPP
#include <climits>
#include <cstddef>
#include <stdexcept>
#include <type_traits>
#include <sprout/config.hpp>
namespace sprout {
namespace detail {
SPROUT_STATIC_CONSTEXPR std::size_t bit_len_8_table[std::size_t(UCHAR_MAX) + 1] = {
0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8
};
template<std::size_t Size>
struct bit_len {
private:
SPROUT_STATIC_CONSTEXPR std::size_t next_size = Size - 1;
SPROUT_STATIC_CONSTEXPR std::size_t shift_bits = next_size * CHAR_BIT;
private:
template <typename IntType>
SPROUT_CONSTEXPR IntType impl(IntType x, unsigned char i) const {
return bit_len_8_table[i]
? bit_len_8_table[i] + next_size * CHAR_BIT
: sprout::detail::bit_len<next_size>().template operator()(x)
;
}
public:
template <typename IntType>
SPROUT_CONSTEXPR IntType operator()(IntType x) const {
return impl(x, static_cast<unsigned char>((x >> shift_bits) & UCHAR_MAX));
}
};
template<>
struct bit_len<1> {
public:
template<typename IntType>
SPROUT_CONSTEXPR IntType operator()(IntType x) const {
return bit_len_8_table[static_cast<unsigned char>(x & UCHAR_MAX)];
}
};
} // namespace detail
//
// bit_length
//
template<typename IntType>
SPROUT_CONSTEXPR typename std::enable_if<
std::is_integral<IntType>::value,
IntType
>::type bit_length(IntType x) {
return sprout::detail::bit_len<sizeof(IntType)>().template operator()(x);
}
} // namespace sprout
#endif // #ifndef SPROUT_INTEGER_BIT_LENGTH_HPP

View file

@ -0,0 +1,81 @@
#ifndef SPROUT_INTEGER_BIT_REVERSE_HPP
#define SPROUT_INTEGER_BIT_REVERSE_HPP
#include <climits>
#include <cstddef>
#include <stdexcept>
#include <type_traits>
#include <sprout/config.hpp>
namespace sprout {
namespace detail {
SPROUT_STATIC_CONSTEXPR unsigned char bit_rev_8_table[std::size_t(UCHAR_MAX) + 1] = {
0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240, 8, 136, 72, 200,
40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248, 4, 132, 68, 196, 36, 164, 100, 228,
20, 148, 84, 212, 52, 180, 116, 244, 12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220,
60, 188, 124, 252, 2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82, 210, 50, 178, 114, 242,
10, 138, 74, 202, 42, 170, 106, 234, 26, 154, 90, 218, 58, 186, 122, 250, 6, 134, 70, 198,
38, 166, 102, 230, 22, 150, 86, 214, 54, 182, 118, 246, 14, 142, 78, 206, 46, 174, 110, 238,
30, 158, 94, 222, 62, 190, 126, 254, 1, 129, 65, 193, 33, 161, 97, 225, 17, 145, 81, 209,
49, 177, 113, 241, 9, 137, 73, 201, 41, 169, 105, 233, 25, 153, 89, 217, 57, 185, 121, 249,
5, 133, 69, 197, 37, 165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245, 13, 141, 77, 205,
45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253, 3, 131, 67, 195, 35, 163, 99, 227,
19, 147, 83, 211, 51, 179, 115, 243, 11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219,
59, 187, 123, 251, 7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247,
15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255
};
template<std::size_t Size>
struct bit_rev {
private:
SPROUT_STATIC_CONSTEXPR std::size_t next_size = Size / 2;
SPROUT_STATIC_CONSTEXPR std::size_t shift_bits = next_size * CHAR_BIT;
public:
template <typename IntType>
SPROUT_CONSTEXPR IntType operator()(IntType x) const {
return (sprout::detail::bit_rev<next_size>().template operator()(x) << shift_bits)
| (sprout::detail::bit_rev<next_size>().template operator()(x >> shift_bits))
;
}
};
template<>
struct bit_rev<1> {
public:
template<typename IntType>
SPROUT_CONSTEXPR IntType operator()(IntType x) const {
return sprout::detail::bit_rev_8_table[static_cast<unsigned char>(x & UCHAR_MAX)];
}
};
} // namespace detail
//
// bit_reverse
//
template<typename IntType>
SPROUT_CONSTEXPR typename std::enable_if<
std::is_integral<IntType>::value,
IntType
>::type bit_reverse(IntType x) {
typedef typename std::make_unsigned<IntType>::type unsigned_type;
return static_cast<IntType>(
sprout::detail::bit_rev<sizeof(IntType)>().template operator()<unsigned_type>(x)
);
}
//
// bit_reverse_in
//
template <typename IntType>
SPROUT_CONSTEXPR typename std::enable_if<
std::is_integral<IntType>::value,
IntType
>::type bit_reverse_in(IntType x, std::size_t length) {
typedef typename std::make_unsigned<IntType>::type unsigned_type;
return length <= sizeof(IntType) * CHAR_BIT
? static_cast<IntType>(
sprout::detail::bit_rev<sizeof(IntType)>().template operator()<unsigned_type>(x)
>> (sizeof(IntType) * CHAR_BIT - length)
)
: throw std::invalid_argument("invalid length")
;
}
} // namespace sprout
#endif // #ifndef SPROUT_INTEGER_BIT_REVERSE_HPP

View file

@ -99,16 +99,16 @@ namespace sprout {
friend SPROUT_CONSTEXPR bool operator!=(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator!=(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return !(lhs == rhs); return !(lhs == rhs);
} }
friend bool operator<(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return lhs.it_ < rhs.it_ || lhs.it_ == rhs.it_ && lhs.i_ < rhs.i_; return lhs.it_ < rhs.it_ || lhs.it_ == rhs.it_ && lhs.i_ < rhs.i_;
} }
friend bool operator>(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return rhs < lhs; return rhs < lhs;
} }
friend bool operator<=(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<=(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return !(rhs < lhs); return !(rhs < lhs);
} }
friend bool operator>=(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>=(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return !(lhs < rhs); return !(lhs < rhs);
} }
SPROUT_CONSTEXPR reference operator*() const { SPROUT_CONSTEXPR reference operator*() const {
@ -153,7 +153,7 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator[](difference_type n) const { SPROUT_CONSTEXPR reference operator[](difference_type n) const {
return *(*this + n); return *(*this + n);
} }
friend difference_type operator-(bytes_iterator const& lhs, bytes_iterator const& rhs) { friend SPROUT_CONSTEXPR difference_type operator-(bytes_iterator const& lhs, bytes_iterator const& rhs) {
return (lhs.it_ - rhs.it_) * traits_type::size() + (lhs.i_ - rhs.i_); return (lhs.it_ - rhs.it_) * traits_type::size() + (lhs.i_ - rhs.i_);
} }
friend SPROUT_CONSTEXPR bytes_iterator operator+(difference_type n, bytes_iterator const& it) { friend SPROUT_CONSTEXPR bytes_iterator operator+(difference_type n, bytes_iterator const& it) {

View file

@ -101,16 +101,16 @@ namespace sprout {
friend SPROUT_CONSTEXPR bool operator!=(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator!=(index_iterator const& lhs, index_iterator const& rhs) {
return !(lhs == rhs); return !(lhs == rhs);
} }
friend bool operator<(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<(index_iterator const& lhs, index_iterator const& rhs) {
return lhs.index_ < rhs.index_; return lhs.index_ < rhs.index_;
} }
friend bool operator>(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>(index_iterator const& lhs, index_iterator const& rhs) {
return rhs < lhs; return rhs < lhs;
} }
friend bool operator<=(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<=(index_iterator const& lhs, index_iterator const& rhs) {
return !(rhs < lhs); return !(rhs < lhs);
} }
friend bool operator>=(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>=(index_iterator const& lhs, index_iterator const& rhs) {
return !(lhs < rhs); return !(lhs < rhs);
} }
SPROUT_CONSTEXPR reference operator*() const { SPROUT_CONSTEXPR reference operator*() const {
@ -158,7 +158,7 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator[](difference_type n) const { SPROUT_CONSTEXPR reference operator[](difference_type n) const {
return holder_.get()[index_ + n]; return holder_.get()[index_ + n];
} }
friend difference_type operator-(index_iterator const& lhs, index_iterator const& rhs) { friend SPROUT_CONSTEXPR difference_type operator-(index_iterator const& lhs, index_iterator const& rhs) {
return static_cast<difference_type>(lhs.index_) - static_cast<difference_type>(rhs.index_); return static_cast<difference_type>(lhs.index_) - static_cast<difference_type>(rhs.index_);
} }
friend SPROUT_CONSTEXPR index_iterator operator+(difference_type n, index_iterator const& it) { friend SPROUT_CONSTEXPR index_iterator operator+(difference_type n, index_iterator const& it) {
@ -213,4 +213,22 @@ namespace sprout {
} }
} // namespace sprout } // namespace sprout
#include <sprout/detail/iterator.hpp>
namespace sprout {
//
// distance
//
template<typename Container>
SPROUT_CONSTEXPR typename std::iterator_traits<sprout::index_iterator<Container> >::difference_type distance(
sprout::index_iterator<Container> first,
sprout::index_iterator<Container> last
)
{
return last - first;
}
} // namespace sprout
#endif // #ifndef SPROUT_ITERATOR_INDEX_ITERATOR_HPP #endif // #ifndef SPROUT_ITERATOR_INDEX_ITERATOR_HPP

View file

@ -123,7 +123,7 @@ namespace sprout {
return !(lhs == rhs); return !(lhs == rhs);
} }
template <typename Iterator1, typename Iterator2> template <typename Iterator1, typename Iterator2>
bool operator<( SPROUT_CONSTEXPR bool operator<(
sprout::reverse_iterator<Iterator1> const& lhs, sprout::reverse_iterator<Iterator1> const& lhs,
sprout::reverse_iterator<Iterator2> const& rhs sprout::reverse_iterator<Iterator2> const& rhs
) )
@ -131,7 +131,7 @@ namespace sprout {
return lhs.base() < rhs.base(); return lhs.base() < rhs.base();
} }
template <typename Iterator1, typename Iterator2> template <typename Iterator1, typename Iterator2>
bool operator>( SPROUT_CONSTEXPR bool operator>(
sprout::reverse_iterator<Iterator1> const& lhs, sprout::reverse_iterator<Iterator1> const& lhs,
sprout::reverse_iterator<Iterator2> const& rhs sprout::reverse_iterator<Iterator2> const& rhs
) )
@ -139,7 +139,7 @@ namespace sprout {
return rhs < lhs; return rhs < lhs;
} }
template <typename Iterator1, typename Iterator2> template <typename Iterator1, typename Iterator2>
bool operator<=( SPROUT_CONSTEXPR bool operator<=(
sprout::reverse_iterator<Iterator1> const& lhs, sprout::reverse_iterator<Iterator1> const& lhs,
sprout::reverse_iterator<Iterator2> const& rhs sprout::reverse_iterator<Iterator2> const& rhs
) )
@ -147,7 +147,7 @@ namespace sprout {
return !(rhs < lhs); return !(rhs < lhs);
} }
template <typename Iterator1, typename Iterator2> template <typename Iterator1, typename Iterator2>
bool operator>=( SPROUT_CONSTEXPR bool operator>=(
sprout::reverse_iterator<Iterator1> const& lhs, sprout::reverse_iterator<Iterator1> const& lhs,
sprout::reverse_iterator<Iterator2> const& rhs sprout::reverse_iterator<Iterator2> const& rhs
) )
@ -155,7 +155,7 @@ namespace sprout {
return !(lhs < rhs); return !(lhs < rhs);
} }
template <typename Iterator1, typename Iterator2> template <typename Iterator1, typename Iterator2>
auto operator-( SPROUT_CONSTEXPR auto operator-(
sprout::reverse_iterator<Iterator1> const& lhs, sprout::reverse_iterator<Iterator1> const& lhs,
sprout::reverse_iterator<Iterator2> const& rhs sprout::reverse_iterator<Iterator2> const& rhs
) -> decltype(lhs.current - rhs.current) ) -> decltype(lhs.current - rhs.current)

View file

@ -84,16 +84,16 @@ namespace sprout {
friend SPROUT_CONSTEXPR bool operator!=(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator!=(value_iterator const& lhs, value_iterator const& rhs) {
return !(lhs == rhs); return !(lhs == rhs);
} }
friend bool operator<(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<(value_iterator const& lhs, value_iterator const& rhs) {
return lhs.count_ > rhs.count_; return lhs.count_ > rhs.count_;
} }
friend bool operator>(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>(value_iterator const& lhs, value_iterator const& rhs) {
return rhs < lhs; return rhs < lhs;
} }
friend bool operator<=(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator<=(value_iterator const& lhs, value_iterator const& rhs) {
return !(rhs < lhs); return !(rhs < lhs);
} }
friend bool operator>=(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR bool operator>=(value_iterator const& lhs, value_iterator const& rhs) {
return !(lhs < rhs); return !(lhs < rhs);
} }
SPROUT_CONSTEXPR reference operator*() const { SPROUT_CONSTEXPR reference operator*() const {
@ -147,7 +147,7 @@ namespace sprout {
SPROUT_CONSTEXPR reference operator[](difference_type n) const { SPROUT_CONSTEXPR reference operator[](difference_type n) const {
return holder_.get(); return holder_.get();
} }
friend difference_type operator-(value_iterator const& lhs, value_iterator const& rhs) { friend SPROUT_CONSTEXPR difference_type operator-(value_iterator const& lhs, value_iterator const& rhs) {
return rhs.count_ - lhs.count_; return rhs.count_ - lhs.count_;
} }
friend SPROUT_CONSTEXPR value_iterator operator+(difference_type n, value_iterator const& it) { friend SPROUT_CONSTEXPR value_iterator operator+(difference_type n, value_iterator const& it) {
@ -202,4 +202,22 @@ namespace sprout {
} }
} // namespace sprout } // namespace sprout
#include <sprout/detail/iterator.hpp>
namespace sprout {
//
// distance
//
template<typename T>
SPROUT_CONSTEXPR typename std::iterator_traits<sprout::value_iterator<T> >::difference_type distance(
sprout::value_iterator<T> first,
sprout::value_iterator<T> last
)
{
return last - first;
}
} // namespace sprout
#endif // #ifndef SPROUT_ITERATOR_VALUE_ITERATOR_HPP #endif // #ifndef SPROUT_ITERATOR_VALUE_ITERATOR_HPP

View file

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

View file

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

View file

@ -3,6 +3,7 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include <bitset>
#include <iostream> #include <iostream>
#include <sprout/fixed_container.hpp> #include <sprout/fixed_container.hpp>
@ -17,14 +18,30 @@ namespace testspr {
} }
template<typename Range> template<typename Range>
void print(Range const& range) { void print(Range const& range) {
print(sprout::begin(range), sprout::end(range)); testspr::print(sprout::begin(range), sprout::end(range));
}
//
// print_ln
//
template<typename T>
static void print_ln(T const& t) {
std::cout << t << std::endl;
}
//
// print_bits
//
template<typename T>
static void print_bits(T const& t) {
testspr::print_ln(std::bitset<sizeof(T) * 8>(t).template to_string<char>());
} }
// //
// print_hl // print_hl
// //
void print_hl() { void print_hl() {
std::cout << "--------------------------------------------------------------------------------" << std::endl; testspr::print_ln("--------------------------------------------------------------------------------");
} }
} // namespace testspr } // namespace testspr