Restored all tests.

crisprVerse · Aug 13, 2023 · 03a7484 · 03a7484
1 parent 4caefb3
commit 03a7484
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 63 deletions.
diff --git a/include/kaori/handlers/DualBarcodes.hpp b/include/kaori/handlers/DualBarcodes.hpp
@@ -25,6 +25,7 @@ namespace kaori {
  */
 template<size_t max_size>
 class DualBarcodes { 
+public:
     /**
      * @brief Optional parameters for `SingleBarcodeSingleEnd`.
      */

diff --git a/include/kaori/handlers/DualBarcodesWithDiagnostics.hpp b/include/kaori/handlers/DualBarcodesWithDiagnostics.hpp
@@ -44,7 +44,7 @@ class DualBarcodesWithDiagnostics {
     DualBarcodesWithDiagnostics(
         const char* template_seq1, size_t template_length1, const BarcodePool& barcode_pool1,
         const char* template_seq2, size_t template_length2, const BarcodePool& barcode_pool2, 
-        const DualBarcodes<max_size>::Options& options
+        const typename DualBarcodes<max_size>::Options& options
     ) :
         dual_handler(template_seq1, template_length1, barcode_pool1, template_seq2, template_length2, barcode_pool2, options),
 
@@ -56,7 +56,7 @@ class DualBarcodesWithDiagnostics {
             template_length2, 
             barcode_pool2, 
             [&]{
-                CombinatorialBarcodesPairedEnd<max_size>::Options combopt;
+                typename CombinatorialBarcodesPairedEnd<max_size>::Options combopt;
                 combopt.use_first = options.use_first;
 
                 combopt.max_mismatches1 = options.max_mismatches1;
@@ -65,7 +65,7 @@ class DualBarcodesWithDiagnostics {
 
                 combopt.max_mismatches2 = options.max_mismatches2;
                 combopt.search_forward2 = !options.search_reverse2;
-                combopt.search_forward2 = options.search_reverse2;
+                combopt.search_reverse2 = options.search_reverse2;
 
                 // we allow duplicates in the trie for each individual barcode, as only the pairs are unique in the dual barcode setup.
                 combopt.duplicates = DuplicateAction::FIRST; 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -26,8 +26,8 @@ add_executable(
     src/handlers/SingleBarcodePairedEnd.cpp
     src/handlers/CombinatorialBarcodesSingleEnd.cpp
     src/handlers/CombinatorialBarcodesPairedEnd.cpp
-#    src/handlers/DualBarcodes.cpp
-#    src/handlers/DualBarcodesWithDiagnostics.cpp
+    src/handlers/DualBarcodes.cpp
+    src/handlers/DualBarcodesWithDiagnostics.cpp
     src/handlers/RandomBarcodeSingleEnd.cpp
 )