From f6b6a462cb60ccc8eb3485b88c9854bc2c9c48cd Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu, 23 Jan 2020 12:42:58 +0100 Subject: [PATCH] [BL/Algorithm] Clang format excludeObjectCopy. --- BaseLib/Algorithm.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/BaseLib/Algorithm.h b/BaseLib/Algorithm.h index 0662a11a362..84d867bc065 100644 --- a/BaseLib/Algorithm.h +++ b/BaseLib/Algorithm.h @@ -29,35 +29,37 @@ namespace BaseLib /// do not have to be copied /// @return vector that contains the copied objects template <typename T> -std::vector<T> excludeObjectCopy(std::vector<T> const& src_vec, +std::vector<T> excludeObjectCopy( + std::vector<T> const& src_vec, std::vector<std::size_t> const& exclude_positions) { std::vector<T> dest_vec; - if (exclude_positions.empty()) { + if (exclude_positions.empty()) + { dest_vec = src_vec; return dest_vec; } - assert (exclude_positions.back() < src_vec.size()); + assert(exclude_positions.back() < src_vec.size()); - std::copy_n(src_vec.cbegin(), exclude_positions[0], std::back_inserter(dest_vec)); - for (std::size_t i=1; i<exclude_positions.size(); ++i) { - std::copy_n( - src_vec.cbegin()+exclude_positions[i-1]+1, - exclude_positions[i]-(exclude_positions[i-1]+1), - std::back_inserter(dest_vec) - ); + std::copy_n(src_vec.cbegin(), exclude_positions[0], + std::back_inserter(dest_vec)); + for (std::size_t i = 1; i < exclude_positions.size(); ++i) + { + std::copy_n(src_vec.cbegin() + exclude_positions[i - 1] + 1, + exclude_positions[i] - (exclude_positions[i - 1] + 1), + std::back_inserter(dest_vec)); } - std::copy(src_vec.cbegin()+exclude_positions.back()+1, - src_vec.cend(), std::back_inserter(dest_vec)); + std::copy(src_vec.cbegin() + exclude_positions.back() + 1, src_vec.cend(), + std::back_inserter(dest_vec)); return dest_vec; } template <typename T> void excludeObjectCopy(std::vector<T> const& src_vec, - std::vector<std::size_t> const& exclude_positions, - std::vector<T> & dest_vec) + std::vector<std::size_t> const& exclude_positions, + std::vector<T>& dest_vec) { dest_vec = excludeObjectCopy(src_vec, exclude_positions); } -- GitLab