work/smartcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix signature of metrics tests

Browse Source
This commit is contained in:
Lorenzo (Mec-iS)
2022-11-03 13:40:54 +00:00
committed by morenol
parent e09c4ba724
commit 19f3a2fcc0
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/metrics/accuracy.rs
+4 -4
View File
@@ -12,7 +12,7 @@
//! let y_pred: Vec<f64> = vec![0., 2., 1., 3.];
//! let y_true: Vec<f64> = 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<i64> = vec![0, 2, 1, 3];
//! let y_true: Vec<i64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -92,7 +92,7 @@ mod tests {
let y_pred: Vec<f64> = vec![0., 2., 1., 3.];
let y_true: Vec<f64> = vec![0., 1., 2., 3.];
let score1: f64 = Accuracy::<f64>::new().get_score(&y_pred, &y_true);
let score1: f64 = Accuracy::<f64>::new().get_score( &y_true, &y_pred);
let score2: f64 = Accuracy::<f64>::new().get_score(&y_true, &y_true);
assert!((score1 - 0.5).abs() < 1e-8);
@@ -108,7 +108,7 @@ mod tests {
let y_pred: Vec<i32> = vec![0, 2, 1, 3];
let y_true: Vec<i32> = vec![0, 1, 2, 3];
let score1: f64 = Accuracy::<i32>::new().get_score(&y_pred, &y_true);
let score1: f64 = Accuracy::<i32>::new().get_score( &y_true, &y_pred);
let score2: f64 = Accuracy::<i32>::new().get_score(&y_true, &y_true);
assert_eq!(score1, 0.5);
src/metrics/f1.rs
+2 -2
View File
@@ -15,7 +15,7 @@
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -92,7 +92,7 @@ mod tests {
let y_true: Vec<f64> = 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);
src/metrics/mean_absolute_error.rs
+2 -2
View File
@@ -14,7 +14,7 @@
//! let y_pred: Vec<f64> = vec![3., -0.5, 2., 7.];
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -85,7 +85,7 @@ mod tests {
let y_true: Vec<f64> = vec![3., -0.5, 2., 7.];
let y_pred: Vec<f64> = 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);
src/metrics/mean_squared_error.rs
+2 -2
View File
@@ -14,7 +14,7 @@
//! let y_pred: Vec<f64> = vec![3., -0.5, 2., 7.];
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -85,7 +85,7 @@ mod tests {
let y_true: Vec<f64> = vec![3., -0.5, 2., 7.];
let y_pred: Vec<f64> = 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);
src/metrics/precision.rs
+6 -6
View File
@@ -14,7 +14,7 @@
//! let y_pred: Vec<f64> = vec![0., 1., 1., 0.];
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -104,17 +104,17 @@ mod tests {
let y_true: Vec<f64> = vec![0., 1., 1., 0.];
let y_pred: Vec<f64> = 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<f64> = vec![0., 0., 1., 1., 1., 1.];
let y_true: Vec<f64> = vec![0., 1., 1., 0., 1., 0.];
let y_pred: Vec<f64> = 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<f64> = vec![0., 0., 0., 1., 1., 1., 2., 2., 2.];
let y_pred: Vec<f64> = 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);
src/metrics/r2.rs
+1 -1
View File
@@ -14,7 +14,7 @@
//! let y_pred: Vec<f64> = vec![3., -0.5, 2., 7.];
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
src/metrics/recall.rs
+6 -6
View File
@@ -14,7 +14,7 @@
//! let y_pred: Vec<f64> = vec![0., 1., 1., 0.];
//! let y_true: Vec<f64> = 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);
//! ```
//!
//! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
@@ -105,17 +105,17 @@ mod tests {
let y_true: Vec<f64> = vec![0., 1., 1., 0.];
let y_pred: Vec<f64> = 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<f64> = vec![0., 0., 1., 1., 1., 1.];
let y_true: Vec<f64> = vec![0., 1., 1., 0., 1., 0.];
let y_pred: Vec<f64> = 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<f64> = vec![0., 0., 0., 1., 1., 1., 2., 2., 2.];
let y_pred: Vec<f64> = 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);