From 49487bccd3e6df126d156ab9a1587da8b4524983 Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Wed, 11 Nov 2020 22:08:57 -0400 Subject: [PATCH] Rename trait function --- src/math/vector.rs | 10 +++++----- src/metrics/cluster_helpers.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/math/vector.rs b/src/math/vector.rs index 14e1925..62cf63b 100644 --- a/src/math/vector.rs +++ b/src/math/vector.rs @@ -3,11 +3,11 @@ use std::collections::HashMap; use crate::linalg::BaseVector; pub trait RealNumberVector { - fn unique(&self) -> (Vec, Vec); + fn unique_with_indices(&self) -> (Vec, Vec); } impl> RealNumberVector for V { - fn unique(&self) -> (Vec, Vec) { + fn unique_with_indices(&self) -> (Vec, Vec) { let mut unique = self.to_vec(); unique.sort_by(|a, b| a.partial_cmp(b).unwrap()); unique.dedup(); @@ -28,14 +28,14 @@ impl> RealNumberVector for V { #[cfg(test)] mod tests { - use super::RealNumberVector; + use super::*; #[test] - fn unique() { + fn unique_with_indices() { let v1 = vec![0.0, 0.0, 1.0, 1.0, 2.0, 0.0, 4.0]; assert_eq!( (vec!(0.0, 1.0, 2.0, 4.0), vec!(0, 0, 1, 1, 2, 0, 3)), - v1.unique() + v1.unique_with_indices() ); } } diff --git a/src/metrics/cluster_helpers.rs b/src/metrics/cluster_helpers.rs index dd5bbb3..8d1e17e 100644 --- a/src/metrics/cluster_helpers.rs +++ b/src/metrics/cluster_helpers.rs @@ -7,8 +7,8 @@ pub fn contingency_matrix( labels_true: &Vec, labels_pred: &Vec, ) -> Vec> { - let (classes, class_idx) = labels_true.unique(); - let (clusters, cluster_idx) = labels_pred.unique(); + let (classes, class_idx) = labels_true.unique_with_indices(); + let (clusters, cluster_idx) = labels_pred.unique_with_indices(); let mut contingency_matrix = Vec::with_capacity(classes.len());