more clippy fixes

clbarnes · Jan 18, 2024 · 7bb2855 · 7bb2855
1 parent 560c2d0
commit 7bb2855
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/nblast-rs/benches/bench.rs b/nblast-rs/benches/bench.rs
@@ -84,7 +84,9 @@ fn read_all_points() -> Vec<Vec<Point3>> {
     NAMES.iter().map(|n| read_points(n)).collect()
 }
 
-fn match_nonmatch(repeats: usize) -> (Vec<Vec<Point3>>, Vec<Vec<usize>>, Vec<Vec<usize>>) {
+pub type MatchNonmatch = (Vec<Vec<Point3>>, Vec<Vec<usize>>, Vec<Vec<usize>>);
+
+fn match_nonmatch(repeats: usize) -> MatchNonmatch {
     let n_csvs = NAMES.len();
     let mut out_points = Vec::with_capacity(n_csvs * repeats);
     let all_points = read_all_points();
@@ -98,7 +100,7 @@ fn match_nonmatch(repeats: usize) -> (Vec<Vec<Point3>>, Vec<Vec<usize>>, Vec<Vec
 
     let rng = Rng::with_seed(1991);
 
-    for rep in 0..repeats {
+    for (rep, nm) in nonmatches.iter_mut().enumerate() {
         let aug = PointAug::new_random(
             0.5,  // 500nm
             0.02, // 20nm
@@ -110,7 +112,7 @@ fn match_nonmatch(repeats: usize) -> (Vec<Vec<Point3>>, Vec<Vec<usize>>, Vec<Vec
             let global_p_idx = offset + p_idx;
             out_points.push(aug.augment_all(ps));
             matches[p_idx].push(global_p_idx);
-            nonmatches[rep].push(global_p_idx);
+            nm.push(global_p_idx);
         }
     }
 

diff --git a/nblast-rs/src/neurons/nabo.rs b/nblast-rs/src/neurons/nabo.rs
@@ -107,7 +107,7 @@ impl NaboTangentsAlphas {
             tree,
             points_tangents_alphas: points
                 .into_iter()
-                .zip(tangents_alphas.into_iter())
+                .zip(tangents_alphas)
                 .collect(),
         }
     }
@@ -122,7 +122,7 @@ impl NaboTangentsAlphas {
             tree,
             points_tangents_alphas: points
                 .into_iter()
-                .zip(tangents_alphas.into_iter())
+                .zip(tangents_alphas)
                 .collect(),
         }
     }

diff --git a/nblast-rs/src/smat.rs b/nblast-rs/src/smat.rs
@@ -594,21 +594,3 @@ fn log_odds_ratio(match_counts: Vec<Precision>, nonmatch_counts: Vec<Precision>)
         })
         .collect()
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    fn assert_slice_eq(test: &[Precision], reference: &[Precision]) {
-        let msg = format!("\ttest: {:?}\n\t ref: {:?}", test, reference);
-        if test.len() != reference.len() {
-            panic!("Slices have different length\n{}", msg);
-        }
-
-        for (test_val, ref_val) in test.iter().zip(reference.iter()) {
-            if (test_val - ref_val).abs() > Precision::EPSILON {
-                panic!("Slices mave mismatched values\n{}", msg)
-            }
-        }
-    }
-}