Merge pull request #53 from eseiler/fix/partitioned

[FIX] partitioned IBF
seqan · Aug 13, 2021 · 22d14b2 · 22d14b2
2 parents 9fb8115 + d35d6e4
commit 22d14b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/raptor/build/ibf_factory.hpp b/include/raptor/build/ibf_factory.hpp
@@ -48,7 +48,7 @@ class ibf_factory
 
         auto hash_view = [&] ()
         {
-            if constexpr (!std::ranges::view<view_t>)
+            if constexpr (std::same_as<view_t, int>)
             {
                 return seqan3::views::minimiser_hash(seqan3::ungapped{arguments->kmer_size},
                                                      seqan3::window_size{arguments->window_size},

diff --git a/include/raptor/build/run_program.hpp b/include/raptor/build/run_program.hpp
@@ -50,7 +50,7 @@ void run_program(build_arguments const & arguments)
             auto filter_view = std::views::filter([&] (auto && hash)
                 { return std::ranges::find(association[part], hash & mask) != association[part].end(); });
 
-            auto ibf = generator(filter_view);
+            auto ibf = generator(std::move(filter_view));
             std::filesystem::path out_path{arguments.out_path};
             out_path += "_" + std::to_string(part);
             store_index(out_path, ibf, arguments);

diff --git a/test/cli/raptor_test.cpp b/test/cli/raptor_test.cpp
@@ -369,7 +369,7 @@ TEST_P(raptor_parts, pipeline)
 
 INSTANTIATE_TEST_SUITE_P(parts_suite,
                          raptor_parts,
-                         testing::Combine(testing::Values(0), testing::Values(19, 23), testing::Values(true, false), testing::Values(0, 1)),
+                         testing::Combine(testing::Values(0, 16, 32), testing::Values(19, 23), testing::Values(true, false), testing::Values(0, 1)),
                          [] (testing::TestParamInfo<raptor_parts::ParamType> const & info)
                          {
                              std::string name = std::to_string(std::max<int>(1, std::get<0>(info.param) * 4)) + "_bins_" +