Tidy two functions as directed by clang-tidy

UCLOrengoGroup · Apr 28, 2021 · 73e8a7e · 73e8a7e
1 parent 6c6f433
commit 73e8a7e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/source/ct_uni/cath/alignment/alignment_row.cpp b/source/ct_uni/cath/alignment/alignment_row.cpp
@@ -21,6 +21,7 @@
 #include "alignment_row.hpp"
 
 #include <boost/lexical_cast.hpp>
+#include <boost/algorithm/cxx11/any_of.hpp>
 
 #include "cath/alignment/alignment.hpp"
 #include "cath/common/boost_addenda/range/indices.hpp"
@@ -30,6 +31,7 @@ using namespace ::cath::align;
 using namespace ::cath::common;
 using namespace ::std;
 
+using ::boost::algorithm::any_of;
 using ::boost::lexical_cast;
 
 /// \brief Sanity check the specified entry value is within the range given the current number of entries
@@ -102,15 +104,11 @@ aln_posn_type cath::align::get_position_of_entry(const alignment_row &prm_row,
 /// \brief TODOCUMENT
 ///
 /// \relates alignment_row
-bool cath::align::any_entries_present(const alignment_row &prm_alignment_row ///< TODOCUMENT
-                                      ) {
-	const size_t num_entries = prm_alignment_row.num_entries();
-	for (const size_t &entry_ctr : indices( num_entries ) ) {
-		if ( has_position_of_entry( prm_alignment_row, entry_ctr ) ) {
-			return true;
-		}
-	}
-	return false;
+///
+/// \param prm_alignment_row TODOCUMENT
+bool cath::align::any_entries_present( const alignment_row &prm_alignment_row ) {
+	return any_of( indices( prm_alignment_row.num_entries() ),
+	               [ & ]( const size_t &entry_ctr ) { return has_position_of_entry( prm_alignment_row, entry_ctr ); } );
 }
 
 /// \brief TODOCUMENT

diff --git a/source/ct_uni/cath/alignment/pair_alignment.cpp b/source/ct_uni/cath/alignment/pair_alignment.cpp
@@ -20,6 +20,7 @@
 
 #include "pair_alignment.hpp"
 
+#include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 
@@ -36,6 +37,8 @@ using namespace ::cath::common;
 using namespace ::std;
 
 using ::boost::adaptors::filtered;
+using ::boost::algorithm::any_of;
+using ::boost::make_optional;
 
 /// \brief TODOCUMENT
 ///
@@ -70,21 +73,25 @@ aln_posn_opt cath::align::b_position_of_index(const alignment &prm_alignment, //
 /// \brief TODOCUMENT
 ///
 /// \relates alignment
-bool cath::align::alignment_contains_pair(const alignment &prm_alignment, ///< TODOCUMENT
-                                          const size_t    &prm_posn_a,    ///< TODOCUMENT
-							              const size_t    &prm_posn_b     ///< TODOCUMENT
-							              ) {
+///
+/// \param prm_alignment TODOCUMENT
+/// \param prm_posn_a    TODOCUMENT
+/// \param prm_posn_b    TODOCUMENT
+bool cath::align::alignment_contains_pair( const alignment &prm_alignment, const size_t &prm_posn_a, const size_t &prm_posn_b ) {
 	check_alignment_is_a_pair( prm_alignment );
 
-	const size_t length = prm_alignment.length();
-	for (const size_t &index : indices( length ) ) {
-		const aln_posn_opt &posn_a = prm_alignment.position_of_entry_of_index( alignment::PAIR_A_IDX, index );
-		const aln_posn_opt &posn_b = prm_alignment.position_of_entry_of_index( alignment::PAIR_B_IDX, index );
-		if ( posn_a && *posn_a == prm_posn_a && posn_b && *posn_b == prm_posn_b ) {
-			return true;
+	// clang-format off
+	return any_of(
+		indices( prm_alignment.length() ),
+		[ & ]( const size_t &index ) {
+			return (
+				prm_alignment.position_of_entry_of_index( alignment::PAIR_A_IDX, index ) == make_optional( prm_posn_a )
+				&&
+				prm_alignment.position_of_entry_of_index( alignment::PAIR_B_IDX, index ) == make_optional( prm_posn_b )
+			);
 		}
-	}
-	return false;
+	);
+	// clang-format on
 }
 
 /// \brief TODOCUMENT