Moved tests into separate files

Dzuchun · Nov 27, 2024 · b355c90 · b355c90
1 parent 6d1f09f
commit b355c90
Show file tree

Hide file tree

Showing 16 changed files with 312 additions and 294 deletions.
diff --git a/nacfahi/src/models/basic/constant.rs → nacfahi/src/models/basic/constant/mod.rs b/nacfahi/src/models/basic/constant.rs → nacfahi/src/models/basic/constant/mod.rs
@@ -59,15 +59,5 @@ where
     }
 }
 
-crate::test_model_derivative!(
-    Constant::<f64>,
-    Constant { c: 5.0 },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/basic/constant/tests.rs b/nacfahi/src/models/basic/constant/tests.rs
@@ -0,0 +1,12 @@
+crate::test_model_derivative!(
+    Constant::<f64>,
+    Constant { c: 5.0 },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
diff --git a/nacfahi/src/models/basic/exponent.rs → nacfahi/src/models/basic/exponent/mod.rs b/nacfahi/src/models/basic/exponent.rs → nacfahi/src/models/basic/exponent/mod.rs
@@ -75,15 +75,5 @@ where
     }
 }
 
-crate::test_model_derivative!(
-    Exponent::<f64>,
-    Exponent { a: -2.0, b: -10.0 },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/basic/exponent/tests.rs b/nacfahi/src/models/basic/exponent/tests.rs
@@ -0,0 +1,12 @@
+crate::test_model_derivative!(
+    Exponent::<f64>,
+    Exponent { a: -2.0, b: -10.0 },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
diff --git a/nacfahi/src/models/basic/linear.rs → nacfahi/src/models/basic/linear/mod.rs b/nacfahi/src/models/basic/linear.rs → nacfahi/src/models/basic/linear/mod.rs
@@ -76,15 +76,5 @@ where
     }
 }
 
-crate::test_model_derivative!(
-    Linear::<f64>,
-    Linear { a: 5.0, b: -4.0 },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/basic/linear/tests.rs b/nacfahi/src/models/basic/linear/tests.rs
@@ -0,0 +1,12 @@
+crate::test_model_derivative!(
+    Linear::<f64>,
+    Linear { a: 5.0, b: -4.0 },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
diff --git a/nacfahi/src/models/basic/polynomial.rs → nacfahi/src/models/basic/polynomial/mod.rs b/nacfahi/src/models/basic/polynomial.rs → nacfahi/src/models/basic/polynomial/mod.rs
@@ -97,17 +97,5 @@ where
     }
 }
 
