diff --git a/include/valik/shared.hpp b/include/valik/shared.hpp index 48d714a6..cb0ea201 100644 --- a/include/valik/shared.hpp +++ b/include/valik/shared.hpp @@ -66,6 +66,7 @@ struct split_arguments uint8_t errors{0}; uint8_t kmer_size{20}; size_t threshold{}; + bool metagenome{false}; std::filesystem::path ref_meta_path{}; bool write_out{false}; bool only_split{false}; diff --git a/include/valik/split/metadata.hpp b/include/valik/split/metadata.hpp index 9c87e061..b6b097c3 100644 --- a/include/valik/split/metadata.hpp +++ b/include/valik/split/metadata.hpp @@ -11,6 +11,9 @@ #include #include +#include +#include + namespace valik { @@ -55,12 +58,25 @@ struct metadata size_t ind; uint64_t len; + constexpr sequence_stats() noexcept = default; + constexpr sequence_stats(sequence_stats const &) noexcept = default; + constexpr sequence_stats(sequence_stats &&) noexcept = default; + constexpr sequence_stats & operator=(sequence_stats const &) noexcept = default; + constexpr sequence_stats & operator=(sequence_stats &&) noexcept = default; + ~sequence_stats() noexcept = default; + sequence_stats(std::string const fasta_id, size_t const fasta_ind, uint64_t const seq_length) { id = fasta_id; ind = fasta_ind; len = seq_length; } + + template + void serialize(Archive & archive) + { + archive(id, ind, len); + } }; struct length_order @@ -87,6 +103,13 @@ struct metadata uint64_t start; uint64_t len; + constexpr segment_stats() noexcept = default; + constexpr segment_stats(segment_stats const &) noexcept = default; + constexpr segment_stats(segment_stats &&) noexcept = default; + constexpr segment_stats & operator=(segment_stats const &) noexcept = default; + constexpr segment_stats & operator=(segment_stats &&) noexcept = default; + ~segment_stats() noexcept = default; + segment_stats(size_t const i, size_t const ind, uint64_t const s, uint64_t const l) { id = i; @@ -106,6 +129,12 @@ struct metadata { return std::to_string(seq_ind) + "_" + std::to_string(start) + "_" + std::to_string(len); } + + template + void serialize(Archive & archive) + { + archive(id, seq_ind, start, len); + } }; struct fasta_order @@ -326,45 +355,9 @@ struct metadata */ metadata(std::filesystem::path const & filepath) { - std::ifstream in_file(filepath); - if (in_file.is_open()) - { - std::string seq_meta; - std::getline(in_file, seq_meta, '$'); - std::stringstream seq_str(seq_meta); - - std::string seq_id, fasta_ind, length; - total_len = 0; - while(std::getline(seq_str, seq_id, '\t')) - { - std::getline(seq_str, fasta_ind, '\t'); - std::getline(seq_str, length, '\n'); - total_len += stoi(length); - sequences.push_back(sequence_stats(seq_id, stoi(fasta_ind), stoi(length))); - } - - std::string seg_meta; - std::getline(in_file, seg_meta); // newline - std::getline(in_file, seg_meta, '$'); - std::stringstream seg_str(seg_meta); - - size_t id, seq_ind, start; - while (seg_str >> id) - { - seg_str >> seq_ind; - seg_str >> start; - seg_str >> length; - - add_segment(id, seq_ind, start, stoi(length)); - } - } - - in_file.close(); - seq_count = sequences.size(); - seg_count = segments.size(); + load(filepath); } - /** * @brief Function that returns the numerical index of a sequence based on its fasta ID. * @@ -407,28 +400,34 @@ struct metadata } /** - * @brief Function that serializes the metadata struct. + * @brief Serialize the metadata struct. * * @param filepath Output file path. */ - void to_file(std::filesystem::path const & filepath) + void save(std::filesystem::path const & filepath) const { - std::ofstream out_file; - out_file.open(filepath); - - stream_out(out_file); - - out_file.close(); + std::ofstream os(filepath, std::ios::binary); + cereal::BinaryOutputArchive archive(os); + archive(total_len, sequences, segments); } - + /** - * @brief Function that streams out the metadata table. + * @brief Deserialise the metadata struct. * - * @param out_str Output stream. + * @param filepath Input file path. */ - template - void stream_out(str_t & out_str) + void load(std::filesystem::path const & filepath) + { + std::ifstream is(filepath, std::ios::binary); + cereal::BinaryInputArchive archive(is); + archive(total_len, sequences, segments); + seq_count = sequences.size(); + seg_count = segments.size(); + } + + std::string to_string() { + std::stringstream out_str; for (sequence_stats const & seq : sequences) out_str << seq.id << '\t' << seq.ind << '\t' << seq.len << '\n'; @@ -438,6 +437,8 @@ struct metadata out_str << seg.id << '\t' << seg.seq_ind << '\t' << seg.start << '\t' << seg.len << '\n'; out_str << "$\n"; + + return out_str.str(); } double segment_length_stdev() diff --git a/src/argument_parsing/split.cpp b/src/argument_parsing/split.cpp index e1a2f4eb..efae81ff 100644 --- a/src/argument_parsing/split.cpp +++ b/src/argument_parsing/split.cpp @@ -10,7 +10,7 @@ void init_split_parser(sharg::parser & parser, split_arguments & arguments) { init_shared_meta(parser); parser.add_positional_option(arguments.seq_file, - sharg::config{.description = "File containing database sequences.", + sharg::config{.description = "File containing database sequences. If splitting --metagenome provide a list of cluster paths.", .validator = sharg::input_file_validator{}}); parser.add_option(arguments.meta_out, sharg::config{.short_id = 'o', @@ -41,6 +41,10 @@ void init_split_parser(sharg::parser & parser, split_arguments & arguments) sharg::config{.short_id = '\0', .long_id = "split-index", .description = "Adjust the suggested segment count to create a multiple of 64 segments instead. This is suitable for building an IBF."}); + parser.add_flag(arguments.metagenome, + sharg::config{.short_id = '\0', + .long_id = "metagenome", + .description = "Split a clustered metagenome database. Reference input is a list of cluster paths"}); parser.add_option(arguments.ref_meta_path, sharg::config{.short_id = '\0', .long_id = "ref-meta", @@ -78,6 +82,9 @@ void run_split(sharg::parser & parser) arguments.meta_out.replace_extension("meta"); } + if (!arguments.split_index && arguments.metagenome) + arguments.split_index = true; + if (!arguments.split_index && !arguments.only_split && !parser.is_option_set("ref-meta")) throw sharg::parser_error{"Need to provide path to reference metadata to process a query database."}; diff --git a/src/valik_split.cpp b/src/valik_split.cpp index 5724c6e1..7d0ae8a3 100644 --- a/src/valik_split.cpp +++ b/src/valik_split.cpp @@ -19,7 +19,8 @@ void valik_split(split_arguments & arguments) } metadata meta(arguments); - meta.to_file(arguments.meta_out); + meta.save(arguments.meta_out); + if (!arguments.only_split) { // ========================================== @@ -91,9 +92,9 @@ void valik_split(split_arguments & arguments) if (arguments.write_out) { if (arguments.split_index) - write_reference_segments(meta, arguments.meta_out); + write_reference_segments(meta, arguments.seq_file); else - write_query_segments(meta, arguments.meta_out); + write_query_segments(meta, arguments.seq_file); } } diff --git a/test/api/valik/split/write_seg_sequences_test.cpp b/test/api/valik/split/write_seg_sequences_test.cpp index 3fa34be7..b5217811 100644 --- a/test/api/valik/split/write_seg_sequences_test.cpp +++ b/test/api/valik/split/write_seg_sequences_test.cpp @@ -58,14 +58,6 @@ static void const test_reference_out(size_t overlap, size_t bins) } } -TEST(write_ref_sequences, o0_b4) -{ - size_t overlap = 0; - size_t bins = 4; - - test_reference_out(overlap, bins); -} - TEST(write_ref_sequences, o20_b4) { size_t overlap = 20; @@ -74,14 +66,6 @@ TEST(write_ref_sequences, o20_b4) test_reference_out(overlap, bins); } -TEST(write_ref_sequences, o0_b16) -{ - size_t overlap = 0; - size_t bins = 16; - - test_reference_out(overlap, bins); -} - TEST(write_ref_sequences, o20_b16) { size_t overlap = 20; @@ -123,14 +107,6 @@ static void const test_query_out(size_t overlap, size_t bins) } } -TEST(write_query_sequences, o0_b4) -{ - size_t overlap = 0; - size_t bins = 4; - - test_query_out(overlap, bins); -} - TEST(write_query_sequences, o20_b4) { size_t overlap = 20; @@ -139,14 +115,6 @@ TEST(write_query_sequences, o20_b4) test_query_out(overlap, bins); } -TEST(write_query_sequences, o0_b16) -{ - size_t overlap = 0; - size_t bins = 16; - - test_query_out(overlap, bins); -} - TEST(write_query_sequences, o20_b16) { size_t overlap = 20; diff --git a/test/cli/valik_test.cpp b/test/cli/valik_test.cpp index ba06a3cc..b63c1dd8 100644 --- a/test/cli/valik_test.cpp +++ b/test/cli/valik_test.cpp @@ -55,17 +55,19 @@ TEST_P(valik_split_various, split_various_lengths) cli_test_result const result = execute_app("valik", "split", data("various_chromosome_lengths.fasta"), - "--out reference_metadata.txt", + "--out query_metadata.txt", "--seg-count ", std::to_string(seg_count), "--pattern ", std::to_string(overlap), "--ref-meta ", segment_metadata_path(150, 4)); EXPECT_EQ(result.exit_code, 0); EXPECT_EQ(result.out, std::string{}); - EXPECT_EQ(result.err, std::string{"Sequence: chr5 is too short and will be skipped.\n"}); - std::string const expected_segments = string_from_file(segment_metadata_path(overlap, seg_count), std::ios::binary); - std::string const actual_segments = string_from_file("reference_metadata.txt", std::ios::binary); - EXPECT_TRUE(expected_segments == actual_segments); + EXPECT_EQ(result.err, std::string{"Sequence: chr5 is too short and will be skipped.\n"}); + auto expected_segments = valik::metadata(segment_metadata_path(overlap, seg_count)); + std::string expected_segment_str = expected_segments.to_string(); + auto actual_segments = valik::metadata("query_metadata.txt"); + std::string actual_segment_str = actual_segments.to_string(); + EXPECT_TRUE(expected_segment_str == actual_segment_str); } diff --git a/test/data/consolidate/16bins50overlap_reference_metadata.tsv b/test/data/consolidate/16bins50overlap_reference_metadata.tsv index 54fa697b..501992be 100644 Binary files a/test/data/consolidate/16bins50overlap_reference_metadata.tsv and b/test/data/consolidate/16bins50overlap_reference_metadata.tsv differ diff --git a/test/data/consolidate/8bins50overlap_reference_metadata.tsv b/test/data/consolidate/8bins50overlap_reference_metadata.tsv index 3f025ac5..dcca8fb9 100644 Binary files a/test/data/consolidate/8bins50overlap_reference_metadata.tsv and b/test/data/consolidate/8bins50overlap_reference_metadata.tsv differ diff --git a/test/data/consolidate/api_test_input.sh b/test/data/consolidate/api_test_input.sh index 83952cf4..78cd90a0 100755 --- a/test/data/consolidate/api_test_input.sh +++ b/test/data/consolidate/api_test_input.sh @@ -66,10 +66,9 @@ min_len=50 for bin in 8 16 do - valik split $ref_file --out ${bin}bins${min_len}overlap_reference_metadata.tsv --seg-count $bin --pattern $min_len --without-parameter-tuning - - tail -n $((bin + 1)) ${bin}bins${min_len}overlap_reference_metadata.tsv | head -n $bin > segments.tsv - while read -r bin_id id start len; + valik split $ref_file --out ${bin}bins${min_len}overlap_reference_metadata.tsv --seg-count $bin --pattern $min_len --without-parameter-tuning --write-out + grep ">" multi_seq_ref.segments.fasta | cut -c 2- | awk -F'_' '{print $1 "\t" $2 "\t" $3}' > segments.tsv + while read -r id start len; do end=$(echo $start + $len | bc) stellar -e $error_rate -l $min_len -o multi_seq_ref_${id}_${start}_${len}.gff \ @@ -78,8 +77,7 @@ do done < segments.tsv - rm segments.tsv - + rm segments.tsv multi_seq_ref.segments.fasta cat multi_seq_ref_*.gff > ${bin}bins${min_len}overlap_dream_all.gff rm multi_seq_ref_* diff --git a/test/data/datasources.cmake b/test/data/datasources.cmake index 34a0e11b..16e7cf4a 100644 --- a/test/data/datasources.cmake +++ b/test/data/datasources.cmake @@ -36,7 +36,7 @@ declare_datasource (FILE 150overlap16bins15window.ibf URL_HASH SHA256=fde51c6b696e5b0e1904fd20c9396385f0e1770beb24e9a6c63de57cdc9ae9e8) declare_datasource (FILE 150overlap16bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/single/150overlap16bins.txt - URL_HASH SHA256=c019d484423e2f39120992e0ef619326b8d7f6d9f46801f83f4cb676e2fd3361) + URL_HASH SHA256=8ea007cef91e864f91ec2cdf34b6e447fa99fe75bc0ecb2232d66cd115b9167b) declare_datasource (FILE 150overlap4bins13window1errors.gff.out URL ${CMAKE_SOURCE_DIR}/test/data/split/single/150overlap4bins13window1errors.gff.out URL_HASH SHA256=d45982f54310c2037e3b75da6cfff62179eff043d41e4987a575f0727415c4ea) @@ -51,35 +51,23 @@ declare_datasource (FILE 150overlap4bins15window.ibf URL_HASH SHA256=f38d6f8c9bbeb9eaf55690e979a32517b7963673a8b23433308db8b92333bf4a) declare_datasource (FILE 150overlap4bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/single/150overlap4bins.txt - URL_HASH SHA256=07e7b628760e3d6d3df88f28006c2416ab079d6cb3c8c9032d1538209e3d7eff) + URL_HASH SHA256=a6ab97f228987062cc7e77c23d119b27452a39c6faa08aea31e5f91b81d30d00) -declare_datasource (FILE 0overlap16bins.txt - URL ${CMAKE_SOURCE_DIR}/test/data/split/multi/0overlap16bins.txt - URL_HASH SHA256=981d9d686a99586d405d7939dcd758477c079c0e6779cd95829605f466d15baa) -declare_datasource (FILE 0overlap4bins.txt - URL ${CMAKE_SOURCE_DIR}/test/data/split/multi/0overlap4bins.txt - URL_HASH SHA256=c769012bdccd3a918c6e47a1e9bc6f3988d085babc591bfa5461982156cd4188) declare_datasource (FILE 20overlap16bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/multi/20overlap16bins.txt - URL_HASH SHA256=995f3f151b97bedb9d596bfe41f17deb54f5bf53f5065defb45f9828956665fc) + URL_HASH SHA256=a55fc883fa4af6813c30d04d8905c62f0caf35ffb2280bf84d27005fd944d4d0) declare_datasource (FILE 20overlap4bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/multi/20overlap4bins.txt - URL_HASH SHA256=c769012bdccd3a918c6e47a1e9bc6f3988d085babc591bfa5461982156cd4188) + URL_HASH SHA256=1d6a2be612c4dfd2d84dbd883fb8e1fd14fdb2d65d772ddb5f6ca21abed897ab) -declare_datasource (FILE write_out_0_16_reference_metadata.txt - URL ${CMAKE_SOURCE_DIR}/test/data/split/write_out_0_16/reference_metadata.txt - URL_HASH SHA256=981d9d686a99586d405d7939dcd758477c079c0e6779cd95829605f466d15baa) -declare_datasource (FILE write_out_0_4_reference_metadata.txt - URL ${CMAKE_SOURCE_DIR}/test/data/split/write_out_0_4/reference_metadata.txt - URL_HASH SHA256=c769012bdccd3a918c6e47a1e9bc6f3988d085babc591bfa5461982156cd4188) declare_datasource (FILE write_out_20_16_reference_metadata.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/write_out_20_16/reference_metadata.txt - URL_HASH SHA256=995f3f151b97bedb9d596bfe41f17deb54f5bf53f5065defb45f9828956665fc) + URL_HASH SHA256=a55fc883fa4af6813c30d04d8905c62f0caf35ffb2280bf84d27005fd944d4d0) declare_datasource (FILE write_out_20_4_reference_metadata.txt URL ${CMAKE_SOURCE_DIR}/test/data/split/write_out_20_4/reference_metadata.txt - URL_HASH SHA256=c769012bdccd3a918c6e47a1e9bc6f3988d085babc591bfa5461982156cd4188) + URL_HASH SHA256=1d6a2be612c4dfd2d84dbd883fb8e1fd14fdb2d65d772ddb5f6ca21abed897ab) declare_datasource (FILE 8bins19window.ibf URL ${CMAKE_SOURCE_DIR}/test/data/build/8bins19window.ibf URL_HASH SHA256=3a13c890650bf857770816244ed9420295ad8bbe681dac335f687863fc79a603) @@ -167,18 +155,19 @@ declare_datasource (FILE query.fq URL ${CMAKE_SOURCE_DIR}/test/data/search/query.fq URL_HASH SHA256=65fbd58c14ca2b4c2274f44fff14dbfce54dc04a89cf6759e1a69cecba933130) + declare_datasource (FILE 16bins50overlap_dream_all.gff URL ${CMAKE_SOURCE_DIR}/test/data/consolidate/16bins50overlap_dream_all.gff URL_HASH SHA256=3ecd0e55e704cfd71442bd16805fe587de720e646cbe2d13675ed6249b30045f) declare_datasource (FILE 16bins50overlap_reference_metadata.tsv URL ${CMAKE_SOURCE_DIR}/test/data/consolidate/16bins50overlap_reference_metadata.tsv - URL_HASH SHA256=296b7020ec5cdd78d75464dcaec82cbced9a32a22a92b857792a2a01e67effa0) + URL_HASH SHA256=c9a8da0a50975f667ef270097564ab43af6effa51028533a3e4cbe0d9487bbda) declare_datasource (FILE 8bins50overlap_dream_all.gff URL ${CMAKE_SOURCE_DIR}/test/data/consolidate/8bins50overlap_dream_all.gff URL_HASH SHA256=f03c93ddb758a7e9ef89e3243dca9fb49b97a1ba3239408ffc30f8ff486982c8) declare_datasource (FILE 8bins50overlap_reference_metadata.tsv URL ${CMAKE_SOURCE_DIR}/test/data/consolidate/8bins50overlap_reference_metadata.tsv - URL_HASH SHA256=22ff51c797d739ebb2c12332ca7067550e191c2c5fe75ad54cb680f38e423eb5) + URL_HASH SHA256=881a3bdad31eb9ecdc5f8da7796411627ccaa152380020e7fb19ed17bf046b26) declare_datasource (FILE multi_seq_query.fasta URL ${CMAKE_SOURCE_DIR}/test/data/consolidate/multi_seq_query.fasta URL_HASH SHA256=6d1260dc701802924487453c19715044cbeaa0f42021be8f2996bbaac1f24c58) @@ -252,7 +241,7 @@ declare_datasource (FILE query_meta.txt URL_HASH SHA256=1eb7e99026c694bddfdd61125084264d1b2a526a174aae5c8422c418a29ad9f0) declare_datasource (FILE query_seg_meta.txt URL ${CMAKE_SOURCE_DIR}/test/data/dream/query_seg_meta.txt - URL_HASH SHA256=4eea1ab7f93165dbfec9baa509a9b4d2e4deda0047da79ebcc55a5c7b2982dac) + URL_HASH SHA256=f307b39d1ec37cb347f2190a741bdd5008ee8af4347e710011fb9e39f7020de2) declare_datasource (FILE ref.fasta URL ${CMAKE_SOURCE_DIR}/test/data/dream/ref.fasta URL_HASH SHA256=47f808d207c4c90afebbe1c8ab28990ec0e3e777c75ec787099279005428f3da) @@ -261,10 +250,10 @@ declare_datasource (FILE ref_meta.txt URL_HASH SHA256=cfaea330c4abde12e75cec5ae8b74ffd985d2b1d4ad1620b72e064f17488e1d5) declare_datasource (FILE seg_meta150overlap16bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/dream/seg_meta150overlap16bins.txt - URL_HASH SHA256=fae21b4e8f3ac79d6afe30392a33c906bc6d13cfce453306fb691bc85f903379) + URL_HASH SHA256=8983a3f02e89fd271682f68bb49f19d67efa938b78f90332d0ebf514defccf74) declare_datasource (FILE seg_meta150overlap4bins.txt URL ${CMAKE_SOURCE_DIR}/test/data/dream/seg_meta150overlap4bins.txt - URL_HASH SHA256=fb54ed4ec95d134f07e78ad3fd348e379d95fa11f29e5215dd76d509211ff324) + URL_HASH SHA256=1b833949d7cff65ccea1cb9cf3681db6f8e7dd890e096bd3f9e984b8acd05d95) declare_datasource (FILE stellar.gff URL ${CMAKE_SOURCE_DIR}/test/data/dream/stellar.gff URL_HASH SHA256=01993f28b0973e612a7cc3e84abdbe551c9b47a6cc7507106ff4b48071c21613) diff --git a/test/data/dream/query_seg_meta.txt b/test/data/dream/query_seg_meta.txt index c7a9dd48..64433e7b 100644 Binary files a/test/data/dream/query_seg_meta.txt and b/test/data/dream/query_seg_meta.txt differ diff --git a/test/data/dream/seg_meta150overlap16bins.txt b/test/data/dream/seg_meta150overlap16bins.txt index e55193c6..2abea4b1 100644 Binary files a/test/data/dream/seg_meta150overlap16bins.txt and b/test/data/dream/seg_meta150overlap16bins.txt differ diff --git a/test/data/dream/seg_meta150overlap4bins.txt b/test/data/dream/seg_meta150overlap4bins.txt index 93892d61..43cf8233 100644 Binary files a/test/data/dream/seg_meta150overlap4bins.txt and b/test/data/dream/seg_meta150overlap4bins.txt differ diff --git a/test/data/segments.tsv b/test/data/segments.tsv new file mode 100644 index 00000000..0d594993 --- /dev/null +++ b/test/data/segments.tsv @@ -0,0 +1,16 @@ +0 0 305 +0 255 305 +1 0 305 +1 255 305 +2 0 305 +2 255 305 +3 0 257 +3 207 257 +4 0 257 +4 207 257 +5 0 257 +5 207 257 +6 0 257 +6 207 257 +7 0 340 +7 290 340 diff --git a/test/data/split/multi/0overlap16bins.txt b/test/data/split/multi/0overlap16bins.txt deleted file mode 100644 index e1e97c4d..00000000 --- a/test/data/split/multi/0overlap16bins.txt +++ /dev/null @@ -1,23 +0,0 @@ -chr1 0 210 -chr2 1 490 -chr3 2 420 -chr4 3 280 -chr5 4 4 -$ -0 0 0 105 -1 0 105 105 -2 1 0 82 -3 1 82 82 -4 1 164 82 -5 1 246 82 -6 1 328 82 -7 1 410 80 -8 2 0 84 -9 2 84 84 -10 2 168 84 -11 2 252 84 -12 2 336 84 -13 3 0 94 -14 3 94 94 -15 3 188 92 -$ diff --git a/test/data/split/multi/0overlap4bins.txt b/test/data/split/multi/0overlap4bins.txt deleted file mode 100644 index 63779da1..00000000 --- a/test/data/split/multi/0overlap4bins.txt +++ /dev/null @@ -1,11 +0,0 @@ -chr1 0 210 -chr2 1 490 -chr3 2 420 -chr4 3 280 -chr5 4 4 -$ -0 0 0 210 -1 1 0 490 -2 2 0 420 -3 3 0 280 -$ diff --git a/test/data/split/multi/20overlap16bins.txt b/test/data/split/multi/20overlap16bins.txt index 5622883d..d143388a 100644 Binary files a/test/data/split/multi/20overlap16bins.txt and b/test/data/split/multi/20overlap16bins.txt differ diff --git a/test/data/split/multi/20overlap4bins.txt b/test/data/split/multi/20overlap4bins.txt index 63779da1..0ca6fd3e 100644 Binary files a/test/data/split/multi/20overlap4bins.txt and b/test/data/split/multi/20overlap4bins.txt differ diff --git a/test/data/split/single/150overlap16bins.txt b/test/data/split/single/150overlap16bins.txt index 21e14870..ae5661da 100644 Binary files a/test/data/split/single/150overlap16bins.txt and b/test/data/split/single/150overlap16bins.txt differ diff --git a/test/data/split/single/150overlap4bins.txt b/test/data/split/single/150overlap4bins.txt index eda1424a..7bd8eb1d 100644 Binary files a/test/data/split/single/150overlap4bins.txt and b/test/data/split/single/150overlap4bins.txt differ diff --git a/test/data/split/write_out_0_16/reference_metadata.txt b/test/data/split/write_out_0_16/reference_metadata.txt deleted file mode 100644 index e1e97c4d..00000000 --- a/test/data/split/write_out_0_16/reference_metadata.txt +++ /dev/null @@ -1,23 +0,0 @@ -chr1 0 210 -chr2 1 490 -chr3 2 420 -chr4 3 280 -chr5 4 4 -$ -0 0 0 105 -1 0 105 105 -2 1 0 82 -3 1 82 82 -4 1 164 82 -5 1 246 82 -6 1 328 82 -7 1 410 80 -8 2 0 84 -9 2 84 84 -10 2 168 84 -11 2 252 84 -12 2 336 84 -13 3 0 94 -14 3 94 94 -15 3 188 92 -$ diff --git a/test/data/split/write_out_0_4/reference_metadata.txt b/test/data/split/write_out_0_4/reference_metadata.txt deleted file mode 100644 index 63779da1..00000000 --- a/test/data/split/write_out_0_4/reference_metadata.txt +++ /dev/null @@ -1,11 +0,0 @@ -chr1 0 210 -chr2 1 490 -chr3 2 420 -chr4 3 280 -chr5 4 4 -$ -0 0 0 210 -1 1 0 490 -2 2 0 420 -3 3 0 280 -$ diff --git a/test/data/split/write_out_20_16/reference_metadata.txt b/test/data/split/write_out_20_16/reference_metadata.txt index 5622883d..d143388a 100644 Binary files a/test/data/split/write_out_20_16/reference_metadata.txt and b/test/data/split/write_out_20_16/reference_metadata.txt differ diff --git a/test/data/split/write_out_20_4/reference_metadata.txt b/test/data/split/write_out_20_4/reference_metadata.txt index 63779da1..0ca6fd3e 100644 Binary files a/test/data/split/write_out_20_4/reference_metadata.txt and b/test/data/split/write_out_20_4/reference_metadata.txt differ