Remove rand and float-cmp dev-dependence

Author: termoshtt

Cargo.toml

@@ -18,7 +18,5 @@ version = "0.7"
 features = ["blas"]
 
 [dev-dependencies]
-rand = "0.3.14"
 ndarray-rand = "0.3"
-float-cmp = "0.2.3"
 ndarray-numtest = "0.1.4"

tests/cholesky.rs

@@ -1,42 +1,25 @@
-
-extern crate rand;
-extern crate ndarray;
-extern crate ndarray_rand;
-extern crate ndarray_linalg;
-
-use rand::distributions::*;
-use ndarray::prelude::*;
-use ndarray_linalg::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);
-    }
-}
+include!("header.rs");
 
 #[test]
 fn cholesky() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t());
     println!("a = \n{:?}", a);
     let c = a.clone().cholesky().unwrap();
     println!("c = \n{:?}", c);
     println!("cc = \n{:?}", c.t().dot(&c));
-    all_close(c.t().dot(&c), a);
+    c.t().dot(&c).assert_allclose_l2(&a, 1e-7);
 }
 
 #[test]
 fn cholesky_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random((3, 3), r_dist);
     a = a.dot(&a.t()).reversed_axes();
     println!("a = \n{:?}", a);
     let c = a.clone().cholesky().unwrap();
     println!("c = \n{:?}", c);
     println!("cc = \n{:?}", c.t().dot(&c));
-    all_close(c.t().dot(&c), a);
+    c.t().dot(&c).assert_allclose_l2(&a, 1e-7);
 }

tests/det.rs

@@ -1,27 +1,7 @@
-
-extern crate ndarray;
-extern crate ndarray_linalg;
-extern crate ndarray_rand;
-extern crate rand;
-extern crate float_cmp;
-
-use ndarray::prelude::*;
-use ndarray_linalg::prelude::*;
-use rand::distributions::*;
-use ndarray_rand::RandomExt;
-use float_cmp::ApproxEqRatio;
-
-fn approx_eq(val: f64, truth: f64, ratio: f64) {
-    if !val.approx_eq_ratio(&truth, ratio) {
-        panic!("Not almost equal! val={:?}, truth={:?}, ratio={:?}",
-               val,
-               truth,
-               ratio);
-    }
-}
+include!("header.rs");
 
 fn random_hermite(n: usize) -> Array<f64, Ix2> {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((n, n), r_dist);
     a.dot(&a.t())
 }
@@ -32,5 +12,5 @@ fn deth() {
     let (e, _) = a.clone().eigh().unwrap();
     let deth = a.clone().deth().unwrap();
     let det_eig = e.iter().fold(1.0, |x, y| x * y);
-    approx_eq(deth, det_eig, 1.0e-7);
+    deth.assert_close(det_eig, 1.0e-7);
 }

tests/eigh.rs

@@ -1,17 +1,4 @@
-
-extern crate ndarray;
-extern crate ndarray_linalg;
-
-use ndarray::prelude::*;
-use ndarray_linalg::prelude::*;
-
-fn assert_almost_eq(a: f64, b: f64) {
-    let rel_dev = (a - b).abs() / (a.abs() + b.abs());
-    if rel_dev > 1.0e-7 {
-        panic!("a={:?}, b={:?} are not almost equal", a, b);
-    }
-}
-
+include!("header.rs");
 
 #[test]
 fn eigen_vector_manual() {
@@ -31,6 +18,6 @@ fn diagonalize() {
     let (e, vecs) = a.clone().eigh().unwrap();
     let s = vecs.t().dot(&a).dot(&vecs);
     for i in 0..3 {
-        assert_almost_eq(e[i], s[(i, i)]);
+        e[i].assert_close(s[(i, i)], 1e-7);
     }
 }

tests/header.rs

@@ -0,0 +1,17 @@
+
+extern crate ndarray;
+extern crate ndarray_rand;
+extern crate ndarray_linalg;
+extern crate ndarray_numtest;
+extern crate num_traits;
+
+#[allow(unused_imports)]
+use ndarray::prelude::*;
+#[allow(unused_imports)]
+use ndarray_linalg::prelude::*;
+#[allow(unused_imports)]
+use ndarray_numtest::prelude::*;
+#[allow(unused_imports)]
+use ndarray_rand::RandomExt;
+#[allow(unused_imports)]
+use num_traits::Float;

tests/inv.rs

@@ -1,38 +1,21 @@
-
-extern crate rand;
-extern crate ndarray;
-extern crate ndarray_rand;
-extern crate ndarray_linalg;
-
-use ndarray::prelude::*;
-use ndarray_linalg::prelude::*;
-use rand::distributions::*;
-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);
-    }
-}
+include!("header.rs");
 
 #[test]
 fn inv_random() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random((3, 3), r_dist);
     let ai = a.clone().inv().unwrap();
     let id = Array::eye(3);
