Replace all_close with abs_diff_eq in tests (currently failing)

rust-ndarray · LukeMathWalker · May 5, 2019 · Jan 11, 2019 · Jan 14, 2019 · May 4, 2019
commit 9b831753a74f3bef35cca07789e1749e47e71ccd
diff --git a/tests/array.rs b/tests/array.rs
@@ -12,6 +12,7 @@ use ndarray::{
     multislice,
 };
 use ndarray::indices;
+use approx::AbsDiffEq;
 use defmac::defmac;
 use itertools::{enumerate, zip, Itertools};
 
@@ -680,15 +681,16 @@ fn test_sub_oob_1() {
 
 
 #[test]
+#[cfg(feature = "approx")]
 fn test_select(){
     // test for 2-d array
     let x = arr2(&[[0., 1.], [1.,0.],[1.,0.],[1.,0.],[1.,0.],[0., 1.],[0., 1.]]);
     let r = x.select(Axis(0),&[1,3,5]);
     let c = x.select(Axis(1),&[1]);
     let r_target = arr2(&[[1.,0.],[1.,0.],[0., 1.]]);
     let c_target = arr2(&[[1.,0.,0.,0.,0., 1., 1.]]);
-    assert!(r.all_close(&r_target,1e-8));
-    assert!(c.all_close(&c_target.t(),1e-8));
+    assert!(r.abs_diff_eq(&r_target,1e-8));
+    assert!(c.abs_diff_eq(&c_target.t(),1e-8));
 
     // test for 3-d array
     let y = arr3(&[[[1., 2., 3.],
@@ -699,8 +701,8 @@ fn test_select(){
     let c = y.select(Axis(2),&[1]);
     let r_target = arr3(&[[[1.5, 1.5, 3.]], [[1., 2.5, 3.]]]);
     let c_target = arr3(&[[[2.],[1.5]],[[2.],[2.5]]]);
-    assert!(r.all_close(&r_target,1e-8));
-    assert!(c.all_close(&c_target,1e-8));
+    assert!(r.abs_diff_eq(&r_target,1e-8));
+    assert!(c.abs_diff_eq(&c_target,1e-8));
 
 }
 
@@ -1733,13 +1735,14 @@ fn test_contiguous() {
 }
 
 #[test]
+#[cfg(feature = "approx")]
 fn test_all_close() {
     let c = arr3(&[[[1., 2., 3.],
                     [1.5, 1.5, 3.]],
                    [[1., 2., 3.],
                     [1., 2.5, 3.]]]);
-    assert!(c.all_close(&aview1(&[1., 2., 3.]), 1.));
-    assert!(!c.all_close(&aview1(&[1., 2., 3.]), 0.1));
+    assert!(c.abs_diff_eq(&aview1(&[1., 2., 3.]), 1.));
+    assert!(c.abs_diff_neq(&aview1(&[1., 2., 3.]), 0.1));
 }
 
 #[test]