Replace assert_allclose_l2 by all_close_l2(...).unwrap()

termoshtt · termoshtt · commit c357c3d4ea84 · 2017-01-27T21:00:15.000+09:00
diff --git a/tests/cholesky.rs b/tests/cholesky.rs
@@ -9,7 +9,7 @@ fn cholesky() {
     let c = a.clone().cholesky().unwrap();
     println!("c = \n{:?}", c);
     println!("cc = \n{:?}", c.t().dot(&c));
-    c.t().dot(&c).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&c.t().dot(&c), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -21,5 +21,5 @@ fn cholesky_t() {
     let c = a.clone().cholesky().unwrap();
     println!("c = \n{:?}", c);
     println!("cc = \n{:?}", c.t().dot(&c));
-    c.t().dot(&c).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&c.t().dot(&c), &a, 1e-7).unwrap();
 }
diff --git a/tests/header.rs b/tests/header.rs
@@ -10,6 +10,8 @@ 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;
diff --git a/tests/inv.rs b/tests/inv.rs
@@ -6,7 +6,7 @@ fn inv_random() {
     let a = Array::<f64, _>::random((3, 3), r_dist);
     let ai = a.clone().inv().unwrap();
     let id = Array::eye(3);
-    ai.dot(&a).assert_allclose_l2(&id, 1e-7);
+    all_close_l2(&ai.dot(&a), &id, 1e-7).unwrap();
 }
 
 #[test]
@@ -15,7 +15,7 @@ fn inv_random_t() {
     let a = Array::<f64, _>::random((3, 3), r_dist).reversed_axes();
     let ai = a.clone().inv().unwrap();
     let id = Array::eye(3);
-    ai.dot(&a).assert_allclose_l2(&id, 1e-7);
+    all_close_l2(&ai.dot(&a), &id, 1e-7).unwrap();
 }
 
 #[test]
diff --git a/tests/lu.rs b/tests/lu.rs
@@ -9,7 +9,7 @@ fn $testname() {
     let p = $permutate; // replace 1-2
     let pa = a.permutated(&p);
     println!("permutated = \n{:?}", &pa);
-    pa.assert_allclose_l2(&arr2($answer), 1e-7);
+    all_close_l2(&pa, &arr2($answer), 1e-7).unwrap();
 }
 }} // end test_permutate
 
@@ -22,7 +22,7 @@ fn $testname() {
     let p = $permutate; // replace 1-2
     let pa = a.permutated(&p);
     println!("permutated = \n{:?}", &pa);
-    pa.assert_allclose_l2(&arr2($answer), 1e-7);
+    all_close_l2(&pa, &arr2($answer), 1e-7).unwrap();
 }
 }} // end test_permutate_t
 
@@ -58,7 +58,7 @@ fn test_lu(a: Array<f64, Ix2>) {
     println!("L = \n{:?}", &l);
     println!("U = \n{:?}", &u);
     println!("LU = \n{:?}", l.dot(&u));
-    l.dot(&u).permutated(&p).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&l.dot(&u).permutated(&p), &a, 1e-7).unwrap();
 }
 
 macro_rules! test_lu_upper {
diff --git a/tests/qr.rs b/tests/qr.rs
@@ -13,9 +13,9 @@ fn qr_square_upper() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.clone().assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    r.assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.clone(), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&r, &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -31,9 +31,9 @@ fn qr_square_upper_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.clone().assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    r.assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.clone(), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&r, &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -44,8 +44,8 @@ fn qr_square() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -56,8 +56,8 @@ fn qr_square_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -73,9 +73,9 @@ fn qr_3x4_upper() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.clone().assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.clone(), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -91,9 +91,9 @@ fn qr_3x4_upper_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.clone().assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.clone(), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -104,8 +104,8 @@ fn qr_3x4() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -116,8 +116,8 @@ fn qr_3x4_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.dot(&q.t()).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.dot(&q.t()), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -133,8 +133,8 @@ fn qr_4x3_upper() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.t().dot(&q).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.t().dot(&q), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -150,8 +150,8 @@ fn qr_4x3_upper_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.t().dot(&q).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.t().dot(&q), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -162,8 +162,8 @@ fn qr_4x3() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.t().dot(&q).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.t().dot(&q), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -174,6 +174,6 @@ fn qr_4x3_t() {
     let (q, r) = a.clone().qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
-    q.t().dot(&q).assert_allclose_l2(&Array::eye(3), 1e-7);
-    q.dot(&r).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&q.t().dot(&q), &Array::eye(3), 1e-7).unwrap();
+    all_close_l2(&q.dot(&r), &a, 1e-7).unwrap();
 }
