Skip to content

Commit 6e5f334

Browse files
committed
update on current main
1 parent 380839f commit 6e5f334

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

include/bio/format/sam_input_handler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class format_input_handler<sam> : public format_input_handler_base<format_input_
5151

5252
/* RAW RECORD HANDLING*/
5353
using format_fields = decltype(map_io::default_field_ids);
54-
using raw_record_type = detail::record_from_typelist<format_fields,
54+
using raw_record_type = bio::record<format_fields,
5555
seqan3::list_traits::repeat<format_fields::size, std::string_view>>;
5656

5757
//!\brief Type of the low-level iterator.

test/unit/format/sam_file_format_test_template.hpp

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ using seqan3::operator""_phred42;
3030
using seqan3::operator""_tag;
3131

3232
// global variables for reuse
33-
seqan3::sam_file_input_options<seqan3::dna5> input_options;
34-
seqan3::sam_file_output_options output_options;
33+
bio::map_io::reader_options default_options{};
3534

3635
struct sam_file_data : public ::testing::Test
3736
{
@@ -175,10 +174,7 @@ TYPED_TEST_P(sam_file_read, full_data_set)
175174

176175
// read data
177176
typename TestFixture::stream_type istream{this->verbose_reads_input};
178-
using record_t =
179-
bio::detail::record_from_typelist<std::remove_cvref_t<decltype(bio::map_io::default_field_ids)>,
180-
std::remove_cvref_t<decltype(bio::map_io::field_types_sam<>)>>;
181-
bio::map_io::reader_options default_options{};
177+
using record_t = bio::record<decltype(default_options.field_ids), decltype(default_options.field_types)>;
182178
bio::format_input_handler<bio::sam> input_handler{istream, default_options};
183179
record_t rec;
184180

@@ -205,10 +201,7 @@ TYPED_TEST_P(sam_file_read, all_missing_data)
205201
{
206202
typename TestFixture::stream_type istream{this->empty_input};
207203

208-
using record_t =
209-
bio::detail::record_from_typelist<std::remove_cvref_t<decltype(bio::map_io::default_field_ids)>,
210-
std::remove_cvref_t<decltype(bio::map_io::field_types_sam<>)>>;
211-
bio::map_io::reader_options default_options{};
204+
using record_t = bio::record<decltype(default_options.field_ids), decltype(default_options.field_types)>;
212205
bio::format_input_handler<bio::sam> input_handler{istream, default_options};
213206
record_t rec;
214207

@@ -236,9 +229,7 @@ TYPED_TEST_P(sam_file_read, select_fields)
236229
constexpr auto fid = bio::vtag<bio::field::rname, bio::field::pos>;
237230
constexpr auto ftype = bio::ttag<std::string_view, int64_t>;
238231

239-
using record_t =
240-
bio::detail::record_from_typelist<std::remove_cvref_t<decltype(fid)>, std::remove_cvref_t<decltype(ftype)>>;
241-
bio::map_io::reader_options default_options{};
232+
using record_t = bio::record<std::remove_cvref_t<decltype(fid)>, std::remove_cvref_t<decltype(ftype)>>;
242233
bio::format_input_handler<bio::sam> input_handler{istream, default_options};
243234
record_t rec;
244235

0 commit comments

Comments
 (0)