This commit is contained in:
Lorenzo (Mec-iS)
2023-03-24 12:06:54 +09:00
parent 393cf15534
commit 074cfaf14f
+6 -3
View File
@@ -181,12 +181,15 @@ impl<'a, T: RealNumber + FloatNumber, M: Array2<T>> FastPair<'a, T, M> {
/// ///
/// Return order dissimilarities from closest to furthest /// Return order dissimilarities from closest to furthest
/// ///
#[allow(dead_code)] #[allow(dead_code)]
pub fn ordered_pairs(&self) -> std::vec::IntoIter<&PairwiseDistance<T>> { pub fn ordered_pairs(&self) -> std::vec::IntoIter<&PairwiseDistance<T>> {
// improvement: implement this to return `impl Iterator<Item = &PairwiseDistance<T>>` // improvement: implement this to return `impl Iterator<Item = &PairwiseDistance<T>>`
// need to implement trait `Iterator` for `Vec<&PairwiseDistance<T>>` // need to implement trait `Iterator` for `Vec<&PairwiseDistance<T>>`
let mut distances = self.distances.values().collect::<Vec<&PairwiseDistance<T>>>(); let mut distances = self
.distances
.values()
.collect::<Vec<&PairwiseDistance<T>>>();
distances.sort_by(|a, b| a.partial_cmp(b).unwrap()); distances.sort_by(|a, b| a.partial_cmp(b).unwrap());
distances.into_iter() distances.into_iter()
} }
@@ -631,7 +634,7 @@ mod tests_fastpair {
if previous == -1.0 { if previous == -1.0 {
previous = p.distance.unwrap(); previous = p.distance.unwrap();
} else { } else {
let current = p.distance.unwrap(); let current = p.distance.unwrap();
assert!(current >= previous); assert!(current >= previous);
previous = current; previous = current;
} }