diff --git a/tests/ssqrt.rs b/tests/ssqrt.rs
@@ -6,7 +6,7 @@ fn ssqrt_symmetric_random() {
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t());
     let ar = a.clone().ssqrt().unwrap();
-    ar.clone().reversed_axes().assert_allclose_l2(&ar, 1e-7);
+    all_close_l2(&ar.clone().reversed_axes(), &ar, 1e-7).unwrap();
 }
 
 #[test]
@@ -15,7 +15,7 @@ fn ssqrt_symmetric_random_t() {
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t()).reversed_axes();
     let ar = a.clone().ssqrt().unwrap();
-    ar.clone().reversed_axes().assert_allclose_l2(&ar, 1e-7);
+    all_close_l2(&ar.clone().reversed_axes(), &ar, 1e-7).unwrap();
 }
 
 #[test]
@@ -24,7 +24,7 @@ fn ssqrt_sqrt_random() {
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t());
     let ar = a.clone().ssqrt().unwrap();
-    ar.clone().reversed_axes().assert_allclose_l2(&ar, 1e-7);
+    all_close_l2(&ar.clone().reversed_axes(), &ar, 1e-7).unwrap();
 }
 
 #[test]
@@ -33,5 +33,5 @@ fn ssqrt_sqrt_random_t() {
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t()).reversed_axes();
     let ar = a.clone().ssqrt().unwrap();
-    ar.clone().reversed_axes().assert_allclose_l2(&ar, 1e-7);
+    all_close_l2(&ar.clone().reversed_axes(), &ar, 1e-7).unwrap();
 }
