mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2024-12-23 21:25:49 +00:00
fix recursion depth: find_end
This commit is contained in:
parent
90890d2336
commit
9b0d1a7933
2 changed files with 59 additions and 12 deletions
|
@ -10,8 +10,8 @@ namespace testspr {
|
|||
static void algorithm_find_end_test() {
|
||||
using namespace sprout;
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr2 = array<int, 3>{{4, 5, 6}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{1, 2, 3, 4, 5, 6, 7, 3, 4, 5}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr2 = array<int, 3>{{3, 4, 5}};
|
||||
SPROUT_STATIC_CONSTEXPR auto arr3 = array<int, 3>{{6, 5, 4}};
|
||||
|
||||
{
|
||||
|
@ -21,7 +21,7 @@ namespace testspr {
|
|||
sprout::begin(arr2),
|
||||
sprout::end(arr2)
|
||||
);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 3);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 7);
|
||||
}
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto found = sprout::find_end(
|
||||
|
@ -39,7 +39,7 @@ namespace testspr {
|
|||
sprout::begin(arr2),
|
||||
sprout::end(arr2)
|
||||
);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 2);
|
||||
}
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto found = sprout::find_end(
|
||||
|
@ -59,7 +59,7 @@ namespace testspr {
|
|||
sprout::end(arr2),
|
||||
testspr::equal_to<int>()
|
||||
);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 3);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 7);
|
||||
}
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto found = sprout::find_end(
|
||||
|
@ -79,7 +79,7 @@ namespace testspr {
|
|||
sprout::end(arr2),
|
||||
testspr::equal_to<int>()
|
||||
);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 5);
|
||||
TESTSPR_BOTH_ASSERT(found == sprout::begin(arr1) + 2);
|
||||
}
|
||||
{
|
||||
SPROUT_STATIC_CONSTEXPR auto found = sprout::find_end(
|
||||
|
|
|
@ -5,9 +5,60 @@
|
|||
#include <sprout/iterator/operation.hpp>
|
||||
#include <sprout/algorithm/search.hpp>
|
||||
#include <sprout/functional/equal_to.hpp>
|
||||
#include <sprout/detail/algorithm/search_one.hpp>
|
||||
|
||||
namespace sprout {
|
||||
namespace detail {
|
||||
template<typename RandomAccessIterator1, typename ForwardIterator2, typename BinaryPredicate>
|
||||
inline SPROUT_CONSTEXPR RandomAccessIterator1
|
||||
find_end_impl_ra(
|
||||
RandomAccessIterator1 first1, RandomAccessIterator1 last1,
|
||||
ForwardIterator2 first2, ForwardIterator2 last2,
|
||||
BinaryPredicate pred,
|
||||
typename std::iterator_traits<RandomAccessIterator1>::difference_type pivot, RandomAccessIterator1 last1_, RandomAccessIterator1 result,
|
||||
RandomAccessIterator1 searched
|
||||
)
|
||||
{
|
||||
return searched < first1 ? sprout::detail::find_end_impl_ra(
|
||||
sprout::next(first1, pivot), last1, first2, last2, pred,
|
||||
(NS_SSCRISK_CEL_OR_SPROUT::distance(first1, last1) - pivot) / 2, last1_, searched,
|
||||
sprout::detail::find_end_impl_ra(
|
||||
first1, sprout::next(first1, pivot), first2, last2, pred,
|
||||
pivot / 2, last1_, searched,
|
||||
first1
|
||||
)
|
||||
)
|
||||
: searched == last1_ ? result
|
||||
: pivot == 0 ? sprout::detail::search_one(first1, last1_, first2, last2, pred)
|
||||
: sprout::detail::find_end_impl_ra(
|
||||
sprout::next(first1, pivot), last1, first2, last2, pred,
|
||||
(NS_SSCRISK_CEL_OR_SPROUT::distance(first1, last1) - pivot) / 2, last1_, result,
|
||||
sprout::detail::find_end_impl_ra(
|
||||
first1, sprout::next(first1, pivot), first2, last2, pred,
|
||||
pivot / 2, last1_, result,
|
||||
first1
|
||||
)
|
||||
)
|
||||
;
|
||||
}
|
||||
template<typename RandomAccessIterator1, typename ForwardIterator2, typename BinaryPredicate>
|
||||
inline SPROUT_CONSTEXPR RandomAccessIterator1
|
||||
find_end(
|
||||
RandomAccessIterator1 first1, RandomAccessIterator1 last1,
|
||||
ForwardIterator2 first2, ForwardIterator2 last2,
|
||||
BinaryPredicate pred,
|
||||
std::random_access_iterator_tag*
|
||||
)
|
||||
{
|
||||
return first1 == last1 ? last1
|
||||
: sprout::detail::find_end_impl_ra(
|
||||
first1, last1, first2, last2, pred,
|
||||
NS_SSCRISK_CEL_OR_SPROUT::distance(first1, last1) / 2, last1, last1,
|
||||
first1
|
||||
)
|
||||
;
|
||||
}
|
||||
|
||||
template<typename ForwardIterator1, typename ForwardIterator2, typename BinaryPredicate>
|
||||
inline SPROUT_CONSTEXPR ForwardIterator1
|
||||
find_end_impl(
|
||||
|
@ -20,7 +71,7 @@ namespace sprout {
|
|||
return first1 == last1 ? result
|
||||
: sprout::detail::find_end_impl(
|
||||
sprout::search(sprout::next(first1), last1, first2, last2, pred), last1, first2, last2, pred,
|
||||
first1
|
||||
first1
|
||||
)
|
||||
;
|
||||
}
|
||||
|
@ -62,11 +113,7 @@ namespace sprout {
|
|||
ForwardIterator2 first2, ForwardIterator2 last2
|
||||
)
|
||||
{
|
||||
return sprout::find_end(
|
||||
first1, last1,
|
||||
first2, last2,
|
||||
sprout::equal_to<>()
|
||||
);
|
||||
return sprout::find_end(first1, last1, first2, last2, sprout::equal_to<>());
|
||||
}
|
||||
} // namespace sprout
|
||||
|
||||
|
|
Loading…
Reference in a new issue