King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2024-11-12 21:09:01 +00:00
Code Issues Releases Wiki Activity

Merge pull request #36 from kariya-mitsuru/count_if

Browse source 
[algorithm.count_if] Reduce inner function parameter.
This commit is contained in:
Bolero MURAKAMI 2013-09-03 04:47:23 -07:00
commit d9e9c23f67
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sprout/algorithm/count_if.hpp
View file

@ -20,18 +20,18 @@ namespace sprout {
template<typename RandomAccessIterator, typename Predicate>
inline SPROUT_CONSTEXPR typename std::iterator_traits<RandomAccessIterator>::difference_type
count_if_impl_ra(
RandomAccessIterator first, RandomAccessIterator last, Predicate pred,
typename std::iterator_traits<RandomAccessIterator>::difference_type pivot
RandomAccessIterator first, Predicate pred,
typename std::iterator_traits<RandomAccessIterator>::difference_type size
)
{
return pivot == 0 ? (pred(*first) ? 1 : 0)
return size == 1 ? (pred(*first) ? 1 : 0)
: sprout::detail::count_if_impl_ra(
first, sprout::next(first, pivot), pred,
pivot / 2
first, pred,
size / 2
)
+ sprout::detail::count_if_impl_ra(
sprout::next(first, pivot), last, pred,
(sprout::distance(first, last) - pivot) / 2
sprout::next(first, size / 2), pred,
size - size / 2
)
;
}
@ -46,7 +46,7 @@ namespace sprout {
)
{
return first == last ? 0
: sprout::detail::count_if_impl_ra(first, last, pred, sprout::distance(first, last) / 2)
: sprout::detail::count_if_impl_ra(first, pred, sprout::distance(first, last))
;
}
@ -59,9 +59,7 @@ namespace sprout {
{
typedef sprout::pair<InputIterator, typename std::iterator_traits<InputIterator>::difference_type> type;
return current.first == last ? current
: n == 1 ? pred(*current.first)
? type(sprout::next(current.first), current.second + 1)
: type(sprout::next(current.first), current.second)
: n == 1 ? type(sprout::next(current.first), current.second + (pred(*current.first) ? 1 : 0))
: sprout::detail::count_if_impl_1(
sprout::detail::count_if_impl_1(
current,