-crate::test_model_derivative!(
-    Polynomial::<5, f64>,
-    Polynomial {
-        params: [-4.0, -15.0, -2.0, 0.7, -0.01]
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/basic/polynomial/tests.rs b/nacfahi/src/models/basic/polynomial/tests.rs
@@ -0,0 +1,14 @@
+crate::test_model_derivative!(
+    Polynomial::<5, f64>,
+    Polynomial {
+        params: [-4.0, -15.0, -2.0, 0.7, -0.01]
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
diff --git a/nacfahi/src/models/utility/composition.rs → ...ahi/src/models/utility/composition/mod.rs b/nacfahi/src/models/utility/composition.rs → ...ahi/src/models/utility/composition/mod.rs
@@ -105,123 +105,5 @@ impl<Inner: FitModel> CompositionExt for Inner {
     }
 }
 
-crate::test_model_derivative!(
-    exponent_gaussian,
-    Composition::<Exponent<f64>, Gaussian<f64>>,
-    Composition {
-        inner: Exponent { a: 5.0, b: -0.1 },
-        outer: Gaussian::<_> {
-            a: -2.0,
-            sigma: 0.4,
-            x_c: 3.0,
-        }
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
-
-crate::test_model_derivative!(
-    gaussian_exponent,
-    Composition::<Gaussian<f64>, Exponent<f64>>,
-    Composition {
-        inner: Gaussian::<_> {
-            a: -2.0,
-            sigma: 0.4,
-            x_c: 3.0,
-        },
-        outer: Exponent { a: 5.0, b: -0.1 },
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
-
-crate::test_model_derivative!(
-    exponent_constant,
-    Composition::<Exponent<f64>, Constant<f64>>,
-    Composition {
-        inner: Exponent { a: 5.0, b: -0.1 },
-        outer: Constant { c: -4.0 },
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
-
-crate::test_model_derivative!(
-    exponent_linear,
-    Composition::<Exponent<f64>, Linear<f64>>,
-    Composition {
-        inner: Exponent { a: -5.0, b: -3.11 },
-        outer: Linear { a: 5.0, b: -0.1 },
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
-
-crate::test_model_derivative!(
-    constant_gassian,
-    Composition::<Constant<f64>, Gaussian<f64>>,
-    Composition {
-        inner: Constant { c: 4.0 },
-        outer: Gaussian::<_> {
-            a: -5.0,
-            sigma: 3.4,
-            x_c: -2.1213
-        },
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
-
-crate::test_model_derivative!(
-    gaussian_linear,
-    Composition::<Gaussian<f64>, Linear<f64>>,
-    Composition {
-        inner: Gaussian::<_> {
-            a: -5.0,
-            sigma: 3.4,
-            x_c: -2.1213
-        },
-        outer: Linear {
-            a: -0.2421,
-            b: 4.321
-        },
-    },
-    [
-        (0.0, -1.0),
-        (1.0, -4.0),
-        (2.0, -5.0),
-        (3.0, 6.0),
-        (4.0, 2.0),
-        (5.0, 2.5)
-    ]
-);
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/utility/composition/tests.rs b/nacfahi/src/models/utility/composition/tests.rs
@@ -0,0 +1,120 @@
+crate::test_model_derivative!(
+    exponent_gaussian,
+    Composition::<Exponent<f64>, Gaussian<f64>>,
+    Composition {
+        inner: Exponent { a: 5.0, b: -0.1 },
+        outer: Gaussian::<_> {
+            a: -2.0,
+            sigma: 0.4,
+            x_c: 3.0,
+        }
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
+
+crate::test_model_derivative!(
+    gaussian_exponent,
+    Composition::<Gaussian<f64>, Exponent<f64>>,
+    Composition {
+        inner: Gaussian::<_> {
+            a: -2.0,
+            sigma: 0.4,
+            x_c: 3.0,
+        },
+        outer: Exponent { a: 5.0, b: -0.1 },
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
+
+crate::test_model_derivative!(
+    exponent_constant,
+    Composition::<Exponent<f64>, Constant<f64>>,
+    Composition {
+        inner: Exponent { a: 5.0, b: -0.1 },
+        outer: Constant { c: -4.0 },
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
+
+crate::test_model_derivative!(
+    exponent_linear,
+    Composition::<Exponent<f64>, Linear<f64>>,
+    Composition {
+        inner: Exponent { a: -5.0, b: -3.11 },
+        outer: Linear { a: 5.0, b: -0.1 },
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
+
+crate::test_model_derivative!(
+    constant_gassian,
+    Composition::<Constant<f64>, Gaussian<f64>>,
+    Composition {
+        inner: Constant { c: 4.0 },
+        outer: Gaussian::<_> {
+            a: -5.0,
+            sigma: 3.4,
+            x_c: -2.1213
+        },
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
+
+crate::test_model_derivative!(
+    gaussian_linear,
+    Composition::<Gaussian<f64>, Linear<f64>>,
+    Composition {
+        inner: Gaussian::<_> {
+            a: -5.0,
+            sigma: 3.4,
+            x_c: -2.1213
+        },
+        outer: Linear {
+            a: -0.2421,
+            b: 4.321
+        },
+    },
+    [
+        (0.0, -1.0),
+        (1.0, -4.0),
+        (2.0, -5.0),
+        (3.0, 6.0),
+        (4.0, 2.0),
+        (5.0, 2.5)
+    ]
+);
diff --git a/nacfahi/src/models/utility/fixed.rs → nacfahi/src/models/utility/fixed/mod.rs b/nacfahi/src/models/utility/fixed.rs → nacfahi/src/models/utility/fixed/mod.rs
@@ -69,3 +69,6 @@ where
     ) -> Self::OwnedModel {
     }
 }
+
+#[cfg(test)]
+mod tests;
diff --git a/nacfahi/src/models/utility/fixed/tests.rs b/nacfahi/src/models/utility/fixed/tests.rs
@@ -0,0 +1 @@
+