Remove faulty global alignment

eaasna · Sep 11, 2024 · d1a4a15 · d1a4a15
1 parent d40fa45
commit d1a4a15
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 165 deletions.
diff --git a/include/dream_stellar/options/verifier_options.hpp b/include/dream_stellar/options/verifier_options.hpp
@@ -13,19 +13,11 @@ using AllLocal = seqan2::Tag<VerifyAllLocal_> const;
 struct VerifyBestLocal_;
 using BestLocal = seqan2::Tag<VerifyBestLocal_> const;
 
-struct VerifyBandedGlobal_;
-using BandedGlobal = seqan2::Tag<VerifyBandedGlobal_> const;
-
-struct VerifyBandedGlobalExtend_;
-using BandedGlobalExtend = seqan2::Tag<VerifyBandedGlobalExtend_> const;
-
-// basically a std::variant<AllLocal, BestLocal, BandedGlobal, BandedGlobalExtend>
+// basically a std::variant<AllLocal, BestLocal>
 struct StellarVerificationMethod
 {
     StellarVerificationMethod(AllLocal) : _index{0} {}
     StellarVerificationMethod(BestLocal) : _index{1} {}
-    StellarVerificationMethod(BandedGlobal) : _index{2} {}
-    StellarVerificationMethod(BandedGlobalExtend) : _index{3} {}
 
     constexpr std::size_t index() const noexcept
     {
@@ -42,7 +34,7 @@ struct StellarVerificationMethod
     friend inline std::string to_string(StellarVerificationMethod method)
     {
         using cstring_t = char const * const;
-        cstring_t method_names[] = {"exact", "bestLocal", "bandedGlobal", "bandedGlobalExtend"};
+        cstring_t method_names[] = {"exact", "bestLocal"};
         return method_names[method.index()];
     }
 
@@ -54,7 +46,7 @@ struct VerifierOptions
 {
     double xDrop{5}; // maximal x-drop
 
-    // verification strategy: exact, bestLocal, bandedGlobal
+    // verification strategy: exact, bestLocal
     std::string strVerificationMethod{"exact"};
     StellarVerificationMethod verificationMethod{AllLocal{}};
 };

diff --git a/include/dream_stellar/stellar.hpp b/include/dream_stellar/stellar.hpp
@@ -35,8 +35,6 @@
 #include <dream_stellar/stellar_index.hpp>
 #include <dream_stellar/utils/stellar_kernel_runtime.hpp>
 #include <dream_stellar/verification/all_local.hpp>
-#include <dream_stellar/verification/banded_global_extend.hpp>
-#include <dream_stellar/verification/banded_global.hpp>
 #include <dream_stellar/verification/best_local.hpp>
 #include <dream_stellar/verification/swift_hit_verifier.hpp>
 

diff --git a/include/dream_stellar/stellar_launcher.hpp b/include/dream_stellar/stellar_launcher.hpp
@@ -46,10 +46,6 @@ struct StellarLauncher
             return visitor_fn(AllLocal());
         else if (verificationMethod == StellarVerificationMethod{BestLocal{}})
             return visitor_fn(BestLocal());
-        else if (verificationMethod == StellarVerificationMethod{BandedGlobal{}})
-            return visitor_fn(BandedGlobal());
-        else if (verificationMethod == StellarVerificationMethod{BandedGlobalExtend{}})
-            return visitor_fn(BandedGlobalExtend());
         return StellarComputeStatistics{};
     }
 

diff --git a/include/dream_stellar/verification/banded_global.hpp b/include/dream_stellar/verification/banded_global.hpp
diff --git a/include/dream_stellar/verification/banded_global_extend.hpp b/include/dream_stellar/verification/banded_global_extend.hpp
diff --git a/src/argument_parsing/search.cpp b/src/argument_parsing/search.cpp
@@ -172,9 +172,9 @@ void init_search_parser(sharg::parser & parser, search_arguments & arguments)
     parser.add_option(arguments.strVerificationMethod,
                     sharg::config{.short_id = '\0',
                     .long_id = "verification",
-                    .description = "STELLAR: Verification strategy: exact or bestLocal or bandedGlobal.",
+                    .description = "STELLAR: Verification strategy: exact or bestLocal.",
                     .advanced = true,
-                    .validator = sharg::value_list_validator{"exact", "bestLocal", "bandedGlobal", "bandedGlobalExtend"}});
+                    .validator = sharg::value_list_validator{"exact", "bestLocal"}});
     parser.add_option(arguments.numMatches,
                     sharg::config{.short_id = '\0',
                     .long_id = "numMatches",