Skip to content

Commit a53c68d

Browse files
committed
refactor: make examples use unspecialized version
1 parent 81541a5 commit a53c68d

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

examples/example.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use std::io::{stdout, BufWriter, Write};
33
use std::sync::Arc;
44

55
use anyhow::Result;
6-
use binseq::{bq, vbq};
7-
use binseq::{BinseqRecord, ParallelProcessor};
6+
use binseq::{BinseqReader, BinseqRecord, ParallelProcessor, ParallelReader};
87
use parking_lot::Mutex;
98

109
/// A struct for decoding BINSEQ data back to FASTQ format.
@@ -141,17 +140,11 @@ fn main() -> Result<()> {
141140
.unwrap_or("./data/subset.bq".to_string());
142141
let n_threads = std::env::args().nth(2).unwrap_or("1".to_string()).parse()?;
143142

143+
let reader = BinseqReader::new(&file)?;
144144
let writer = match_output(None)?;
145145
let proc = Decoder::new(writer);
146146

147-
if file.ends_with(".bq") {
148-
let reader = bq::MmapReader::new(&file)?;
149-
reader.process_parallel(proc.clone(), n_threads)?;
150-
} else if file.ends_with(".vbq") {
151-
let reader = vbq::MmapReader::new(&file)?;
152-
reader.process_parallel(proc.clone(), n_threads)?;
153-
}
154-
147+
reader.process_parallel(proc.clone(), n_threads)?;
155148
eprintln!("Read {} records", proc.num_records());
156149

157150
Ok(())

examples/parallel_processing.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{
88
};
99

1010
use anyhow::{bail, Result};
11-
use binseq::{bq, BinseqRecord, ParallelProcessor};
11+
use binseq::{bq, BinseqReader, BinseqRecord, ParallelProcessor, ParallelReader};
1212
use nucgen::Sequence;
1313

1414
#[derive(Clone, Default)]
@@ -43,7 +43,7 @@ impl ParallelProcessor for MyProcessor {
4343
}
4444

4545
fn mmap_processing(binseq_path: &str, n_threads: usize) -> Result<()> {
46-
let reader = bq::MmapReader::new(binseq_path)?;
46+
let reader = BinseqReader::new(binseq_path)?;
4747
let proc = MyProcessor::default();
4848
reader.process_parallel(proc.clone(), n_threads)?;
4949
Ok(())

0 commit comments

Comments
 (0)