Use new asserts in tests

Author: termoshtt

tests/det.rs

@@ -11,7 +11,7 @@ mod $modname {
         let (e, _) = a.$clone().eigh().unwrap();
         let deth = a.$clone().deth().unwrap();
         let det_eig = e.iter().fold(1.0, |x, y| x * y);
-        deth.assert_close(det_eig, 1.0e-7);
+        assert_rclose!(deth, det_eig, 1.0e-7);
     }
 }
 }} // impl_test

tests/eigh.rs

@@ -22,7 +22,7 @@ mod $modname {
         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);
+            assert_rclose!(e[i], s[(i, i)], 1e-7);
         }
     }
 }

tests/header.rs

@@ -2,6 +2,8 @@
 extern crate rand_extra;
 extern crate ndarray;
 extern crate ndarray_rand;
+#[macro_use]
+#[allow(unused_imports)]
 extern crate ndarray_linalg;
 extern crate num_traits;
 

tests/opnorm.rs

@@ -5,9 +5,9 @@ macro_rules! impl_test {
 #[test]
 fn $funcname() {
     let a = $a;
-    a.opnorm_1().assert_close($op1, 1e-7);
-    a.opnorm_i().assert_close($opi, 1e-7);
-    a.opnorm_f().assert_close($opf, 1e-7);
+    assert_rclose!(a.opnorm_1(), $op1, 1e-7);
+    assert_rclose!(a.opnorm_i(), $opi, 1e-7);
+    assert_rclose!(a.opnorm_f(), $opf, 1e-7);
 }
 }} // impl_test
 

tests/outer.rs

@@ -14,7 +14,7 @@ fn outer_3x4() {
     println!("ab = \n{:?}", &ab);
     for i in 0..m {
         for j in 0..n {
-            ab[(i, j)].assert_close(a[i] * b[j], 1e-7);
+            assert_rclose!(ab[(i, j)], a[i] * b[j], 1e-7);
         }
     }
 }
@@ -32,7 +32,7 @@ fn outer_4x3() {
     println!("ab = \n{:?}", &ab);
     for i in 0..m {
         for j in 0..n {
-            ab[(i, j)].assert_close(a[i] * b[j], 1e-7);
+            assert_rclose!(ab[(i, j)], a[i] * b[j], 1e-7);
         }
     }
 }

tests/trace.rs

@@ -4,5 +4,5 @@ include!("header.rs");
 fn trace() {
     let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 3), r_dist);
-    a.trace().unwrap().assert_close(a[(0, 0)] + a[(1, 1)] + a[(2, 2)], 1e-7);
+    assert_rclose!(a.trace().unwrap(), a[(0, 0)] + a[(1, 1)] + a[(2, 2)], 1e-7);
 }

tests/vector.rs

@@ -3,37 +3,37 @@ include!("header.rs");
 #[test]
 fn vector_norm() {
     let a = Array::range(1., 10., 1.);
-    a.norm().assert_close(285.0.sqrt(), 1e-7);
+    assert_rclose!(a.norm(), 285.0.sqrt(), 1e-7);
 }
 
 #[test]
 fn vector_norm_l1() {
     let a = arr1(&[1.0, -1.0]);
-    a.norm_l1().assert_close(2.0, 1e-7);
+    assert_rclose!(a.norm_l1(), 2.0, 1e-7);
     let b = arr2(&[[0.0, -1.0], [1.0, 0.0]]);
-    b.norm_l1().assert_close(2.0, 1e-7);
+    assert_rclose!(b.norm_l1(), 2.0, 1e-7);
 }
 
 #[test]
 fn vector_norm_max() {
     let a = arr1(&[1.0, 1.0, -3.0]);
-    a.norm_max().assert_close(3.0, 1e-7);
+    assert_rclose!(a.norm_max(), 3.0, 1e-7);
     let b = arr2(&[[1.0, 3.0], [1.0, -4.0]]);
-    b.norm_max().assert_close(4.0, 1e-7);
+    assert_rclose!(b.norm_max(), 4.0, 1e-7);
 }
 
 #[test]
 fn vector_norm_l1_rc() {
     let a = rcarr1(&[1.0, -1.0]);
-    a.norm_l1().assert_close(2.0, 1e-7);
+    assert_rclose!(a.norm_l1(), 2.0, 1e-7);
     let b = rcarr2(&[[0.0, -1.0], [1.0, 0.0]]);
-    b.norm_l1().assert_close(2.0, 1e-7);
+    assert_rclose!(b.norm_l1(), 2.0, 1e-7);
 }
 
 #[test]
 fn vector_norm_max_rc() {
     let a = rcarr1(&[1.0, 1.0, -3.0]);
-    a.norm_max().assert_close(3.0, 1e-7);
+    assert_rclose!(a.norm_max(), 3.0, 1e-7);
     let b = rcarr2(&[[1.0, 3.0], [1.0, -4.0]]);
-    b.norm_max().assert_close(4.0, 1e-7);
+    assert_rclose!(b.norm_max(), 4.0, 1e-7);
 }