mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix recursion depth: min_element, max_element, minmax_element

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-12-16 21:46:16 +09:00
parent 86f68671a1
commit 1c085cb707
10 changed files with 539 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libs/algorithm/test/max.cpp Normal file
View file

@ -0,0 +1,53 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MAX_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MAX_CPP
#include <sprout/algorithm/max.hpp>
#include <sprout/array.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_max_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 2>{{-1, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max(
arr1[0],
arr1[1]
);
TESTSPR_BOTH_ASSERT(result == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max(
arr1[1],
arr1[0]
);
TESTSPR_BOTH_ASSERT(result == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max(
arr1[0],
arr1[1],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max(
arr1[1],
arr1[0],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == arr1[1]);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_max_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MAX_CPP

54
libs/algorithm/test/max_element.cpp Normal file
View file

@ -0,0 +1,54 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MAX_ELEMENT_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MAX_ELEMENT_CPP
#include <sprout/algorithm/max_element.hpp>
#include <sprout/array.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_max_element_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{6, 5, 7, 4, 8, 3, 9, 2, 10, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max_element(
sprout::begin(arr1),
sprout::end(arr1)
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 8);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 4);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max_element(
sprout::begin(arr1),
sprout::end(arr1),
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 8);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::max_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5,
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 4);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_max_element_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MAX_ELEMENT_CPP

53
libs/algorithm/test/min.cpp Normal file
View file

@ -0,0 +1,53 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MIN_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MIN_CPP
#include <sprout/algorithm/min.hpp>
#include <sprout/array.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_min_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 2>{{-1, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min(
arr1[0],
arr1[1]
);
TESTSPR_BOTH_ASSERT(result == arr1[0]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min(
arr1[1],
arr1[0]
);
TESTSPR_BOTH_ASSERT(result == arr1[0]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min(
arr1[0],
arr1[1],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == arr1[0]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min(
arr1[1],
arr1[0],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == arr1[0]);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_min_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MIN_CPP

54
libs/algorithm/test/min_element.cpp Normal file
View file

@ -0,0 +1,54 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MIN_ELEMENT_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MIN_ELEMENT_CPP
#include <sprout/algorithm/min_element.hpp>
#include <sprout/array.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_min_element_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{6, 5, 7, 4, 8, 3, 9, 2, 10, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min_element(
sprout::begin(arr1),
sprout::end(arr1)
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 9);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 3);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min_element(
sprout::begin(arr1),
sprout::end(arr1),
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 9);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::min_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5,
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result == sprout::begin(arr1) + 3);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_min_element_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MIN_ELEMENT_CPP

57
libs/algorithm/test/minmax.cpp Normal file
View file

@ -0,0 +1,57 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MINMAX_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MINMAX_CPP
#include <sprout/algorithm/minmax.hpp>
#include <sprout/array.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_minmax_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 2>{{-1, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax(
arr1[0],
arr1[1]
);
TESTSPR_BOTH_ASSERT(result.first == arr1[0]);
TESTSPR_BOTH_ASSERT(result.second == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax(
arr1[1],
arr1[0]
);
TESTSPR_BOTH_ASSERT(result.first == arr1[0]);
TESTSPR_BOTH_ASSERT(result.second == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax(
arr1[0],
arr1[1],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result.first == arr1[0]);
TESTSPR_BOTH_ASSERT(result.second == arr1[1]);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax(
arr1[1],
arr1[0],
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result.first == arr1[0]);
TESTSPR_BOTH_ASSERT(result.second == arr1[1]);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_minmax_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MINMAX_CPP

58
libs/algorithm/test/minmax_element.cpp Normal file
View file

@ -0,0 +1,58 @@
#ifndef SPROUT_LIBS_ALGORITHM_TEST_MINMAX_ELEMENT_CPP
#define SPROUT_LIBS_ALGORITHM_TEST_MINMAX_ELEMENT_CPP
#include <sprout/algorithm/minmax_element.hpp>
#include <sprout/array.hpp>
#include <sprout/container.hpp>
#include <testspr/tools.hpp>
namespace testspr {
static void algorithm_minmax_element_test() {
using namespace sprout;
{
SPROUT_STATIC_CONSTEXPR auto arr1 = array<int, 10>{{6, 5, 7, 4, 8, 3, 9, 2, 10, 1}};
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax_element(
sprout::begin(arr1),
sprout::end(arr1)
);
TESTSPR_BOTH_ASSERT(result.first == sprout::begin(arr1) + 9);
TESTSPR_BOTH_ASSERT(result.second == sprout::begin(arr1) + 8);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5
);
TESTSPR_BOTH_ASSERT(result.first == sprout::begin(arr1) + 3);
TESTSPR_BOTH_ASSERT(result.second == sprout::begin(arr1) + 4);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax_element(
sprout::begin(arr1),
sprout::end(arr1),
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result.first == sprout::begin(arr1) + 9);
TESTSPR_BOTH_ASSERT(result.second == sprout::begin(arr1) + 8);
}
{
SPROUT_STATIC_CONSTEXPR auto result = sprout::minmax_element(
sprout::begin(arr1),
sprout::begin(arr1) + 5,
testspr::less<int>()
);
TESTSPR_BOTH_ASSERT(result.first == sprout::begin(arr1) + 3);
TESTSPR_BOTH_ASSERT(result.second == sprout::begin(arr1) + 4);
}
}
}
} // namespace testspr
#ifndef TESTSPR_CPP_INCLUDE
# define TESTSPR_TEST_FUNCTION testspr::algorithm_minmax_element_test
# include <testspr/include_main.hpp>
#endif
#endif // #ifndef SPROUT_LIBS_ALGORITHM_TEST_MINMAX_ELEMENT_CPP

