Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ctb committed Nov 4, 2024
1 parent 88a094d commit fa62f05
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -676,13 +676,10 @@ pub fn branchwater_calculate_gather_stats(
calc_ani_ci: bool,
confidence: Option<f64>,
) -> Result<InterimGatherResult> {
eprintln!("calc: {} ({}) {} ({})", query.scaled(), query.size(), match_mh.scaled(), match_mh.size());
//bp remaining in subtracted query
// bp remaining in subtracted query
let remaining_bp = (query.size() - match_size) * query.scaled() as usize;

// stats for this match vs original query
let (intersect_orig, _) = match_mh.intersection_size(orig_query).unwrap();
eprintln!("intersect: {}", intersect_orig);
let intersect_bp = (match_mh.scaled() * intersect_orig) as usize;
let f_orig_query = intersect_orig as f64 / orig_query.size() as f64;
let f_match_orig = intersect_orig as f64 / match_mh.size() as f64;
Expand Down Expand Up @@ -798,7 +795,6 @@ pub fn consume_query_by_gather(
threshold_hashes: u64,
gather_output: Option<String>,
) -> Result<()> {
eprintln!("XXX scaled {} ({}, {})", scaled, orig_query_mh.size(), orig_query_mh.scaled());
// Define the writer to stdout by default
let mut writer: Box<dyn Write> = Box::new(std::io::stdout());

Expand Down Expand Up @@ -842,9 +838,7 @@ pub fn consume_query_by_gather(
// let mut query_mh = KmerMinHashBTree::from(orig_query_mh.clone());
let mut query_mh = orig_query_mh.clone();

eprintln!("foo pre: {} ({}->{})", orig_query_mh.size(), orig_query_mh.scaled(), scaled);
let mut orig_query_ds = orig_query_mh.downsample_scaled(scaled)?;
eprintln!("foo: {} ({})", orig_query_ds.scaled(), orig_query_ds.size());

// track for full gather results
let mut sum_weighted_found = 0;
Expand Down

0 comments on commit fa62f05

Please sign in to comment.