-    all_close(ai.dot(&a), id);
+    ai.dot(&a).assert_allclose_l2(&id, 1e-7);
 }
 
 #[test]
 fn inv_random_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 ai = a.clone().inv().unwrap();
     let id = Array::eye(3);
-    all_close(ai.dot(&a), id);
+    ai.dot(&a).assert_allclose_l2(&id, 1e-7);
 }
 
 #[test]

tests/lu.rs

@@ -1,21 +1,4 @@
-
-extern crate ndarray;
-extern crate ndarray_linalg;
-extern crate ndarray_rand;
-extern crate rand;
-
-use ndarray::prelude::*;
-use ndarray_linalg::prelude::*;
-use rand::distributions::*;
-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);
-    }
-}
+include!("header.rs");
 
 macro_rules! test_permutate {
     ($testname:ident, $permutate:expr, $input:expr, $answer:expr) => {
@@ -26,7 +9,7 @@ fn $testname() {
     let p = $permutate; // replace 1-2
     let pa = a.permutated(&p);
     println!("permutated = \n{:?}", &pa);
-    all_close(pa, arr2($answer))
+    pa.assert_allclose_l2(&arr2($answer), 1e-7);
 }
 }} // end test_permutate
 
@@ -39,7 +22,7 @@ fn $testname() {
     let p = $permutate; // replace 1-2
     let pa = a.permutated(&p);
     println!("permutated = \n{:?}", &pa);
-    all_close(pa, arr2($answer))
+    pa.assert_allclose_l2(&arr2($answer), 1e-7);
 }
 }} // end test_permutate_t
 
@@ -75,14 +58,14 @@ fn test_lu(a: Array<f64, Ix2>) {
     println!("L = \n{:?}", &l);
     println!("U = \n{:?}", &u);
     println!("LU = \n{:?}", l.dot(&u));
-    all_close(l.dot(&u).permutated(&p), a);
+    l.dot(&u).permutated(&p).assert_allclose_l2(&a, 1e-7);
 }
 
 macro_rules! test_lu_upper {
     ($testname:ident, $testname_t:ident, $n:expr, $m:expr) => {
 #[test]
 fn $testname() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random(($n, $m), r_dist);
     for ((i, j), val) in a.indexed_iter_mut() {
         if i > j {
@@ -93,7 +76,7 @@ fn $testname() {
 }
 #[test]
 fn $testname_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random(($m, $n), r_dist).reversed_axes();
     for ((i, j), val) in a.indexed_iter_mut() {
         if i > j {
@@ -111,7 +94,7 @@ macro_rules! test_lu_lower {
     ($testname:ident, $testname_t:ident, $n:expr, $m:expr) => {
 #[test]
 fn $testname() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random(($n, $m), r_dist);
     for ((i, j), val) in a.indexed_iter_mut() {
         if i < j {
@@ -122,7 +105,7 @@ fn $testname() {
 }
 #[test]
 fn $testname_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let mut a = Array::<f64, _>::random(($m, $n), r_dist).reversed_axes();
     for ((i, j), val) in a.indexed_iter_mut() {
         if i < j {
@@ -140,13 +123,13 @@ macro_rules! test_lu {
     ($testname:ident, $testname_t:ident, $n:expr, $m:expr) => {
 #[test]
 fn $testname() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random(($n, $m), r_dist);
     test_lu(a);
 }
 #[test]
 fn $testname_t() {
-    let r_dist = Range::new(0., 1.);
+    let r_dist = RealNormal::new(0., 1.);
     let a = Array::<f64, _>::random(($m, $n), r_dist).reversed_axes();
     test_lu(a);
 }

tests/norm.rs

@@ -1,11 +1,4 @@
-
-extern crate ndarray;
-extern crate ndarray_linalg;
-extern crate num_traits;
-
-use ndarray::prelude::*;
-use ndarray_linalg::prelude::*;
-use num_traits::float::Float;
+include!("header.rs");
 
 fn assert_almost_eq(a: f64, b: f64) {
     let rel_dev = (a - b).abs() / (a.abs() + b.abs());