diff --git a/tests/svd.rs b/tests/svd.rs
@@ -11,7 +11,7 @@ fn svd_square() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 #[test]
 fn svd_square_t() {
@@ -22,7 +22,7 @@ fn svd_square_t() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -34,7 +34,7 @@ fn svd_4x3() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 #[test]
 fn svd_4x3_t() {
@@ -45,7 +45,7 @@ fn svd_4x3_t() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -57,7 +57,7 @@ fn svd_3x4() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 #[test]
 fn svd_3x4_t() {
@@ -68,7 +68,7 @@ fn svd_3x4_t() {
     for i in 0..3 {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
 
 #[test]
@@ -83,5 +83,5 @@ fn svd_large() {
     for i in 0..min(n, m) {
         sm[(i, i)] = s[i];
     }
-    u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);
+    all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();
 }
diff --git a/tests/triangular.rs b/tests/triangular.rs
@@ -10,7 +10,7 @@ fn solve_upper() {
     let x = a.solve_upper(b.clone()).unwrap();
     println!("x = \n{:?}", &x);
     println!("Ax = \n{:?}", a.dot(&x));
-    a.dot(&x).assert_allclose_l2(&b, 1e-7);
+    all_close_l2(&a.dot(&x), &b, 1e-7).unwrap();
 }
 
 #[test]
@@ -23,7 +23,7 @@ fn solve_upper_t() {
     let x = a.solve_upper(b.clone()).unwrap();
     println!("x = \n{:?}", &x);
     println!("Ax = \n{:?}", a.dot(&x));
-    a.dot(&x).assert_allclose_l2(&b, 1e-7);
+    all_close_l2(&a.dot(&x), &b, 1e-7).unwrap();
 }
 
 #[test]
@@ -36,7 +36,7 @@ fn solve_lower() {
     let x = a.solve_lower(b.clone()).unwrap();
     println!("x = \n{:?}", &x);
     println!("Ax = \n{:?}", a.dot(&x));
-    a.dot(&x).assert_allclose_l2(&b, 1e-7);
+    all_close_l2(&a.dot(&x), &b, 1e-7).unwrap();
 }
 
 #[test]
@@ -49,5 +49,5 @@ fn solve_lower_t() {
     let x = a.solve_lower(b.clone()).unwrap();
     println!("x = \n{:?}", &x);
     println!("Ax = \n{:?}", a.dot(&x));
-    a.dot(&x).assert_allclose_l2(&b, 1e-7);
+    all_close_l2(&a.dot(&x), &b, 1e-7).unwrap();
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ fn cholesky() {`
`9`	`9`	`let c = a.clone().cholesky().unwrap();`
`10`	`10`	`println!("c = \n{:?}", c);`
`11`	`11`	`println!("cc = \n{:?}", c.t().dot(&c));`
`12`		`- c.t().dot(&c).assert_allclose_l2(&a, 1e-7);`
	`12`	`+ all_close_l2(&c.t().dot(&c), &a, 1e-7).unwrap();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`#[test]`
`@@ -21,5 +21,5 @@ fn cholesky_t() {`
`21`	`21`	`let c = a.clone().cholesky().unwrap();`
`22`	`22`	`println!("c = \n{:?}", c);`
`23`	`23`	`println!("cc = \n{:?}", c.t().dot(&c));`
`24`		`- c.t().dot(&c).assert_allclose_l2(&a, 1e-7);`
	`24`	`+ all_close_l2(&c.t().dot(&c), &a, 1e-7).unwrap();`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fn svd_square() {`
`11`	`11`	`for i in 0..3 {`
`12`	`12`	`sm[(i, i)] = s[i];`
`13`	`13`	`}`
`14`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`14`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`15`	`15`	`}`
`16`	`16`	`#[test]`
`17`	`17`	`fn svd_square_t() {`
`@@ -22,7 +22,7 @@ fn svd_square_t() {`
`22`	`22`	`for i in 0..3 {`
`23`	`23`	`sm[(i, i)] = s[i];`
`24`	`24`	`}`
`25`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`25`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`#[test]`
`@@ -34,7 +34,7 @@ fn svd_4x3() {`
`34`	`34`	`for i in 0..3 {`
`35`	`35`	`sm[(i, i)] = s[i];`
`36`	`36`	`}`
`37`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`37`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`38`	`38`	`}`
`39`	`39`	`#[test]`
`40`	`40`	`fn svd_4x3_t() {`
`@@ -45,7 +45,7 @@ fn svd_4x3_t() {`
`45`	`45`	`for i in 0..3 {`
`46`	`46`	`sm[(i, i)] = s[i];`
`47`	`47`	`}`
`48`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`48`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`#[test]`
`@@ -57,7 +57,7 @@ fn svd_3x4() {`
`57`	`57`	`for i in 0..3 {`
`58`	`58`	`sm[(i, i)] = s[i];`
`59`	`59`	`}`
`60`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`60`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`61`	`61`	`}`
`62`	`62`	`#[test]`
`63`	`63`	`fn svd_3x4_t() {`
`@@ -68,7 +68,7 @@ fn svd_3x4_t() {`
`68`	`68`	`for i in 0..3 {`
`69`	`69`	`sm[(i, i)] = s[i];`
`70`	`70`	`}`
`71`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`71`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`#[test]`
`@@ -83,5 +83,5 @@ fn svd_large() {`
`83`	`83`	`for i in 0..min(n, m) {`
`84`	`84`	`sm[(i, i)] = s[i];`
`85`	`85`	`}`
`86`		`- u.dot(&sm).dot(&vt).assert_allclose_l2(&a, 1e-7);`
	`86`	`+ all_close_l2(&u.dot(&sm).dot(&vt), &a, 1e-7).unwrap();`
`87`	`87`	`}`