From d08760e876f74f08274eb4a2d040547c8997a5c7 Mon Sep 17 00:00:00 2001 From: Taylor Henderson Date: Wed, 29 Jan 2025 12:42:01 -0500 Subject: [PATCH] fix test types --- src/main.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.rs b/src/main.rs index af43352..a03737b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -79,26 +79,26 @@ fn main() -> Result<(), Box> { #[cfg(test)] mod tests { - fn test_runner(k: usize, bd_pairs_vec: Vec<(f32, f32)>, answer_vec: Vec>) { + fn test_runner(k: usize, bd_pairs_vec: Vec<(f32, f32)>, answer_vec: &[Vec<(f32, f32)>]) { let bd_pairs = bd_pairs_vec .into_iter() .map(|(x, y)| fast_pl::birthdeath::BirthDeath { birth: x, death: y }) .collect(); - let answer: Vec> = answer_vec - .into_iter() - .map(|x| { - x.into_iter() - .map(|(x, y)| fast_pl::persistencelandscape::PointOrd { - x: float_ord::FloatOrd(x), - y: float_ord::FloatOrd(y), - }) - .collect() - }) - .collect(); + // let answer: Vec> = answer_vec + // .into_iter() + // .map(|x| { + // x.into_iter() + // .map(|(x, y)| fast_pl::persistencelandscape::PointOrd { + // x: float_ord::FloatOrd(x), + // y: float_ord::FloatOrd(y), + // }) + // .collect() + // }) + // .collect(); let filtered_pairs = fast_pl::barcode::filter(bd_pairs, k); let landscape = fast_pl::persistencelandscape::generate(filtered_pairs, k, false); - assert!(answer == landscape); + assert!(answer_vec == landscape); } #[test] @@ -111,7 +111,7 @@ mod tests { vec![(2.0, 0.0), (2.5, 0.5), (3.0, 0.0)], vec![], ]; - test_runner(k, bd_pairs_vec, answer_vec); + test_runner(k, bd_pairs_vec, &answer_vec); } #[test] fn head_to_tail() { @@ -128,6 +128,6 @@ mod tests { ], vec![], ]; - test_runner(k, bd_pairs_vec, answer_vec); + test_runner(k, bd_pairs_vec, &answer_vec); } }