From d35d6e41cc6bfcd1bac61a564c443951aca61382 Mon Sep 17 00:00:00 2001 From: Enrico Seiler Date: Fri, 13 Aug 2021 16:49:17 +0200 Subject: [PATCH] [FIX] partitioned IBF --- include/raptor/build/ibf_factory.hpp | 2 +- include/raptor/build/run_program.hpp | 2 +- test/cli/raptor_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/raptor/build/ibf_factory.hpp b/include/raptor/build/ibf_factory.hpp index 0c4df28b..d763c3bc 100644 --- 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) + if constexpr (std::same_as) { 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 index 6bcee457..6ab9f38d 100644 --- 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 index 9814ba8e..8655aae1 100644 --- 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 const & info) { std::string name = std::to_string(std::max(1, std::get<0>(info.param) * 4)) + "_bins_" +