Skip to content

Commit 55adfba

Browse files
committed
Add resolved boundaries to output and HTML
1 parent 1b838ab commit 55adfba

22 files changed

+234
-96
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d4c32b05884c5eef301cf4c80f569f39 dc_288f384eb041b0c6f4e81f18aa6f3acd 291.1 24-276
1+
d4c32b05884c5eef301cf4c80f569f39 dc_288f384eb041b0c6f4e81f18aa6f3acd 291.1 24-276 24-276
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-460 93-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-931 534-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-177 57-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-928 487-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-280 58-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-429 128-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-288,350-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-745,780-812,875-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-98,158-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-537,700-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-92,129-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-176,219-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-288,350-460 93-288,350-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-745,780-812,875-931 534-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-98,158-177 57-98,158-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-537,700-928 487-537,700-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-92,129-280 58-92,129-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-176,219-429 128-176,219-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-460 93-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-931 534-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-177 57-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-928 487-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-280 58-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-429 128-429
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-288,350-460 93-288,350-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-745,780-812,875-931 534-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 4bmdA02_round_3 14.8 57-92,154-180 57-82,159-180
5+
65d5daf26dc58455a709f4db2f429657 2le0A00_round_3 15.9 56-178 83-158
6+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387 183-387
7+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-537,700-928 487-537,700-928
8+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-92,129-280 58-92,129-280
9+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-176,219-429 128-176,219-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 108-273,365-445
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 494-662
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 549-730,789-802,890-916
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 69-85,163-171
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 198-372
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 502-522,715-913
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 68-82,144-265
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 142-161,234-414
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 108-273,365-445 93-288,350-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 494-662 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 549-730,789-802,890-916 534-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 69-85,163-171 57-98,158-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 198-372 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 502-522,715-913 487-537,700-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 68-82,144-265 58-92,129-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 142-161,234-414 128-176,219-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-175,189-197,199-211,213-252,255-280,283-288,350-351,363-403,414-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-517,520-520,530-573,583-595,597-646,655-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-697,704-705,722-745,780-812,875-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-98,158-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-537,700-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-88,91-92,129-140,146-192,194-221,223-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-176,219-235,256-314,316-352,354-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 39.5 93-175,189-197,199-211,213-252,255-280,283-288,350-351,363-403,414-460 93-175,189-197,199-211,213-252,255-280,283-288,350-351,363-403,414-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 17.7 479-517,520-520,530-573,583-595,597-646,655-677 479-517,520-520,530-573,583-595,597-646,655-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 22.3 534-697,704-705,722-745,780-812,875-931 534-697,704-705,722-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 16.9 57-98,158-177 57-98,158-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 233.9 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 12.1 487-537,700-928 487-537,700-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 23 58-88,91-92,129-140,146-192,194-221,223-280 58-88,91-92,129-140,146-192,194-221,223-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 16.5 128-176,219-235,256-314,316-352,354-429 128-176,219-235,256-314,316-352,354-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 9.812000e-13 93-288,350-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 4.159980e-06 479-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 1.662120e-07 534-745,780-812,875-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 7.282760e-06 57-98,158-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 7.815640e-72 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 2.096650e-04 487-537,700-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 1.018260e-07 58-92,129-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 9.636040e-06 128-176,219-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 9.812000e-13 93-288,350-460 93-288,350-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 4.159980e-06 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 1.662120e-07 534-745,780-812,875-931 534-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 7.282760e-06 57-98,158-177 57-98,158-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 7.815640e-72 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 2.096650e-04 487-537,700-928 487-537,700-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 1.018260e-07 58-92,129-280 58-92,129-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 9.636040e-06 128-176,219-429 128-176,219-429
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 0.00616143 93-288,350-460
2-
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 0.000554349 479-677
3-
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 0.00110863 534-745,780-812,875-931
4-
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 0.000482527 57-98,158-177
5-
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 1.2795 183-387
6-
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 0.000177095 487-537,700-928
7-
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 0.00121634 58-92,129-280
8-
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 0.000449069 128-176,219-429
1+
443cb81e8e280e529de69ef113974208 3ifqB00_round_3 0.00616143 93-288,350-460 93-288,350-460
2+
443cb81e8e280e529de69ef113974208 4ev8A00_round_3 0.000554349 479-677 479-677
3+
5e1ccef4ef9782ffd2979ae49ca232c8 2pygA00_round_3 0.00110863 534-745,780-812,875-931 534-745,780-812,875-931
4+
65d5daf26dc58455a709f4db2f429657 2cokA00_round_3 0.000482527 57-98,158-177 57-98,158-177
5+
98300abb63cbbe1df0ce443557c9e767 2f31A00_round_1 1.2795 183-387 183-387
6+
98300abb63cbbe1df0ce443557c9e767 3uunB00_round_3 0.000177095 487-537,700-928 487-537,700-928
7+
c6a53e4fda2270987ca6e8e89783a311 4mf0B00_round_3 0.00121634 58-92,129-280 58-92,129-280
8+
e309f37197edd3a5b6c85424e3d88fc1 1gcjA00_round_3 0.000449069 128-176,219-429 128-176,219-429

source/resolve_hits/cath_hit_resolver_test.cpp

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,17 @@ BOOST_AUTO_TEST_CASE(processes_from_stdin_to_output_file) {
134134
BOOST_CHECK_EQUAL( output_ss.str(), "" );
135135
istringstream expected_out_ss{ example_output };
136136
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( expected_out_ss, "expected_crh_output", TEMP_TEST_FILE_FILENAME );
137+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( expected_out_ss, "expected_crh_output", TEMP_TEST_FILE_FILENAME );
137138
}
138139