12
libs/algorithm/test/non_modifying.cpp
View file

@ -34,6 +34,12 @@
#include "./includes.cpp"
#include "./is_heap.cpp"
#include "./is_heap_until.cpp"
#include "./min.cpp"
#include "./max.cpp"
#include "./minmax.cpp"
#include "./min_element.cpp"
#include "./max_element.cpp"
#include "./minmax_element.cpp"
#ifdef TESTSPR_CPP_INCLUDE_DISABLE_SPROUT_LIBS_ALGORITHM_TEST_NON_MODIFYIING_CPP
# undef TESTSPR_CPP_INCLUDE
@ -69,6 +75,12 @@ namespace testspr {
testspr::algorithm_includes_test();
testspr::algorithm_is_heap_test();
testspr::algorithm_is_heap_until_test();
testspr::algorithm_min_test();
testspr::algorithm_max_test();
testspr::algorithm_minmax_test();
testspr::algorithm_min_element_test();
testspr::algorithm_max_element_test();
testspr::algorithm_minmax_element_test();
}
} // namespace testspr

71
sprout/algorithm/max_element.hpp
View file

@ -4,30 +4,89 @@
#include <iterator>
#include <sprout/config.hpp>
#include <sprout/iterator/operation.hpp>
#include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
namespace sprout {
// Copyright (C) 2011 RiSK (sscrisk)
namespace detail {
template<typename InputIterator, typename Compare>
inline SPROUT_CONSTEXPR InputIterator
iter_max(InputIterator a, InputIterator b, Compare comp) {
return comp(*a, *b) ? b : a;
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR RandomAccessIterator
max_element_impl_ra(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
typename std::iterator_traits<RandomAccessIterator>::difference_type pivot
)
{
return pivot == 0 ? first
: sprout::detail::iter_max(
sprout::detail::max_element_impl_ra(
first, sprout::next(first, pivot), comp,
pivot / 2
),
sprout::detail::max_element_impl_ra(
sprout::next(first, pivot), last, comp,
(NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) - pivot) / 2
),
comp
)
;
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR RandomAccessIterator
max_element(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
std::random_access_iterator_tag*
)
{
return first == last ? last
: sprout::detail::max_element_impl_ra(
first, last, comp,
NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) / 2
)
;
}
// Copyright (C) 2011 RiSK (sscrisk)
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
max_element_impl(
ForwardIterator first, ForwardIterator last, Compare comp,
ForwardIterator max
ForwardIterator found
)
{
return first == last ? max
: sprout::detail::max_element_impl(sprout::next(first), last, comp, comp(*max, *first) ? first : max)
return first == last ? found
: sprout::detail::max_element_impl(sprout::next(first), last, comp, sprout::detail::iter_max(found, first, comp))
;
}
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
max_element(
ForwardIterator first, ForwardIterator last, Compare comp,
void*
)
{
return first == last ? last
: sprout::detail::max_element_impl(sprout::next(first), last, comp, first)
;
}
} // namespace detail
// 25.4.7 Minimum and maximum
//
// recursion depth:
// [first, last) is RandomAccessIterator -> O(log N)
// otherwise -> O(N)
//
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
max_element(ForwardIterator first, ForwardIterator last, Compare comp) {
return sprout::detail::max_element_impl(first, last, comp, first);
typedef typename std::iterator_traits<ForwardIterator>::iterator_category* category;
return sprout::detail::max_element(first, last, comp, category());
}
template<typename ForwardIterator>

71
sprout/algorithm/min_element.hpp
View file

@ -4,30 +4,89 @@
#include <iterator>
#include <sprout/config.hpp>
#include <sprout/iterator/operation.hpp>
#include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
namespace sprout {
// Copyright (C) 2011 RiSK (sscrisk)
namespace detail {
template<typename InputIterator, typename Compare>
inline SPROUT_CONSTEXPR InputIterator
iter_min(InputIterator a, InputIterator b, Compare comp) {
return comp(*b, *a) ? b : a;
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR RandomAccessIterator
min_element_impl_ra(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
typename std::iterator_traits<RandomAccessIterator>::difference_type pivot
)
{
return pivot == 0 ? first
: sprout::detail::iter_min(
sprout::detail::min_element_impl_ra(
first, sprout::next(first, pivot), comp,
pivot / 2
),
sprout::detail::min_element_impl_ra(
sprout::next(first, pivot), last, comp,
(NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) - pivot) / 2
),
comp
)
;
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR RandomAccessIterator
min_element(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
std::random_access_iterator_tag*
)
{
return first == last ? last
: sprout::detail::min_element_impl_ra(
first, last, comp,
NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) / 2
)
;
}
// Copyright (C) 2011 RiSK (sscrisk)
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
min_element_impl(
ForwardIterator first, ForwardIterator last, Compare comp,
ForwardIterator min
ForwardIterator found
)
{
return first == last ? min
: sprout::detail::min_element_impl(sprout::next(first), last, comp, comp(*first, *min) ? first : min)
return first == last ? found
: sprout::detail::min_element_impl(sprout::next(first), last, comp, sprout::detail::iter_min(found, first, comp))
;
}
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
min_element(
ForwardIterator first, ForwardIterator last, Compare comp,
void*
)
{
return first == last ? last
: sprout::detail::min_element_impl(sprout::next(first), last, comp, first)
;
}
} // namespace detail
// 25.4.7 Minimum and maximum
//
// recursion depth:
// [first, last) is RandomAccessIterator -> O(log N)
// otherwise -> O(N)
//
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
min_element(ForwardIterator first, ForwardIterator last, Compare comp) {
return sprout::detail::min_element_impl(first, last, comp, first);
typedef typename std::iterator_traits<ForwardIterator>::iterator_category* category;
return sprout::detail::min_element(first, last, comp, category());
}
template<typename ForwardIterator>

73
sprout/algorithm/minmax_element.hpp
View file

@ -1,15 +1,61 @@
#ifndef SPROUT_ALGORITHM_MINMAX_ELEMENT_HPP
#define SPROUT_ALGORITHM_MINMAX_ELEMENT_HPP
#include <iterator>
#include <sprout/config.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/utility/pair.hpp>
#include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
namespace sprout {
// Copyright (C) 2011 RiSK (sscrisk)
namespace detail {
template<typename InputIteratorPair, typename Compare>
inline SPROUT_CONSTEXPR InputIteratorPair
iter_minmax(InputIteratorPair a, InputIteratorPair b, Compare comp) {
return InputIteratorPair(
comp(*sprout::first(b), *sprout::first(a)) ? sprout::first(b) : sprout::first(a),
comp(*sprout::second(a), *sprout::second(b)) ? sprout::second(b) : sprout::second(a)
);
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR sprout::pair<RandomAccessIterator, RandomAccessIterator>
minmax_element_impl_ra(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
typename std::iterator_traits<RandomAccessIterator>::difference_type pivot
)
{
return pivot == 0 ? sprout::pair<RandomAccessIterator, RandomAccessIterator>(first, first)
: sprout::detail::iter_minmax(
sprout::detail::minmax_element_impl_ra(
first, sprout::next(first, pivot), comp,
pivot / 2
),
sprout::detail::minmax_element_impl_ra(
sprout::next(first, pivot), last, comp,
(NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) - pivot) / 2
),
comp
)
;
}
template<typename RandomAccessIterator, typename Compare>
inline SPROUT_CONSTEXPR sprout::pair<RandomAccessIterator, RandomAccessIterator>
minmax_element(
RandomAccessIterator first, RandomAccessIterator last, Compare comp,
std::random_access_iterator_tag*
)
{
return first == last ? sprout::pair<RandomAccessIterator, RandomAccessIterator>(last, last)
: sprout::detail::minmax_element_impl_ra(
first, last, comp,
NS_SSCRISK_CEL_OR_SPROUT::distance(first, last) / 2
)
;
}
// Copyright (C) 2011 RiSK (sscrisk)
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR sprout::pair<ForwardIterator, ForwardIterator>
minmax_element_impl(
@ -22,17 +68,34 @@ namespace sprout {
: sprout::detail::minmax_element_impl(sprout::next(first), last, comp, min, comp(*first, *max) ? max : first)
;
}
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR sprout::pair<ForwardIterator, ForwardIterator>
minmax_element(
ForwardIterator first, ForwardIterator last, Compare comp,
void*
)
{
return first == last ? sprout::pair<ForwardIterator, ForwardIterator>(last, last)
: sprout::detail::minmax_element_impl(sprout::next(first), last, comp, first, first)
;
}
} // namespace detail
// 25.4.7 Minimum and maximum
//
// recursion depth:
// [first, last) is RandomAccessIterator -> O(log N)
// otherwise -> O(N)
//
template<typename ForwardIterator, typename Compare>
inline SPROUT_CONSTEXPR pair<ForwardIterator, ForwardIterator>
inline SPROUT_CONSTEXPR sprout::pair<ForwardIterator, ForwardIterator>
minmax_element(ForwardIterator first, ForwardIterator last, Compare comp) {
return sprout::detail::minmax_element_impl(first, last, comp, first, first);
typedef typename std::iterator_traits<ForwardIterator>::iterator_category* category;
return sprout::detail::minmax_element(first, last, comp, category());
}
template<typename ForwardIterator>
inline SPROUT_CONSTEXPR pair<ForwardIterator, ForwardIterator>
inline SPROUT_CONSTEXPR sprout::pair<ForwardIterator, ForwardIterator>
minmax_element(ForwardIterator first, ForwardIterator last) {
return sprout::minmax_element(
first, last,