diff --git a/include/utilities/consolidate/consolidate_matches.hpp b/include/utilities/consolidate/consolidate_matches.hpp index d020f325..b427b251 100644 --- a/include/utilities/consolidate/consolidate_matches.hpp +++ b/include/utilities/consolidate/consolidate_matches.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include #include @@ -12,6 +14,7 @@ namespace valik * @brief Function that removes duplicates from split Stellar search results and writes the final output file. * * @param arguments Command line arguments. + * @return false If could not clean up intermediate results. */ void consolidate_matches(search_arguments const & arguments); diff --git a/src/consolidate/consolidate_matches.cpp b/src/consolidate/consolidate_matches.cpp index f9240699..013f6beb 100644 --- a/src/consolidate/consolidate_matches.cpp +++ b/src/consolidate/consolidate_matches.cpp @@ -8,6 +8,8 @@ void consolidate_matches(search_arguments const & arguments) auto ref_meta = database_metadata(arguments.ref_meta_path, false); auto matches = read_stellar_output(arguments.all_matches, ref_meta); + seqan3::debug_stream << std::string(arguments.all_matches) << '\t' << matches.size() << '\n'; + std::sort( matches.begin(), matches.end(), std::greater()); matches.erase( std::unique( matches.begin(), matches.end() ), matches.end() ); diff --git a/src/valik_search.cpp b/src/valik_search.cpp index 84fb60fc..0f791a5d 100644 --- a/src/valik_search.cpp +++ b/src/valik_search.cpp @@ -46,7 +46,13 @@ void valik_search(search_arguments const & arguments) // Consolidate matches (not necessary when searching a metagenomic database) if (!arguments.ref_meta_path.empty()) + { consolidate_matches(arguments); + const bool error_in_delete = !std::filesystem::remove(arguments.all_matches); + if (error_in_delete) + std::cerr << "Could not clean up intermediate file: \t" << std::string(arguments.all_matches) << '\n'; + failed = failed || error_in_delete; + } if (arguments.write_time) write_time_statistics(time_statistics, arguments.out_file.string() + ".time"); diff --git a/test/api/utilities/consolidate/consolidate_matches_test.cpp b/test/api/utilities/consolidate/consolidate_matches_test.cpp index 932df2d4..2e3350df 100644 --- a/test/api/utilities/consolidate/consolidate_matches_test.cpp +++ b/test/api/utilities/consolidate/consolidate_matches_test.cpp @@ -3,7 +3,7 @@ #include // Generate the full path of a test input file that is provided in the data directory. -std::filesystem::path data(std::string const & filename) +std::filesystem::path data_path(std::string const & filename) { return std::filesystem::path{std::string{DATADIR}}.concat(filename); } @@ -15,7 +15,7 @@ std::filesystem::path consolidation_input_path(size_t const number_of_bins, size name += "bins"; name += std::to_string(overlap); name += "overlap_dream_all.gff"; - return data(name); + return data_path(name); } std::filesystem::path consolidation_meta_path(size_t const number_of_bins, size_t const overlap) noexcept @@ -25,7 +25,7 @@ std::filesystem::path consolidation_meta_path(size_t const number_of_bins, size_ name += "bins"; name += std::to_string(overlap); name += "overlap_reference_metadata.tsv"; - return data(name); + return data_path(name); } void compare_gff_out(std::vector const & expected, @@ -62,8 +62,8 @@ TEST(consolidate_matches, bins8overlap50) valik::consolidate_matches(arguments); valik::database_metadata reference(arguments.ref_meta_path, false); - auto expected = valik::read_stellar_output(data("stellar_truth.gff"), reference, std::ios::binary); - auto actual = valik::read_stellar_output("consolidated.gff", reference); + auto expected = valik::read_stellar_output(data_path("stellar_truth.gff"), reference, std::ios::binary); + auto actual = valik::read_stellar_output("consolidated.gff", reference, std::ios::binary); compare_gff_out(expected, actual); } @@ -81,8 +81,8 @@ TEST(consolidate_matches, bins16overlap50) valik::consolidate_matches(arguments); valik::database_metadata reference(arguments.ref_meta_path, false); - auto expected = valik::read_stellar_output(data("stellar_truth.gff"), reference, std::ios::binary); - auto actual = valik::read_stellar_output("consolidated.gff", reference); + auto expected = valik::read_stellar_output(data_path("stellar_truth.gff"), reference, std::ios::binary); + auto actual = valik::read_stellar_output("consolidated.gff", reference, std::ios::binary); compare_gff_out(expected, actual); } diff --git a/test/api/valik/split/write_seg_sequences_test.cpp b/test/api/valik/split/write_seg_sequences_test.cpp index 56e767c7..662bb5fc 100644 --- a/test/api/valik/split/write_seg_sequences_test.cpp +++ b/test/api/valik/split/write_seg_sequences_test.cpp @@ -6,7 +6,7 @@ #include // Generate the full path of a test input file that is provided in the data directory. -static std::filesystem::path data(std::string const & filename) +static std::filesystem::path data_path(std::string const & filename) { return std::filesystem::path{std::string{DATADIR}}.concat(filename); } @@ -35,17 +35,17 @@ static void const test_reference_out(size_t overlap, size_t bins) { std::string path_prefix = "write_out_" + std::to_string(overlap) + "_" + std::to_string(bins); - valik::database_metadata reference(data(path_prefix + "_reference_metadata.txt"), false); - valik::database_segments segments(data(path_prefix + "_reference_segments.txt")); - valik::write_reference_segments(reference, segments, data("database.fasta")); + valik::database_metadata reference(data_path(path_prefix + "_reference_metadata.txt"), false); + valik::database_segments segments(data_path(path_prefix + "_reference_segments.txt")); + valik::write_reference_segments(reference, segments, data_path("database.fasta")); for (size_t i = 0; i < bins - 1; i++) { valik::database_segments::segment current_seg = segments.members[i]; valik::database_segments::segment next_seg = segments.members[i + 1]; - std::string current_seg_seq = string_from_file(data("database_" + std::to_string(i) + ".fasta"), std::ios::binary); - std::string next_seg_seq = string_from_file(data("database_" + std::to_string(i + 1) + ".fasta"), std::ios::binary); + std::string current_seg_seq = string_from_file(data_path("database_" + std::to_string(i) + ".fasta"), std::ios::binary); + std::string next_seg_seq = string_from_file(data_path("database_" + std::to_string(i + 1) + ".fasta"), std::ios::binary); trim_fasta_id(current_seg_seq); trim_fasta_id(next_seg_seq); @@ -95,15 +95,15 @@ static void const test_query_out(size_t overlap, size_t bins) { std::string path_prefix = "write_out_" + std::to_string(overlap) + "_" + std::to_string(bins); - valik::database_metadata reference(data(path_prefix + "_reference_metadata.txt"), false); - valik::database_segments segments(data(path_prefix + "_reference_segments.txt")); - valik::write_query_segments(reference, segments, data("database.fasta")); + valik::database_metadata reference(data_path(path_prefix + "_reference_metadata.txt"), false); + valik::database_segments segments(data_path(path_prefix + "_reference_segments.txt")); + valik::write_query_segments(reference, segments, data_path("database.fasta")); using sequence_file_t = seqan3::sequence_file_input>; size_t i{0}; seqan3::dna4_vector previous_seg_seq; - for (auto && [current_seg_seq] : sequence_file_t{data("database.segments.fasta")}) + for (auto && [current_seg_seq] : sequence_file_t{data_path("database.segments.fasta")}) { if (i > 1) { diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt index 5578a52b..3703db54 100644 --- a/test/cli/CMakeLists.txt +++ b/test/cli/CMakeLists.txt @@ -70,11 +70,6 @@ target_use_datasources (valik_test FILES 8bins23window1error100pattern1overlap.g target_use_datasources (valik_test FILES 8bins23window1error100pattern40overlap.gff.out) target_use_datasources (valik_test FILES query.fq) -target_use_datasources (valik_test FILES 16bins50overlap_dream_all.gff) -target_use_datasources (valik_test FILES 16bins50overlap_reference_metadata.tsv) -target_use_datasources (valik_test FILES 8bins50overlap_dream_all.gff) -target_use_datasources (valik_test FILES 8bins50overlap_reference_metadata.tsv) -target_use_datasources (valik_test FILES multi_seq_ref.fasta) target_use_datasources (valik_test FILES query_e0.06.fasta) add_cli_test (dream_test.cpp) diff --git a/test/data/datasources.cmake b/test/data/datasources.cmake index b8f39446..3ae3469f 100644 --- a/test/data/datasources.cmake +++ b/test/data/datasources.cmake @@ -209,9 +209,6 @@ declare_datasource (FILE 16bins13window1error.gff declare_datasource (FILE 16bins13window1error.gff.out URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins13window1error.gff.out URL_HASH SHA256=89e61426004aa15bff39de90b4cd2d7e9080dc19cc3596a797f00d7c8f0c95c0) -declare_datasource (FILE 16bins13window1error.gff.preliminary - URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins13window1error.gff.preliminary - URL_HASH SHA256=1b554d97c35e6bc5cfbda12a8fb817a980da5aeeb8d0d62a827d4996a18ab245) declare_datasource (FILE 16bins13window.ibf URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins13window.ibf URL_HASH SHA256=0875cd2d90d1320f93c575f3197e7879a5b8e51c5c11de76975561d30e4cf324) @@ -221,9 +218,6 @@ declare_datasource (FILE 16bins15window1error.gff declare_datasource (FILE 16bins15window1error.gff.out URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins15window1error.gff.out URL_HASH SHA256=66d219613d6a715bbf6cd282868ee31612147287471b7e1820ca77bc370dec9d) -declare_datasource (FILE 16bins15window1error.gff.preliminary - URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins15window1error.gff.preliminary - URL_HASH SHA256=d728395b3760ef0dc97e4ca37aa324b7ac4aa25601f6e62143a7b189e792b24b) declare_datasource (FILE 16bins15window.ibf URL ${CMAKE_SOURCE_DIR}/test/data/dream/16bins15window.ibf URL_HASH SHA256=7f1ce2bbdf8d657da29d39879ab23c68cb19dbe0b58c69a9c5a576f6528ad24c) @@ -233,9 +227,6 @@ declare_datasource (FILE 4bins13window1error.gff declare_datasource (FILE 4bins13window1error.gff.out URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins13window1error.gff.out URL_HASH SHA256=5d285b543887e94829f15112b8d3c9659d48ff61a74cb216f2fa9f4bb54b4c90) -declare_datasource (FILE 4bins13window1error.gff.preliminary - URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins13window1error.gff.preliminary - URL_HASH SHA256=a095ac60b3077cbb3a34a97886b19bb2cfcc0936cdbc8938694d7c829a06547d) declare_datasource (FILE 4bins13window.ibf URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins13window.ibf URL_HASH SHA256=b08ec3c196dc45faf73c24b86113e2c89adaf3d1844799d646e25dc0e77ac6bb) @@ -245,9 +236,6 @@ declare_datasource (FILE 4bins15window1error.gff declare_datasource (FILE 4bins15window1error.gff.out URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins15window1error.gff.out URL_HASH SHA256=d7c0691b24eb8c949eb522b9844d647b62b0a621953692b15cad5c022128c29e) -declare_datasource (FILE 4bins15window1error.gff.preliminary - URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins15window1error.gff.preliminary - URL_HASH SHA256=163e226fba9cca687ea233209d291bba4558cee6ef0a3d00e7b61631c712cd9e) declare_datasource (FILE 4bins15window.ibf URL ${CMAKE_SOURCE_DIR}/test/data/dream/4bins15window.ibf URL_HASH SHA256=8b584d0e55043b3cc0835674dc83f5a7db6143645071f49973a1d085ac4fb919) diff --git a/test/data/dream/16bins13window1error.gff.preliminary b/test/data/dream/16bins13window1error.gff.preliminary deleted file mode 100644 index e69bdf06..00000000 --- a/test/data/dream/16bins13window1error.gff.preliminary +++ /dev/null @@ -1,102 +0,0 @@ -chr2 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr2 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr2 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=2M1I147M;mutations=3G,103G,124T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr2 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr3 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr3 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr3 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr3 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr2 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr2 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr1 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr1 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr1 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr1 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 2170 2300 98.4732 + . 2;seq2Range=17,147;cigar=131M;mutations=7C,51T -chr2 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr3 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr1 Stellar eps-matches 974 1023 98 + . 2;seq2Range=9,58;cigar=50M;mutations=8A -chr1 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr2 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr3 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr3 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr2 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr2 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 2482 2631 98 - . 9;seq2Range=1,150;cigar=150M;mutations=9C,79G,94G -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr2 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr3 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr1 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr1 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr1 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr2 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr2 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr2 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr3 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr3 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr3 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr3 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G diff --git a/test/data/dream/16bins15window1error.gff.preliminary b/test/data/dream/16bins15window1error.gff.preliminary deleted file mode 100644 index 795f4b01..00000000 --- a/test/data/dream/16bins15window1error.gff.preliminary +++ /dev/null @@ -1,104 +0,0 @@ -chr1 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=2M1I147M;mutations=3G,103G,124T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr3 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr3 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr3 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr3 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr3 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr3 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr2 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr2 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr2 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr1 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr1 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr1 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr1 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 2170 2300 98.4732 + . 2;seq2Range=17,147;cigar=131M;mutations=7C,51T -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr3 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr1 Stellar eps-matches 974 1023 98 + . 2;seq2Range=9,58;cigar=50M;mutations=8A -chr1 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr2 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr3 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr3 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr3 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr2 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 2482 2631 98 - . 9;seq2Range=1,150;cigar=150M;mutations=9C,79G,94G -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr2 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr3 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr1 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr1 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr1 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr2 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr2 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr2 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr3 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr2 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr2 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr3 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr3 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr3 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G diff --git a/test/data/dream/4bins13window1error.gff.preliminary b/test/data/dream/4bins13window1error.gff.preliminary deleted file mode 100644 index 0e1f6745..00000000 --- a/test/data/dream/4bins13window1error.gff.preliminary +++ /dev/null @@ -1,80 +0,0 @@ -chr2 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr2 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr2 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr2 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr1 Stellar eps-matches 974 1023 98 + . 2;seq2Range=9,58;cigar=50M;mutations=8A -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr3 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr3 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr3 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr1 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr1 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr2 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr2 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr2 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 2170 2300 98.4732 + . 2;seq2Range=17,147;cigar=131M;mutations=7C,51T -chr2 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr3 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr2 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 2482 2631 98 - . 9;seq2Range=1,150;cigar=150M;mutations=9C,79G,94G -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr2 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr1 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr1 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr1 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr1 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr2 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr2 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr2 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr3 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr3 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr2 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr2 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr3 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr3 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr1 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr1 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr3 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr3 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr3 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A diff --git a/test/data/dream/4bins15window1error.gff.preliminary b/test/data/dream/4bins15window1error.gff.preliminary deleted file mode 100644 index 556fa67b..00000000 --- a/test/data/dream/4bins15window1error.gff.preliminary +++ /dev/null @@ -1,80 +0,0 @@ -chr1 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr1 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr1 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr2 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr2 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr1 Stellar eps-matches 974 1023 98 + . 2;seq2Range=9,58;cigar=50M;mutations=8A -chr1 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr3 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr3 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr3 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 966 1115 98 + . 2;seq2Range=1,150;cigar=150M;mutations=8A,16A,113C -chr2 Stellar eps-matches 1141 1290 98 + . 3;seq2Range=1,150;cigar=150M;mutations=19G,49T,67T -chr2 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr2 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr2 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 1100 1249 98 - . 5;seq2Range=1,150;cigar=150M;mutations=32G,74C,101C -chr3 Stellar eps-matches 1128 1277 98 - . 7;seq2Range=1,150;cigar=150M;mutations=45G,67C,124C -chr3 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 94 243 98 + . 4;seq2Range=1,150;cigar=150M;mutations=45A,105C,139C -chr1 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr1 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr1 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr2 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr2 Stellar eps-matches 509 658 98 - . 8;seq2Range=1,150;cigar=150M;mutations=46G,110T,119T -chr2 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr2 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr3 Stellar eps-matches 1842 1991 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 2154 2303 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67T -chr3 Stellar eps-matches 1954 2103 98 - . 6;seq2Range=1,150;cigar=150M;mutations=12C,67G,93G -chr2 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr2 Stellar eps-matches 2170 2300 98.4732 + . 2;seq2Range=17,147;cigar=131M;mutations=7C,51T -chr2 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1125 1274 98 + . 1;seq2Range=2,150;cigar=1M1D148M;mutations=67A,141T -chr3 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr3 Stellar eps-matches 137 288 98.0263 - . 9;seq2Range=1,150;cigar=2D150M;mutations=111G -chr3 Stellar eps-matches 135 286 98.0263 - . 9;seq2Range=1,150;cigar=150M2D;mutations=111G -chr2 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr2 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr2 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 2147 2296 98 + . 3;seq2Range=1,150;cigar=150M;mutations=49T,121A,139G -chr3 Stellar eps-matches 1775 1924 98 - . 5;seq2Range=1,150;cigar=150M;mutations=12C,66A,101C -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 2482 2631 98 - . 9;seq2Range=1,150;cigar=150M;mutations=9C,79G,94G -chr2 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr2 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr1 Stellar eps-matches 858 1007 98 + . 4;seq2Range=1,150;cigar=150M;mutations=3G,32G,69C -chr1 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 14 163 98 - . 6;seq2Range=1,150;cigar=150M;mutations=72T,87T,90G -chr3 Stellar eps-matches 1601 1750 98 - . 7;seq2Range=1,150;cigar=150M;mutations=46T,47C,79T -chr3 Stellar eps-matches 1003 1152 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,111G,120T -chr3 Stellar eps-matches 1375 1524 98 + . 0;seq2Range=1,150;cigar=150M;mutations=87C,113A,136A -chr3 Stellar eps-matches 841 989 98 + . 1;seq2Range=1,150;cigar=1M1I148M;mutations=2G,103G,124T -chr3 Stellar eps-matches 753 902 98 - . 9;seq2Range=1,150;cigar=150M;mutations=56G,79A,94G -chr1 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr1 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr1 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr2 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr2 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr2 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr3 Stellar eps-matches 122 271 98 - . 6;seq2Range=1,150;cigar=150M;mutations=47C,72T,74C -chr3 Stellar eps-matches 556 705 98 - . 7;seq2Range=1,150;cigar=150M;mutations=110G,115G,123T -chr3 Stellar eps-matches 181 330 98 - . 8;seq2Range=1,150;cigar=150M;mutations=53C,61T,111G -chr1 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr1 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr1 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr2 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr2 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr3 Stellar eps-matches 283 432 98 + . 3;seq2Range=1,150;cigar=150M;mutations=63C,113A,139G -chr3 Stellar eps-matches 612 761 98 + . 4;seq2Range=1,150;cigar=150M;mutations=69G,74A,92G -chr3 Stellar eps-matches 495 644 98 - . 5;seq2Range=1,150;cigar=150M;mutations=14A,90G,124T -chr2 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr2 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr2 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A -chr3 Stellar eps-matches 559 708 98 + . 0;seq2Range=1,150;cigar=150M;mutations=15G,56C,113T -chr3 Stellar eps-matches 11 160 98 + . 1;seq2Range=1,150;cigar=150M;mutations=68A,79T,142T -chr3 Stellar eps-matches 654 803 98 + . 2;seq2Range=1,150;cigar=150M;mutations=16G,23C,67A diff --git a/test/data/dream/cli_test_output.sh b/test/data/dream/cli_test_output.sh index 740ca479..97721160 100755 --- a/test/data/dream/cli_test_output.sh +++ b/test/data/dream/cli_test_output.sh @@ -52,6 +52,6 @@ done stellar_out="stellar.gff" sed -n '1~4s/^@/>/p;2~4p' $query > query.fasta -stellar $ref_input query.fasta -e $er -l $pattern -o $stellar_out +stellar $ref_input query.fasta -e $er -l $pattern -o $stellar_out > /dev/null rm -r $VALIK_TMP diff --git a/test/data/search/cli_test_output.sh b/test/data/search/cli_test_output.sh index bd8b8c38..29049aff 100755 --- a/test/data/search/cli_test_output.sh +++ b/test/data/search/cli_test_output.sh @@ -23,9 +23,11 @@ do echo "Searching the IBF (w=$w, k=19) for an approximate local match of length $p with $e error(s)" echo "Potential matches overlap by $o bp" output="8bins"$w"window"$e"error"$p"pattern"$o"overlap.gff" - valik search --distribute --index ../build/8bins${w}window.ibf --query query.fq --output "$output" --error "$e" --pattern "$p" --overlap "$o" --tau "$tau" --p_max "$p_max" --threads 1 - rm "$output" - done + er=$( echo $e/$p | bc -l ) + #!TODO: test output creates command lists that can not be consolidated + valik search --distribute --index ../build/8bins${w}window.ibf --query query.fq --output "$output" --error-rate "$er" --pattern "$p" --overlap "$o" --tau "$tau" --p_max "$p_max" --threads 1 + rm "$output" + done done done done diff --git a/test/data/split/api_test_input.sh b/test/data/split/api_test_input.sh index 46e569e2..c2bd2922 100755 --- a/test/data/split/api_test_input.sh +++ b/test/data/split/api_test_input.sh @@ -27,6 +27,6 @@ do out_dir=write_out_${overlap}_${bins} mkdir -p ${out_dir} - valik split database.fasta --overlap ${overlap} --seg-count ${bins} --ref-meta ${out_dir}/reference_metadata.txt --seg-meta ${out_dir}/reference_segments.txt + valik split database.fasta --overlap ${overlap} --seg-count ${bins} --db-meta ${out_dir}/reference_metadata.txt --seg-meta ${out_dir}/reference_segments.txt done done diff --git a/test/data/split/cli_test_output.sh b/test/data/split/cli_test_output.sh index 7cc74b2b..c29899b8 100755 --- a/test/data/split/cli_test_output.sh +++ b/test/data/split/cli_test_output.sh @@ -63,7 +63,8 @@ do echo "Searching IBF with $errors errors" search_out="single/"$seg_overlap"overlap"$b"bins"$w"window"$errors"errors.gff" - valik search --distribute --index "$index" --query "$query" --output "$search_out" --error "$errors" --pattern "$pattern" --overlap "$pat_overlap" --tau "$tau" --p_max "$p_max" --ref-meta "$ref_meta" --seg-meta "$seg_meta" --threads 1 + error_rate=$(echo $errors/$pattern| bc -l ) + valik search --distribute --index "$index" --query "$query" --output "$search_out" --error-rate "$error_rate" --pattern "$pattern" --overlap "$pat_overlap" --tau "$tau" --p_max "$p_max" --ref-meta "$ref_meta" --seg-meta "$seg_meta" --threads 1 rm "$search_out" done done