139140
BOOST_AUTO_TEST_CASE(does_not_require_right_intersperses_all_to_cache) {
140141
// Given an input that requires caching at the start of match_b whilst processing in match_a and match_c
141142
// even though match_b doesn't right intersperse match_c
142-
const string hits_str =
143+
const string input_hits_str =
143144
"query match_c 1 0-9,60-69\n"
144145
"query match_a 1 10-19,40-49\n"
145146
"query match_b 1 30-39,50-59\n";
146-
input_ss.str( hits_str );
147+
input_ss.str( input_hits_str );
147148

148149
// When calling perform_resolve_hits on that data with no trimming
149150
execute_perform_resolve_hits( {
@@ -153,7 +154,12 @@ BOOST_AUTO_TEST_CASE(does_not_require_right_intersperses_all_to_cache) {
153154
} );
154155

155156
// Then expect the output to be the same as the input
156-
BOOST_CHECK_EQUAL( output_ss.str(), hits_str );
157+
// (but with repeat of the boundaries for the resolved version)
158+
const string output_hits_str =
159+
"query match_c 1 0-9,60-69 0-9,60-69\n"
160+
"query match_a 1 10-19,40-49 10-19,40-49\n"
161+
"query match_b 1 30-39,50-59 30-39,50-59\n";
162+
BOOST_CHECK_EQUAL( output_ss.str(), output_hits_str );
157163
}
158164

159165
BOOST_AUTO_TEST_CASE(file_domtbl) {
@@ -162,6 +168,7 @@ BOOST_AUTO_TEST_CASE(file_domtbl) {
162168
} );
163169
istringstream istream_of_output{ output_ss.str() };
164170
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_EG_DOMTBL_OUT_FILENAME() );
171+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_DOMTBL_OUT_FILENAME() );
165172
}
166173

167174
BOOST_AUTO_TEST_CASE(file_hmmsearch) {
@@ -170,6 +177,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch) {
170177
} );
171178
istringstream istream_of_output{ output_ss.str() };
172179
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_OUT_FILENAME() );
180+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_OUT_FILENAME() );
173181
}
174182

175183
BOOST_AUTO_TEST_CASE(file_hmmsearch_big_gap) {
@@ -179,6 +187,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_big_gap) {
179187
} );
180188
istringstream istream_of_output{ output_ss.str() };
181189
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_GAP_OUT_FILENAME() );
190+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_GAP_OUT_FILENAME() );
182191
}
183192

184193
BOOST_AUTO_TEST_CASE(file_hmmsearch_small_gap) {
@@ -188,6 +197,7 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_small_gap) {
188197
} );
189198
istringstream istream_of_output{ output_ss.str() };
190199
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_SMALL_GAP_OUT_FILENAME() );
200+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_SMALL_GAP_OUT_FILENAME() );
191201
}
192202

193203
BOOST_AUTO_TEST_CASE(file_hmmsearch_trimmed) {
@@ -200,6 +210,16 @@ BOOST_AUTO_TEST_CASE(file_hmmsearch_trimmed) {
200210
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_TRIMMED_OUT_FILENAME() );
201211
}
202212

213+
BOOST_AUTO_TEST_CASE(file_hmmsearch_big_trim) {
214+
execute_perform_resolve_hits( {
215+
CRH_EG_HMMSEARCH_IN_FILENAME().string(), "--" + crh_input_options_block::PO_INPUT_FORMAT, to_string( hits_input_format_tag::HMMSEARCH_OUT ),
216+
"--" + crh_segment_options_block::PO_OVERLAP_TRIM_SPEC, "100/60"
217+
} );
218+
istringstream istream_of_output{ output_ss.str() };
219+
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL ( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_TRIM_OUT_FILENAME() );
220+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_HMMSEARCH_BIG_TRIM_OUT_FILENAME() );
221+
}
222+
203223
BOOST_AUTO_TEST_CASE(file_raw_evalue) {
204224
execute_perform_resolve_hits( {
205225
CRH_EG_RAW_EVALUE_IN_FILENAME().string(), "--" + crh_input_options_block::PO_INPUT_FORMAT, to_string( hits_input_format_tag::RAW_WITH_EVALUES ),
@@ -215,6 +235,7 @@ BOOST_AUTO_TEST_CASE(file_raw_score) {
215235
} );
216236
istringstream istream_of_output{ output_ss.str() };
217237
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_EG_RAW_SCORE_OUT_FILENAME() );
238+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_EG_RAW_SCORE_OUT_FILENAME() );
218239
}
219240

220241

@@ -226,6 +247,7 @@ BOOST_AUTO_TEST_CASE(handles_dc_correcctly) {
226247
} );
227248
istringstream istream_of_output{ output_ss.str() };
228249
BOOST_CHECK_ISTREAM_AND_FILE_EQUAL( istream_of_output, "got_ss", CRH_CATH_DC_HANDLING_DATA_DIR() / "dc_eg_domtblout.cath_rules.out" );
250+
// BOOST_CHECK_ISTREAM_AND_FILE_EQUAL_OR_OVERWRITE( istream_of_output, "got_ss", CRH_CATH_DC_HANDLING_DATA_DIR() / "dc_eg_domtblout.cath_rules.out" );
229251
}
230252

231253

0 commit comments

Comments
 (0)