sprout/algorithm/fixed/partition_copy.hpp 修正

sprout/algorithm/fit/partition_copy.hpp 修正

sprout/algorithm/fit/partition_copy.hpp

@@ -7,7 +7,9 @@
 #include <sprout/algorithm/fixed/partition_copy.hpp>
 #include <sprout/algorithm/fit/result_of.hpp>
 #include <sprout/sub_array.hpp>
+#include <sprout/detail/algorithm_ext.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT_DETAIL
+#include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT_DETAIL
 
 namespace sprout {
 	namespace fit {
@@ -24,7 +26,14 @@ namespace sprout {
 				return sprout::sub_copy(
 					sprout::get_fixed(sprout::fixed::partition_copy(first, last, result, pred)),
 					offset,
-					offset + NS_SSCRISK_CEL_OR_SPROUT_DETAIL::min(NS_SSCRISK_CEL_OR_SPROUT_DETAIL::count_if(first, last, pred), sprout::size(result))
+					offset + sprout::detail::count_n_if(
+						first,
+						NS_SSCRISK_CEL_OR_SPROUT_DETAIL::min(
+							NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(first, last),
+							sprout::size(result)
+							),
+						pred
+						)
 					);
 			}
 		}	// namespace detail

sprout/algorithm/fixed/copy.hpp

@@ -10,6 +10,7 @@
 #include <sprout/fixed_container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
+#include <sprout/detail/container_complate.hpp>
 #include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT_DETAIL
 
 namespace sprout {
@@ -53,37 +54,15 @@ namespace sprout {
 					NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(first, last)
 					);
 			}
-			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 copy_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, 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 copy_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return copy_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 copy_impl_2(
+			>::type copy_impl(
 				InputIterator first,
 				InputIterator last,
 				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
@@ -93,59 +72,19 @@ namespace sprout {
 			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 copy_impl_2(
+			>::type copy_impl(
 				InputIterator first,
 				InputIterator last,
 				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
-				return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
-					? copy_impl_2(sprout::next(first), last, result, offset, args..., *first)
-					: copy_impl_3(result, args...)
+				return first != last && sizeof...(Args) < size
+					? sprout::fixed::detail::copy_impl(sprout::next(first), last, result, size, args..., *first)
+					: sprout::detail::container_complate(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 copy_impl_1(
-				InputIterator first,
-				InputIterator last,
-				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, 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 copy_impl_1(
-				InputIterator first,
-				InputIterator last,
-				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sizeof...(Args) < static_cast<std::size_t>(offset)
-					? copy_impl_1(first, last, result, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
-					: copy_impl_2(first, last, result, offset + sprout::size(result), args...)
-					;
-			}
-			template<typename InputIterator, typename Result>
-			SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type copy_impl(
-				InputIterator first,
-				InputIterator last,
-				Result const& result
-				)
-			{
-				return copy_impl_1(first, last, result, sprout::fixed_begin_offset(result));
-			}
 			template<typename InputIterator, typename Result>
 			SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type copy(
 				InputIterator first,
@@ -157,7 +96,8 @@ namespace sprout {
 				return sprout::fixed::detail::copy_impl(
 					first,
 					last,
-					result
+					result,
+					sprout::size(result)
 					);
 			}
 		}	// namespace detail

sprout/algorithm/fixed/copy_backward.hpp

@@ -10,6 +10,7 @@
 #include <sprout/fixed_container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
+#include <sprout/detail/container_complate_backward.hpp>
 #include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT_DETAIL
 
 namespace sprout {
@@ -53,37 +54,15 @@ namespace sprout {
 					NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(first, last)
 					);
 			}
-			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 copy_backward_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, 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 copy_backward_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return copy_backward_impl_3(result, *sprout::prev(sprout::fixed_end(result), sizeof...(Args) + 1), args...);
-			}
 			template<typename BidirectionalIterator, 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 copy_backward_impl_2(
+			>::type copy_backward_impl(
 				BidirectionalIterator first,
 				BidirectionalIterator last,
 				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
@@ -93,59 +72,19 @@ namespace sprout {
 			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 copy_backward_impl_2(
+			>::type copy_backward_impl(
 				BidirectionalIterator first,
 				BidirectionalIterator last,
 				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
-				return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
-					? copy_backward_impl_2(first, sprout::prev(last), result, offset, *sprout::prev(last), args...)
-					: copy_backward_impl_3(result, args...)
+				return first != last && sizeof...(Args) < size
+					? copy_backward_impl(first, sprout::prev(last), result, size, *sprout::prev(last), args...)
+					: sprout::detail::container_complate_backward(result, args...)
 					;
 			}
-			template<typename BidirectionalIterator, 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 copy_backward_impl_1(
-				BidirectionalIterator first,
-				BidirectionalIterator last,
-				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
-			}
-			template<typename BidirectionalIterator, 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 copy_backward_impl_1(
-				BidirectionalIterator first,
-				BidirectionalIterator last,
-				Result const& result,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sizeof...(Args) < static_cast<std::size_t>(offset)
-					? copy_backward_impl_1(first, last, result, offset, *sprout::prev(sprout::fixed_end(result), sizeof...(Args) + 1), args...)
-					: copy_backward_impl_2(first, last, result, offset + sprout::size(result), args...)
-					;
-			}
-			template<typename BidirectionalIterator, typename Result>
-			SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type copy_backward_impl(
-				BidirectionalIterator first,
-				BidirectionalIterator last,
-				Result const& result
-				)
-			{
-				return copy_backward_impl_1(first, last, result, sprout::fixed_end_offset(result));
-			}
 			template<typename BidirectionalIterator, typename Result>
 			SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type copy_backward(
 				BidirectionalIterator first,
@@ -157,7 +96,8 @@ namespace sprout {
 				return sprout::fixed::detail::copy_backward_impl(
 					first,
 					last,
-					result
+					result,
+					sprout::size(result)
 					);
 			}
 		}	// namespace detail

sprout/algorithm/fixed/partition_copy.hpp

@@ -8,42 +8,21 @@
 #include <sprout/fixed_container/functions.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
+#include <sprout/detail/container_complate.hpp>
 
 namespace sprout {
 	namespace fixed {
 		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 partition_copy_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, 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 partition_copy_impl_3(
-				Result const& result,
-				Args const&... args
-				)
-			{
-				return partition_copy_impl_3(result, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)));
-			}
 			template<typename InputIterator, typename Result, typename Predicate, 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 partition_copy_impl_2(
+			>::type partition_copy_impl(
 				InputIterator first,
 				InputIterator last,
 				Result const& result,
 				Predicate pred,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
@@ -53,65 +32,22 @@ namespace sprout {
 			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 partition_copy_impl_2(
+			>::type partition_copy_impl(
 				InputIterator first,
 				InputIterator last,
 				Result const& result,
 				Predicate pred,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
+				typename sprout::fixed_container_traits<Result>::size_type size,
 				Args const&... args
 				)
 			{
-				return first != last && sizeof...(Args) < static_cast<std::size_t>(offset)
+				return first != last && sizeof...(Args) < size
 					? pred(*first)
-						? partition_copy_impl_2(sprout::next(first), last, result, pred, offset, *first, args...)
-						: partition_copy_impl_2(sprout::next(first), last, result, pred, offset, args..., *first)
-					: partition_copy_impl_3(result, args...)
+						? sprout::fixed::detail::partition_copy_impl(sprout::next(first), last, result, pred, size, *first, args...)
+						: sprout::fixed::detail::partition_copy_impl(sprout::next(first), last, result, pred, size, args..., *first)
+					: sprout::detail::container_complate(result, args...)
 					;
 			}
-			template<typename InputIterator, typename Result, typename Predicate, 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 partition_copy_impl_1(
-				InputIterator first,
-				InputIterator last,
-				Result const& result,
-				Predicate pred,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sprout::remake_clone<Result, Result>(result, sprout::size(result), args...);
-			}
-			template<typename InputIterator, typename Result, typename Predicate, 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 partition_copy_impl_1(
-				InputIterator first,
-				InputIterator last,
-				Result const& result,
-				Predicate pred,
-				typename sprout::fixed_container_traits<Result>::difference_type offset,
-				Args const&... args
-				)
-			{
-				return sizeof...(Args) < static_cast<std::size_t>(offset)
-					? partition_copy_impl_1(first, last, result, pred, offset, args..., *sprout::next(sprout::fixed_begin(result), sizeof...(Args)))
-					: partition_copy_impl_2(first, last, result, pred, offset + sprout::size(result), args...)
-					;
-			}
-			template<typename InputIterator, typename Result, typename Predicate>
-			SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Result>::type partition_copy_impl(
-				InputIterator first,
-				InputIterator last,
-				Result const& result,
-				Predicate pred
-				)
-			{
-				return partition_copy_impl_1(first, last, result, pred, sprout::fixed_begin_offset(result));
-			}
 		}	// namespace detail
 		//
 		// partition_copy
@@ -124,7 +60,13 @@ namespace sprout {
 			Predicate pred
 			)
 		{
-			return sprout::fixed::detail::partition_copy_impl(first, last, result, pred);
+			return sprout::fixed::detail::partition_copy_impl(
+				first,
+				last,
+				result,
+				pred,
+				sprout::size(result)
+				);
 		}
 	}	// namespace fixed