Test eigh for RcArray

Author: termoshtt

src/prelude.rs

@@ -4,3 +4,4 @@ pub use matrix::Matrix;
 pub use square::SquareMatrix;
 pub use hermite::HermiteMatrix;
 pub use triangular::{TriangularMatrix, drop_lower, drop_upper};
+pub use util::{all_close_l1, all_close_l2, all_close_max};

tests/eigh.rs

@@ -1,23 +1,33 @@
 include!("header.rs");
 
-#[test]
-fn eigen_vector_manual() {
-    let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
-    let (e, vecs) = a.clone().eigh().unwrap();
-    assert!(e.all_close(&arr1(&[2.0, 2.0, 5.0]), 1.0e-7));
-    for (i, v) in vecs.axis_iter(Axis(1)).enumerate() {
-        let av = a.dot(&v);
-        let ev = v.mapv(|x| e[i] * x);
-        assert!(av.all_close(&ev, 1.0e-7));
+macro_rules! impl_test_eigh {
+    ($modname:ident, $clone:ident) => {
+mod $modname {
+    use ndarray::prelude::*;
+    use ndarray_linalg::prelude::*;
+    use ndarray_numtest::prelude::*;
+    #[test]
+    fn eigen_vector_manual() {
+        let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
+        let (e, vecs) = a.$clone().eigh().unwrap();
+        all_close_l2(&e, &arr1(&[2.0, 2.0, 5.0]), 1.0e-7).unwrap();
+        for (i, v) in vecs.axis_iter(Axis(1)).enumerate() {
+            let av = a.dot(&v);
+            let ev = v.mapv(|x| e[i] * x);
+            all_close_l2(&av, &ev, 1.0e-7).unwrap();
+        }
     }
-}
-
-#[test]
-fn diagonalize() {
-    let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
-    let (e, vecs) = a.clone().eigh().unwrap();
-    let s = vecs.t().dot(&a).dot(&vecs);
-    for i in 0..3 {
-        e[i].assert_close(s[(i, i)], 1e-7);
+    #[test]
+    fn diagonalize() {
+        let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
+        let (e, vecs) = a.$clone().eigh().unwrap();
+        let s = vecs.t().dot(&a).dot(&vecs);
+        for i in 0..3 {
+            e[i].assert_close(s[(i, i)], 1e-7);
+        }
     }
 }
+}} // impl_test_eigh
+
+impl_test_eigh!(owned, clone);
+impl_test_eigh!(shared, to_shared);

tests/header.rs

@@ -10,8 +10,6 @@ use ndarray::prelude::*;
 #[allow(unused_imports)]
 use ndarray_linalg::prelude::*;
 #[allow(unused_imports)]
-use ndarray_linalg::util::*;
-#[allow(unused_imports)]
 use ndarray_numtest::prelude::*;
 #[allow(unused_imports)]
 use ndarray_rand::RandomExt;