Skip to content

Commit

Permalink
Sample read with two lengths, use 19-mers, reduce reference size.
Browse files Browse the repository at this point in the history
  • Loading branch information
eaasna committed Mar 25, 2022
1 parent f1967ea commit 7be0ef2
Show file tree
Hide file tree
Showing 48 changed files with 911 additions and 5,378 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

# Metadata files
all_bin_paths.txt
bin_paths*.txt
example_data/*


Expand Down
18 changes: 9 additions & 9 deletions test/cli/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ target_use_datasources (valik_test FILES 0overlap16bins.txt)
target_use_datasources (valik_test FILES 20overlap16bins.txt)
target_use_datasources (valik_test FILES chromosome_metadata.txt)

target_use_datasources (valik_test FILES 8bins20window.ibf)
target_use_datasources (valik_test FILES 8bins19window.ibf)
target_use_datasources (valik_test FILES 8bins23window.ibf)
target_use_datasources (valik_test FILES 8bins20window0error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins20window0error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins20window1error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins20window1error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins19window0error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins19window0error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins19window1error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins19window1error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins23window0error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins23window0error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins23window1error50pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins23window1error50pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins20window0error100pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins20window0error100pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins20window1error100pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins20window1error100pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins19window0error100pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins19window0error100pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins19window1error100pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins19window1error100pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins23window0error100pattern1overlap.out)
target_use_datasources (valik_test FILES 8bins23window0error100pattern40overlap.out)
target_use_datasources (valik_test FILES 8bins23window1error100pattern1overlap.out)
Expand Down
2 changes: 1 addition & 1 deletion test/cli/valik_options_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ TEST_F(argparse_search, pattern_window)
{
cli_test_result const result = execute_app("valik", "search",
"--query ", data("query.fq"),
"--index ", data("8bins20window.ibf"),
"--index ", data("8bins19window.ibf"),
"--output search.out",
"--pattern 12");
EXPECT_NE(result.exit_code, 0);
Expand Down
12 changes: 6 additions & 6 deletions test/cli/valik_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ TEST_P(valik_build, build_with_file)
}

cli_test_result const result = execute_app("valik", "build",
"--kmer 20",
"--kmer 19",
"--window ", std::to_string(window_size),
"--size 100k",
"--size 32k",
"--threads ", run_parallel ? "2" : "1",
"--output index.ibf",
"bin_paths.txt");
Expand All @@ -81,7 +81,7 @@ TEST_P(valik_build, build_with_file)

INSTANTIATE_TEST_SUITE_P(build_suite,
valik_build,
testing::Combine(testing::Values(8), testing::Values(20, 23), testing::Values(true, false)),
testing::Combine(testing::Values(8), testing::Values(19, 23), testing::Values(true, false)),
[] (testing::TestParamInfo<valik_build::ParamType> const & info)
{
std::string name = std::to_string(std::get<0>(info.param)) + "_bins_" +
Expand Down Expand Up @@ -121,14 +121,14 @@ TEST_P(valik_search, search)

INSTANTIATE_TEST_SUITE_P(search_suite,
valik_search,
testing::Combine(testing::Values(8), testing::Values(20, 23), testing::Values(0, 1),
testing::Combine(testing::Values(8), testing::Values(19, 23), testing::Values(0, 1),
testing::Values(50, 100), testing::Values(1, 40)),
[] (testing::TestParamInfo<valik_search::ParamType> const & info)
{
std::string name = std::to_string(std::get<0>(info.param)) + "_bins_" +
std::to_string(std::get<1>(info.param)) + "_window_" +
std::to_string(std::get<2>(info.param)) + "_error_" +
std::to_string(std::get<3>(info.param)) + "_pattern_" +
std::to_string(std::get<4>(info.param)) + "_overlap";
std::to_string(std::get<3>(info.param)) + "_pattern_" +
std::to_string(std::get<4>(info.param)) + "_overlap";
return name;
});
2 changes: 1 addition & 1 deletion test/data/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*example*
CMakeFiles/*
CMakeFiles/*
Binary file added test/data/build/8bins19window.ibf
Binary file not shown.
Binary file removed test/data/build/8bins20window.ibf
Binary file not shown.
Binary file modified test/data/build/8bins23window.ibf
Binary file not shown.
Loading

0 comments on commit 7be0ef2

Please sign in to comment.