Revise tests

Author: termoshtt

tests/cholesky.rs

@@ -1,30 +1,37 @@
-include!("header.rs");
 
-macro_rules! impl_test {
-    ($modname:ident, $clone:ident) => {
-mod $modname {
-    use super::random_hermite;
-    use ndarray_linalg::prelude::*;
-    #[test]
-    fn cholesky() {
-        let a = random_hermite(3);
-        println!("a = \n{:?}", a);
-        let c = a.$clone().cholesky().unwrap();
-        println!("c = \n{:?}", c);
-        println!("cc = \n{:?}", c.t().dot(&c));
-        assert_close_l2!(&c.t().dot(&c), &a, 1e-7);
-    }
-    #[test]
-    fn cholesky_t() {
-        let a = random_hermite(3);
-        println!("a = \n{:?}", a);
-        let c = a.$clone().cholesky().unwrap();
-        println!("c = \n{:?}", c);
-        println!("cc = \n{:?}", c.t().dot(&c));
-        assert_close_l2!(&c.t().dot(&c), &a, 1e-7);
-    }
+extern crate rand_extra;
+extern crate ndarray;
+extern crate ndarray_rand;
+#[macro_use]
+extern crate ndarray_linalg;
+
+use rand_extra::*;
+use ndarray::*;
+use ndarray_rand::RandomExt;
+use ndarray_linalg::prelude::*;
+
+pub fn random_hermite(n: usize) -> Array<f64, Ix2> {
+    let r_dist = RealNormal::new(0., 1.);
+    let a = Array::<f64, _>::random((n, n), r_dist);
+    a.dot(&a.t())
 }
-}} // impl_test
 
-impl_test!(owned, clone);
-impl_test!(shared, to_shared);
+#[test]
+fn cholesky() {
+    let a = random_hermite(3);
+    println!("a = \n{:?}", a);
+    let c: Array2<_> = (&a).cholesky(UPLO::Upper).unwrap();
+    println!("c = \n{:?}", c);
+    println!("cc = \n{:?}", c.t().dot(&c));
+    assert_close_l2!(&c.t().dot(&c), &a, 1e-7);
+}
+
+#[test]
+fn cholesky_t() {
+    let a = random_hermite(3);
+    println!("a = \n{:?}", a);
+    let c: Array2<_> = (&a).cholesky(UPLO::Upper).unwrap();
+    println!("c = \n{:?}", c);
+    println!("cc = \n{:?}", c.t().dot(&c));
+    assert_close_l2!(&c.t().dot(&c), &a, 1e-7);
+}

tests/det.rs

@@ -1,32 +1,29 @@
-include!("header.rs");
 
-macro_rules! impl_test {
-    ($modname:ident, $clone:ident) => {
-mod $modname {
-    use ndarray::prelude::*;
-    use ndarray_linalg::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();
-        assert_close_l2!(&e, &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_close_l2!(&av, &ev, 1.0e-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 {
-            assert_rclose!(e[i], s[(i, i)], 1e-7);
-        }
+extern crate ndarray;
+#[macro_use]
+extern crate ndarray_linalg;
+
+use ndarray::prelude::*;
+use ndarray_linalg::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): (Array1<_>, Array2<_>) = (&a).eigh(UPLO::Upper).unwrap();
+    assert_close_l2!(&e, &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_close_l2!(&av, &ev, 1.0e-7);
     }
 }
-}} // impl_test
 
-impl_test!(owned, clone);
-impl_test!(shared, to_shared);
+#[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): (Array1<_>, Array2<_>) = (&a).eigh(UPLO::Upper).unwrap();
+    let s = vecs.t().dot(&a).dot(&vecs);
+    for i in 0..3 {
+        assert_rclose!(e[i], s[(i, i)], 1e-7);
+    }
+}