[MISC] Move lign_cfg::alignment_result_capture to align_cfg::detail::…

…alignment_result_capture
seqan · Aug 13, 2020 · a9dff81 · a9dff81
1 parent 1bbd1eb
commit a9dff81
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/include/seqan3/alignment/configuration/align_config_alignment_result_capture.hpp b/include/seqan3/alignment/configuration/align_config_alignment_result_capture.hpp
@@ -6,7 +6,7 @@
 // -----------------------------------------------------------------------------------------------------
 
 /*!\file
- * \brief Provides seqan3::align_cfg::alignment_result_capture.
+ * \brief Provides seqan3::detail::alignment_result_capture.
  * \author Rene Rahn <rene.rahn AT fu-berlin.de>
  */
 
@@ -30,7 +30,7 @@ namespace seqan3::detail
  *
  * Implementation of the alignment result capture config.
  *
- * \see seqan3::align_cfg::alignment_result_capture
+ * \see seqan3::align_cfg::detail::alignment_result_capture
  */
 template <typename alignment_result_t>
 //!\cond
@@ -43,10 +43,9 @@ struct alignment_result_capture_element :
     //!\brief Internal id to check for consistent configuration settings.
     static constexpr detail::align_config_id id{detail::align_config_id::alignment_result_capture};
 };
-
 } // namespace seqan3::detail
 
-namespace seqan3::align_cfg
+namespace seqan3::align_cfg::detail
 {
 /*!\if DEV
  * \brief Configuration element capturing the configured seqan3::alignment_result for the alignment algorithm.
@@ -71,8 +70,7 @@ namespace seqan3::align_cfg
  */
 template <typename alignment_result_t>
 //!\cond
-    requires detail::is_type_specialisation_of_v<alignment_result_t, alignment_result>
+    requires is_type_specialisation_of_v<alignment_result_t, alignment_result>
 //!\endcond
-inline constexpr detail::alignment_result_capture_element<alignment_result_t> alignment_result_capture{};
-}  // namespace seqan3::align_cfg
-
+inline constexpr alignment_result_capture_element<alignment_result_t> alignment_result_capture{};
+} //seqan3::align_cfg::detail
diff --git a/include/seqan3/alignment/configuration/detail.hpp b/include/seqan3/alignment/configuration/detail.hpp
@@ -22,7 +22,7 @@ namespace seqan3::detail
  */
 enum struct align_config_id : uint8_t
 {
-    //!\brief ID for the \ref seqan3::align_cfg::alignment_result_capture "alignment_result_capture" option.
+    //!\brief ID for the \ref seqan3::align_config::detail::alignment_result_capture "alignment_result_capture" option.
     alignment_result_capture,
     aligned_ends, //!< ID for the \ref seqan3::align_cfg::aligned_ends "aligned_ends" option.
     band,         //!< ID for the \ref seqan3::align_cfg::band_fixed_size "band" option.

diff --git a/include/seqan3/alignment/pairwise/alignment_configurator.hpp b/include/seqan3/alignment/pairwise/alignment_configurator.hpp
@@ -290,7 +290,7 @@ struct alignment_configurator
             using function_wrapper_t = std::function<void(indexed_sequence_pair_chunk_t, callback_on_result_t)>;
 
             // Capture the alignment result type.
-            auto config_with_result_type = cfg | align_cfg::alignment_result_capture<alignment_result_t>;
+            auto config_with_result_type = cfg | align_cfg::detail::alignment_result_capture<alignment_result_t>;
 
             // ----------------------------------------------------------------------------
             // Test some basic preconditions

diff --git a/test/performance/alignment/edit_distance_unbanded_benchmark.cpp b/test/performance/alignment/edit_distance_unbanded_benchmark.cpp
@@ -70,7 +70,7 @@ void seqan3_edit_distance_dna4(benchmark::State & state)
     using alignment_result_t = alignment_result_type_t<seq1_ref_t, seq2_ref_t, decltype(edit_distance_cfg)>;
 
     auto edit_distance_cfg_with_result_type = edit_distance_cfg |
-                                              seqan3::align_cfg::alignment_result_capture<alignment_result_t>;
+                                              seqan3::align_cfg::detail::alignment_result_capture<alignment_result_t>;
 
     using edit_traits_t = seqan3::detail::default_edit_distance_trait_type<seq1_ref_t,
                                                                            seq2_ref_t,
@@ -166,7 +166,7 @@ void seqan3_edit_distance_dna4_collection(benchmark::State & state)
     using alignment_result_t = alignment_result_type_t<seq1_ref_t, seq2_ref_t, decltype(edit_distance_cfg)>;
 
     auto edit_distance_cfg_with_result_type = edit_distance_cfg |
-                                              seqan3::align_cfg::alignment_result_capture<alignment_result_t>;
+                                              seqan3::align_cfg::detail::alignment_result_capture<alignment_result_t>;
 
     using edit_traits_t = seqan3::detail::default_edit_distance_trait_type<seq1_ref_t,
                                                                            seq2_ref_t,

diff --git a/test/unit/alignment/pairwise/edit_distance_unbanded_test_template.hpp b/test/unit/alignment/pairwise/edit_distance_unbanded_test_template.hpp
@@ -90,7 +90,7 @@ auto edit_distance(database_t && database, query_t && query, align_cfg_t && alig
                                                        query_t,
                                                        std::remove_reference_t<align_cfg_t>>::type;
     using alignment_result_t = seqan3::alignment_result<alignment_result_value_t>;
-    auto align_cfg_with_result_type = align_cfg | seqan3::align_cfg::alignment_result_capture<alignment_result_t>;
+    auto align_cfg_with_result_type = align_cfg | seqan3::align_cfg::detail::alignment_result_capture<alignment_result_t>;
     using align_config_with_result_type_t = decltype(align_cfg_with_result_type);
     using edit_traits = edit_traits_type<compute_score_matrix,
                                          database_t,