algorithm, operation 全面修正

This commit is contained in:
bolero-MURAKAMI 2011-09-03 22:26:26 +09:00
parent 21f5d5191a
commit 5e67195030
244 changed files with 4764 additions and 831 deletions

View file

@ -5,13 +5,14 @@
#include <sprout/fixed_container/traits.hpp>
#include <sprout/fixed_container/functions.hpp>
#include <sprout/algorithm/fixed/swap_element.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT_DETAIL
namespace sprout {
namespace fixed {
namespace detail {
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type make_heap_impl(
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_heap_impl(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
@ -21,7 +22,7 @@ namespace sprout {
typename sprout::fixed_container_traits<Container>::difference_type r = 2
);
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type make_heap_impl_1(
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_heap_impl_1(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
@ -42,7 +43,7 @@ namespace sprout {
r * 2 + 1,
r * 2 + 2
)
: sprout::get_fixed_copy(cont)
: sprout::clone(cont)
: comp(*(sprout::fixed_begin(cont) + offset + n), *(sprout::fixed_begin(cont) + offset + l))
? sprout::fixed::detail::make_heap_impl(
sprout::fixed::swap_element(cont, sprout::fixed_begin(cont) + offset + n, sprout::fixed_begin(cont) + offset + l),
@ -53,11 +54,11 @@ namespace sprout {
l * 2 + 1,
l * 2 + 2
)
: sprout::get_fixed_copy(cont)
: sprout::clone(cont)
;
}
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type make_heap_impl(
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_heap_impl(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
@ -68,11 +69,11 @@ namespace sprout {
)
{
return r > size
? sprout::get_fixed_copy(cont)
? sprout::clone(cont)
: r == size
? comp(*(sprout::fixed_begin(cont) + offset + n), *(sprout::fixed_begin(cont) + offset + l))
? sprout::fixed::swap_element(cont, sprout::fixed_begin(cont) + offset + n, sprout::fixed_begin(cont) + offset + l)
: sprout::get_fixed_copy(cont)
: sprout::clone(cont)
: sprout::fixed::detail::make_heap_impl_1(
sprout::fixed::detail::make_heap_impl(sprout::fixed::detail::make_heap_impl(cont, comp, offset, size, l, l * 2 + 1, l * 2 + 2), comp, offset, size, r, r * 2 + 1, r * 2 + 2),
comp,
@ -89,7 +90,7 @@ namespace sprout {
// make_heap
//
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type make_heap(
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_heap(
Container const& cont,
Compare comp
)
@ -105,7 +106,7 @@ namespace sprout {
// make_heap
//
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type make_heap(
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_heap(
Container const& cont
)
{
@ -117,6 +118,8 @@ namespace sprout {
);
}
} // namespace fixed
using sprout::fixed::make_heap;
} // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP