Rewrite tests/svd.rs

Author: termoshtt

tests/svd.rs

@@ -1,103 +1,95 @@
 
-extern crate rand;
 extern crate ndarray;
 extern crate ndarray_rand;
 extern crate ndarray_linalg;
+extern crate ndarray_numtest;
 
 use std::cmp::min;
 use ndarray::prelude::*;
 use ndarray_linalg::prelude::*;
-use rand::distributions::*;
+use ndarray_numtest::prelude::*;
 use ndarray_rand::RandomExt;
 
-fn all_close(a: Array<f64, Ix2>, b: Array<f64, Ix2>) {
-    if !a.all_close(&b, 1.0e-7) {
-        panic!("\nTwo matrices are not equal:\na = \n{:?}\nb = \n{:?}\n",
-               a,
-               b);
-    }
-}
-
 #[test]
 fn svd_square() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 3), r_dist);
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::eye(3);
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 #[test]
 fn svd_square_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 3), r_dist).reversed_axes();
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::eye(3);
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 
 #[test]
 fn svd_4x3() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((4, 3), r_dist);
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::zeros((4, 3));
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 #[test]
 fn svd_4x3_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 4), r_dist).reversed_axes();
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::zeros((4, 3));
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 
 #[test]
 fn svd_3x4() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 4), r_dist);
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::zeros((3, 4));
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 #[test]
 fn svd_3x4_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((4, 3), r_dist).reversed_axes();
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::zeros((3, 4));
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }
 
 #[test]
 #[ignore]
 fn svd_large() {
     let n = 2480;
     let m = 4280;
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((n, m), r_dist);
     let (u, s, vt) = a.clone().svd().unwrap();
     let mut sm = Array::zeros((n, m));
     for i in 0..min(n, m) {
         sm[(i, i)] = s[i];
     }
-    all_close(u.dot(&sm).dot(&vt), a);
+    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
 }