[MISC] clang-format

seqan · Nov 7, 2022 · 447126b · 447126b
1 parent 0331ab8
commit 447126b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 29 deletions.
diff --git a/include/seqan3/alignment/pairwise/alignment_algorithm.hpp b/include/seqan3/alignment/pairwise/alignment_algorithm.hpp
@@ -743,23 +743,28 @@ class alignment_algorithm :
         if constexpr (traits_t::compute_sequence_alignment)
         {
             auto trace_matrix_it = trace_debug_matrix.begin() + offset;
-            std::ranges::copy(column | std::views::transform([](auto const & tpl)
-            {
-                using std::get;
-                auto trace = get<1>(tpl).current;
-
-                if (auto _up = (trace & trace_directions::up_open); _up == trace_directions::carry_up_open)
-                    trace = trace ^ trace_directions::carry_up_open; // remove silent up open signal
-                else if (_up == trace_directions::up_open)
-                    trace = trace ^ trace_directions::up; // display up open only with single bit.
-
-                if (auto _left = (trace & trace_directions::left_open); _left == trace_directions::carry_left_open)
-                    trace = trace ^ trace_directions::carry_left_open; // remove silent left open signal
-                else if (_left == trace_directions::left_open)
-                    trace = trace ^ trace_directions::left; // display left open only with single bit.
-
-                return trace;
-            }), trace_debug_matrix.begin() + offset);
+            std::ranges::copy(
+                column
+                    | std::views::transform(
+                        [](auto const & tpl)
+                        {
+                            using std::get;
+                            auto trace = get<1>(tpl).current;
+
+                            if (auto _up = (trace & trace_directions::up_open); _up == trace_directions::carry_up_open)
+                                trace = trace ^ trace_directions::carry_up_open; // remove silent up open signal
+                            else if (_up == trace_directions::up_open)
+                                trace = trace ^ trace_directions::up; // display up open only with single bit.
+
+                            if (auto _left = (trace & trace_directions::left_open);
+                                _left == trace_directions::carry_left_open)
+                                trace = trace ^ trace_directions::carry_left_open; // remove silent left open signal
+                            else if (_left == trace_directions::left_open)
+                                trace = trace ^ trace_directions::left; // display left open only with single bit.
+
+                            return trace;
+                        }),
+                trace_debug_matrix.begin() + offset);
         }
     }
 

diff --git a/include/seqan3/alignment/pairwise/detail/policy_affine_gap_with_trace_recursion.hpp b/include/seqan3/alignment/pairwise/detail/policy_affine_gap_with_trace_recursion.hpp
@@ -78,11 +78,11 @@ class policy_affine_gap_with_trace_recursion : protected policy_affine_gap_recur
         diagonal_score = (diagonal_score < vertical_score)
                            ? (best_trace = previous_cell.vertical_trace(), vertical_score)
                            : (best_trace |= previous_cell.vertical_trace(), diagonal_score);
-        diagonal_score = (diagonal_score < horizontal_score)
-                           ? (best_trace = previous_cell.horizontal_trace() |
-                                (best_trace & trace_directions::carry_up_open),
-                              horizontal_score)
-                           : (best_trace |= previous_cell.horizontal_trace(), diagonal_score);
+        diagonal_score =
+            (diagonal_score < horizontal_score)
+                ? (best_trace = previous_cell.horizontal_trace() | (best_trace & trace_directions::carry_up_open),
+                   horizontal_score)
+                : (best_trace |= previous_cell.horizontal_trace(), diagonal_score);
 
         score_type tmp = diagonal_score + gap_open_score;
         vertical_score += gap_extension_score;

diff --git a/include/seqan3/alignment/pairwise/policy/affine_gap_policy.hpp b/include/seqan3/alignment/pairwise/policy/affine_gap_policy.hpp
@@ -97,10 +97,10 @@ class affine_gap_policy
         {
             tmp = (tmp < score_cell.up) ? (trace_cell.current = trace_cell.up, score_cell.up)
                                         : (trace_cell.current = trace_directions::diagonal | trace_cell.up, tmp);
-            tmp = (tmp < score_cell.r_left) ? (trace_cell.current = trace_cell.r_left | (trace_cell.current &
-                                                                    trace_directions::carry_up_open),
-                                                score_cell.r_left)
-                                            : (trace_cell.current |= trace_cell.r_left, tmp);
+            tmp = (tmp < score_cell.r_left)
+                    ? (trace_cell.current = trace_cell.r_left | (trace_cell.current & trace_directions::carry_up_open),
+                       score_cell.r_left)
+                    : (trace_cell.current |= trace_cell.r_left, tmp);
         }
         else
         {

diff --git a/test/unit/alignment/pairwise/global_affine_unbanded_test.cpp b/test/unit/alignment/pairwise/global_affine_unbanded_test.cpp
@@ -29,9 +29,7 @@ using pairwise_global_affine_unbanded_testing_types = ::testing::Types<
         &seqan3::test::alignment::fixture::global::affine::unbanded::dna4_match_4_mismatch_5_gap_1_open_10_seq2_empty>,
     pairwise_alignment_fixture<
         &seqan3::test::alignment::fixture::global::affine::unbanded::dna4_match_4_mismatch_5_gap_1_open_10_both_empty>,
-    pairwise_alignment_fixture<
-        &seqan3::test::alignment::fixture::global::affine::unbanded::issue_3043>
-    >;
+    pairwise_alignment_fixture<&seqan3::test::alignment::fixture::global::affine::unbanded::issue_3043>>;
 
 INSTANTIATE_TYPED_TEST_SUITE_P(pairwise_global_affine_unbanded,
                                pairwise_alignment_test,