From 19f3a2fcc0311a30b698adee2e7baa963f380b55 Mon Sep 17 00:00:00 2001 From: "Lorenzo (Mec-iS)" Date: Thu, 3 Nov 2022 13:40:54 +0000 Subject: [PATCH] Fix signature of metrics tests --- src/metrics/accuracy.rs | 8 ++++---- src/metrics/f1.rs | 4 ++-- src/metrics/mean_absolute_error.rs | 4 ++-- src/metrics/mean_squared_error.rs | 4 ++-- src/metrics/precision.rs | 12 ++++++------ src/metrics/r2.rs | 2 +- src/metrics/recall.rs | 12 ++++++------ 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/metrics/accuracy.rs b/src/metrics/accuracy.rs index 1279614..498efea 100644 --- a/src/metrics/accuracy.rs +++ b/src/metrics/accuracy.rs @@ -12,7 +12,7 @@ //! let y_pred: Vec = vec![0., 2., 1., 3.]; //! let y_true: Vec = vec![0., 1., 2., 3.]; //! -//! let score: f64 = Accuracy::new().get_score(&y_pred, &y_true); +//! let score: f64 = Accuracy::new().get_score( &y_true, &y_pred); //! ``` //! With integers: //! ``` @@ -21,7 +21,7 @@ //! let y_pred: Vec = vec![0, 2, 1, 3]; //! let y_true: Vec = vec![0, 1, 2, 3]; //! -//! let score: f64 = Accuracy::new().get_score(&y_pred, &y_true); +//! let score: f64 = Accuracy::new().get_score( &y_true, &y_pred); //! ``` //! //! @@ -92,7 +92,7 @@ mod tests { let y_pred: Vec = vec![0., 2., 1., 3.]; let y_true: Vec = vec![0., 1., 2., 3.]; - let score1: f64 = Accuracy::::new().get_score(&y_pred, &y_true); + let score1: f64 = Accuracy::::new().get_score( &y_true, &y_pred); let score2: f64 = Accuracy::::new().get_score(&y_true, &y_true); assert!((score1 - 0.5).abs() < 1e-8); @@ -108,7 +108,7 @@ mod tests { let y_pred: Vec = vec![0, 2, 1, 3]; let y_true: Vec = vec![0, 1, 2, 3]; - let score1: f64 = Accuracy::::new().get_score(&y_pred, &y_true); + let score1: f64 = Accuracy::::new().get_score( &y_true, &y_pred); let score2: f64 = Accuracy::::new().get_score(&y_true, &y_true); assert_eq!(score1, 0.5); diff --git a/src/metrics/f1.rs b/src/metrics/f1.rs index fd41019..f60d81b 100644 --- a/src/metrics/f1.rs +++ b/src/metrics/f1.rs @@ -15,7 +15,7 @@ //! let y_true: Vec = vec![0., 1., 1., 0., 1., 0.]; //! //! let beta = 1.0; // beta default is equal 1.0 anyway -//! let score: f64 = F1::new_with(beta).get_score(&y_pred, &y_true); +//! let score: f64 = F1::new_with(beta).get_score( &y_true, &y_pred); //! ``` //! //! @@ -92,7 +92,7 @@ mod tests { let y_true: Vec = vec![0., 1., 1., 0., 1., 0.]; let beta = 1.0; - let score1: f64 = F1::new_with(beta).get_score(&y_pred, &y_true); + let score1: f64 = F1::new_with(beta).get_score( &y_true, &y_pred); let score2: f64 = F1::new_with(beta).get_score(&y_true, &y_true); println!("{:?}", score1); diff --git a/src/metrics/mean_absolute_error.rs b/src/metrics/mean_absolute_error.rs index 36e5f48..66ffcb4 100644 --- a/src/metrics/mean_absolute_error.rs +++ b/src/metrics/mean_absolute_error.rs @@ -14,7 +14,7 @@ //! let y_pred: Vec = vec![3., -0.5, 2., 7.]; //! let y_true: Vec = vec![2.5, 0.0, 2., 8.]; //! -//! let mse: f64 = MeanAbsoluteError::new().get_score(&y_pred, &y_true); +//! let mse: f64 = MeanAbsoluteError::new().get_score( &y_true, &y_pred); //! ``` //! //! @@ -85,7 +85,7 @@ mod tests { let y_true: Vec = vec![3., -0.5, 2., 7.]; let y_pred: Vec = vec![2.5, 0.0, 2., 8.]; - let score1: f64 = MeanAbsoluteError::new().get_score(&y_pred, &y_true); + let score1: f64 = MeanAbsoluteError::new().get_score( &y_true, &y_pred); let score2: f64 = MeanAbsoluteError::new().get_score(&y_true, &y_true); assert!((score1 - 0.5).abs() < 1e-8); diff --git a/src/metrics/mean_squared_error.rs b/src/metrics/mean_squared_error.rs index 7443857..f19e89c 100644 --- a/src/metrics/mean_squared_error.rs +++ b/src/metrics/mean_squared_error.rs @@ -14,7 +14,7 @@ //! let y_pred: Vec = vec![3., -0.5, 2., 7.]; //! let y_true: Vec = vec![2.5, 0.0, 2., 8.]; //! -//! let mse: f64 = MeanSquareError::new().get_score(&y_pred, &y_true); +//! let mse: f64 = MeanSquareError::new().get_score( &y_true, &y_pred); //! ``` //! //! @@ -85,7 +85,7 @@ mod tests { let y_true: Vec = vec![3., -0.5, 2., 7.]; let y_pred: Vec = vec![2.5, 0.0, 2., 8.]; - let score1: f64 = MeanSquareError::new().get_score(&y_pred, &y_true); + let score1: f64 = MeanSquareError::new().get_score( &y_true, &y_pred); let score2: f64 = MeanSquareError::new().get_score(&y_true, &y_true); assert!((score1 - 0.375).abs() < 1e-8); diff --git a/src/metrics/precision.rs b/src/metrics/precision.rs index a6fcef1..dd09740 100644 --- a/src/metrics/precision.rs +++ b/src/metrics/precision.rs @@ -14,7 +14,7 @@ //! let y_pred: Vec = vec![0., 1., 1., 0.]; //! let y_true: Vec = vec![0., 0., 1., 1.]; //! -//! let score: f64 = Precision::new().get_score(&y_pred, &y_true); +//! let score: f64 = Precision::new().get_score(&y_true, &y_pred); //! ``` //! //! @@ -104,17 +104,17 @@ mod tests { let y_true: Vec = vec![0., 1., 1., 0.]; let y_pred: Vec = vec![0., 0., 1., 1.]; - let score1: f64 = Precision::new().get_score(&y_pred, &y_true); + let score1: f64 = Precision::new().get_score(&y_true, &y_pred); let score2: f64 = Precision::new().get_score(&y_pred, &y_pred); assert!((score1 - 0.5).abs() < 1e-8); assert!((score2 - 1.0).abs() < 1e-8); - let y_pred: Vec = vec![0., 0., 1., 1., 1., 1.]; let y_true: Vec = vec![0., 1., 1., 0., 1., 0.]; + let y_pred: Vec = vec![0., 0., 1., 1., 1., 1.]; - let score3: f64 = Precision::new().get_score(&y_pred, &y_true); - assert!((score3 - 0.5).abs() < 1e-8); + let score3: f64 = Precision::new().get_score(&y_true, &y_pred); + assert!((score3 - 0.6666666666).abs() < 1e-8); } #[cfg_attr( @@ -126,7 +126,7 @@ mod tests { let y_true: Vec = vec![0., 0., 0., 1., 1., 1., 2., 2., 2.]; let y_pred: Vec = vec![0., 1., 2., 0., 1., 2., 0., 1., 2.]; - let score1: f64 = Precision::new().get_score(&y_pred, &y_true); + let score1: f64 = Precision::new().get_score(&y_true, &y_pred); let score2: f64 = Precision::new().get_score(&y_pred, &y_pred); assert!((score1 - 0.333333333).abs() < 1e-8); diff --git a/src/metrics/r2.rs b/src/metrics/r2.rs index 6581abe..448e6d6 100644 --- a/src/metrics/r2.rs +++ b/src/metrics/r2.rs @@ -14,7 +14,7 @@ //! let y_pred: Vec = vec![3., -0.5, 2., 7.]; //! let y_true: Vec = vec![2.5, 0.0, 2., 8.]; //! -//! let mse: f64 = MeanAbsoluteError::new().get_score(&y_pred, &y_true); +//! let mse: f64 = MeanAbsoluteError::new().get_score( &y_true, &y_pred); //! ``` //! //! diff --git a/src/metrics/recall.rs b/src/metrics/recall.rs index 04a779a..252759e 100644 --- a/src/metrics/recall.rs +++ b/src/metrics/recall.rs @@ -14,7 +14,7 @@ //! let y_pred: Vec = vec![0., 1., 1., 0.]; //! let y_true: Vec = vec![0., 0., 1., 1.]; //! -//! let score: f64 = Recall::new().get_score(&y_pred, &y_true); +//! let score: f64 = Recall::new().get_score( &y_true, &y_pred); //! ``` //! //! @@ -105,17 +105,17 @@ mod tests { let y_true: Vec = vec![0., 1., 1., 0.]; let y_pred: Vec = vec![0., 0., 1., 1.]; - let score1: f64 = Recall::new().get_score(&y_pred, &y_true); + let score1: f64 = Recall::new().get_score(&y_true, &y_pred); let score2: f64 = Recall::new().get_score(&y_pred, &y_pred); assert!((score1 - 0.5).abs() < 1e-8); assert!((score2 - 1.0).abs() < 1e-8); - let y_pred: Vec = vec![0., 0., 1., 1., 1., 1.]; let y_true: Vec = vec![0., 1., 1., 0., 1., 0.]; + let y_pred: Vec = vec![0., 0., 1., 1., 1., 1.]; - let score3: f64 = Recall::new().get_score(&y_pred, &y_true); - assert!((score3 - 0.6666666666666666).abs() < 1e-8); + let score3: f64 = Recall::new().get_score(&y_true, &y_pred); + assert!((score3 - 0.5).abs() < 1e-8); } #[cfg_attr( @@ -127,7 +127,7 @@ mod tests { let y_true: Vec = vec![0., 0., 0., 1., 1., 1., 2., 2., 2.]; let y_pred: Vec = vec![0., 1., 2., 0., 1., 2., 0., 1., 2.]; - let score1: f64 = Recall::new().get_score(&y_pred, &y_true); + let score1: f64 = Recall::new().get_score( &y_true, &y_pred); let score2: f64 = Recall::new().get_score(&y_pred, &y_pred); assert!((score1 - 0.333333333).abs() < 1e-8);