Added serde feature flags to tests

This commit is contained in:
Ben Cross
2021-01-18 10:32:35 +00:00
parent 762986b271
commit f1cf8a6f08
24 changed files with 31 additions and 2 deletions
+3 -1
View File
@@ -457,7 +457,8 @@ mod tests {
use super::*; use super::*;
use crate::math::distance::Distances; use crate::math::distance::Distances;
#[derive(Debug, Serialize, Deserialize, Clone)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)]
struct SimpleDistance {} struct SimpleDistance {}
impl Distance<i32, f64> for SimpleDistance { impl Distance<i32, f64> for SimpleDistance {
@@ -503,6 +504,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9]; let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9];
+2 -1
View File
@@ -140,7 +140,8 @@ mod tests {
use super::*; use super::*;
use crate::math::distance::Distances; use crate::math::distance::Distances;
#[derive(Debug, Serialize, Deserialize, Clone)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)]
struct SimpleDistance {} struct SimpleDistance {}
impl Distance<i32, f64> for SimpleDistance { impl Distance<i32, f64> for SimpleDistance {
+2
View File
@@ -265,6 +265,7 @@ impl<T: RealNumber + Sum, D: Distance<Vec<T>, T>> DBSCAN<T, D> {
mod tests { mod tests {
use super::*; use super::*;
use crate::linalg::naive::dense_matrix::DenseMatrix; use crate::linalg::naive::dense_matrix::DenseMatrix;
#[cfg(feature = "serde")]
use crate::math::distance::euclidian::Euclidian; use crate::math::distance::euclidian::Euclidian;
#[test] #[test]
@@ -299,6 +300,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+1
View File
@@ -347,6 +347,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+1
View File
@@ -567,6 +567,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let iris = DenseMatrix::from_2d_array(&[ let iris = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+1
View File
@@ -228,6 +228,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let iris = DenseMatrix::from_2d_array(&[ let iris = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+1
View File
@@ -325,6 +325,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+1
View File
@@ -274,6 +274,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159., 107.608, 1947., 60.323], &[234.289, 235.6, 159., 107.608, 1947., 60.323],
+2
View File
@@ -1312,6 +1312,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn to_from_json() { fn to_from_json() {
let a = DenseMatrix::from_2d_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]); let a = DenseMatrix::from_2d_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]);
let deserialized_a: DenseMatrix<f64> = let deserialized_a: DenseMatrix<f64> =
@@ -1320,6 +1321,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn to_from_bincode() { fn to_from_bincode() {
let a = DenseMatrix::from_2d_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]); let a = DenseMatrix::from_2d_array(&[&[0.9, 0.4, 0.7], &[0.4, 0.5, 0.3], &[0.7, 0.3, 0.8]]);
let deserialized_a: DenseMatrix<f64> = let deserialized_a: DenseMatrix<f64> =
+1
View File
@@ -401,6 +401,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159.0, 107.608, 1947., 60.323], &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+1
View File
@@ -275,6 +275,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159.0, 107.608, 1947., 60.323], &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+1
View File
@@ -251,6 +251,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159.0, 107.608, 1947., 60.323], &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+1
View File
@@ -543,6 +543,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[1., -5.], &[1., -5.],
+1
View File
@@ -330,6 +330,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159.0, 107.608, 1947., 60.323], &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+1
View File
@@ -351,6 +351,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::<f64>::from_2d_array(&[ let x = DenseMatrix::<f64>::from_2d_array(&[
&[1., 1., 0., 0., 0., 0.], &[1., 1., 0., 0., 0., 0.],
+1
View File
@@ -349,6 +349,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::<f64>::from_2d_array(&[ let x = DenseMatrix::<f64>::from_2d_array(&[
&[3., 4., 0., 1.], &[3., 4., 0., 1.],
+1
View File
@@ -281,6 +281,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::<f64>::from_2d_array(&[ let x = DenseMatrix::<f64>::from_2d_array(&[
&[-1., -1.], &[-1., -1.],
+1
View File
@@ -324,6 +324,7 @@ mod tests {
)); ));
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::<f64>::from_2d_array(&[ let x = DenseMatrix::<f64>::from_2d_array(&[
&[1., 1., 0., 0., 0., 0.], &[1., 1., 0., 0., 0., 0.],
+1
View File
@@ -280,6 +280,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = let x =
DenseMatrix::from_2d_array(&[&[1., 2.], &[3., 4.], &[5., 6.], &[7., 8.], &[9., 10.]]); DenseMatrix::from_2d_array(&[&[1., 2.], &[3., 4.], &[5., 6.], &[7., 8.], &[9., 10.]]);
+1
View File
@@ -269,6 +269,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = let x =
DenseMatrix::from_2d_array(&[&[1., 2.], &[3., 4.], &[5., 6.], &[7., 8.], &[9., 10.]]); DenseMatrix::from_2d_array(&[&[1., 2.], &[3., 4.], &[5., 6.], &[7., 8.], &[9., 10.]]);
+2
View File
@@ -726,6 +726,7 @@ mod tests {
use super::*; use super::*;
use crate::linalg::naive::dense_matrix::*; use crate::linalg::naive::dense_matrix::*;
use crate::metrics::accuracy; use crate::metrics::accuracy;
#[cfg(feature = "serde")]
use crate::svm::*; use crate::svm::*;
#[test] #[test]
@@ -814,6 +815,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn svc_serde() { fn svc_serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[5.1, 3.5, 1.4, 0.2], &[5.1, 3.5, 1.4, 0.2],
+2
View File
@@ -533,6 +533,7 @@ mod tests {
use super::*; use super::*;
use crate::linalg::naive::dense_matrix::*; use crate::linalg::naive::dense_matrix::*;
use crate::metrics::mean_squared_error; use crate::metrics::mean_squared_error;
#[cfg(feature = "serde")]
use crate::svm::*; use crate::svm::*;
#[test] #[test]
@@ -569,6 +570,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn svr_serde() { fn svr_serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159.0, 107.608, 1947., 60.323], &[234.289, 235.6, 159.0, 107.608, 1947., 60.323],
+1
View File
@@ -745,6 +745,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[1., 1., 1., 0.], &[1., 1., 1., 0.],
+1
View File
@@ -581,6 +581,7 @@ mod tests {
} }
#[test] #[test]
#[cfg(feature = "serde")]
fn serde() { fn serde() {
let x = DenseMatrix::from_2d_array(&[ let x = DenseMatrix::from_2d_array(&[
&[234.289, 235.6, 159., 107.608, 1947., 60.323], &[234.289, 235.6, 159., 107.608, 1947., 60.323],