Use random_regular matrix for det test

Author: termoshtt

src/generate.rs

@@ -58,6 +58,19 @@ where
     q.dot(&r)
 }
 
+/// Generate random regular matrix
+pub fn random_regular_t<A>(n: usize) -> Array2<A>
+where
+    A: Scalar + RandNormal,
+{
+    let a: Array2<A> = random((n, n).f());
+    let (q, mut r) = a.qr_into().unwrap();
+    for i in 0..n {
+        r[(i, i)] = A::from_f64(1.0) + AssociatedReal::inject(r[(i, i)].abs());
+    }
+    q.dot(&r).t().to_owned()
+}
+
 /// Random Hermite matrix
 pub fn random_hermite<A, S>(n: usize) -> ArrayBase<S, Ix2>
 where

tests/det.rs

@@ -100,46 +100,48 @@ fn det_zero_nonsquare() {
 
 #[test]
 fn det() {
-    macro_rules! det {
-        ($elem:ty, $shape:expr, $rtol:expr) => {
-            let a: Array2<$elem> = random($shape);
-            println!("a = \n{:?}", a);
-            let det = det_naive(&a);
-            let sign = det.div_real(det.abs());
-            let ln_det = det.abs().ln();
-            assert_rclose!(a.factorize().unwrap().det().unwrap(), det, $rtol);
-            {
-                let result = a.factorize().unwrap().sln_det().unwrap();
-                assert_rclose!(result.0, sign, $rtol);
-                assert_rclose!(result.1, ln_det, $rtol);
-            }
-            assert_rclose!(a.factorize().unwrap().det_into().unwrap(), det, $rtol);
-            {
-                let result = a.factorize().unwrap().sln_det_into().unwrap();
-                assert_rclose!(result.0, sign, $rtol);
-                assert_rclose!(result.1, ln_det, $rtol);
-            }
-            assert_rclose!(a.det().unwrap(), det, $rtol);
-            {
-                let result = a.sln_det().unwrap();
-                assert_rclose!(result.0, sign, $rtol);
-                assert_rclose!(result.1, ln_det, $rtol);
-            }
-            assert_rclose!(a.clone().det_into().unwrap(), det, $rtol);
-            {
-                let result = a.sln_det_into().unwrap();
-                assert_rclose!(result.0, sign, $rtol);
-                assert_rclose!(result.1, ln_det, $rtol);
-            }
-        };
+    fn det_impl<A, Tol>(a: Array2<A>, rtol: Tol)
+    where
+        A: Scalar<Real = Tol>,
+        Tol: RealScalar<Real = Tol>,
+    {
+        let det = det_naive(&a);
+        let sign = det.div_real(det.abs());
+        let ln_det = det.abs().ln();
+        assert_rclose!(a.factorize().unwrap().det().unwrap(), det, rtol);
+        {
+            let result = a.factorize().unwrap().sln_det().unwrap();
+            assert_rclose!(result.0, sign, rtol);
+            assert_rclose!(result.1, ln_det, rtol);
+        }
+        assert_rclose!(a.factorize().unwrap().det_into().unwrap(), det, rtol);
+        {
+            let result = a.factorize().unwrap().sln_det_into().unwrap();
+            assert_rclose!(result.0, sign, rtol);
+            assert_rclose!(result.1, ln_det, rtol);
+        }
+        assert_rclose!(a.det().unwrap(), det, rtol);
+        {
+            let result = a.sln_det().unwrap();
+            assert_rclose!(result.0, sign, rtol);
+            assert_rclose!(result.1, ln_det, rtol);
+        }
+        assert_rclose!(a.clone().det_into().unwrap(), det, rtol);
+        {
+            let result = a.sln_det_into().unwrap();
+            assert_rclose!(result.0, sign, rtol);
+            assert_rclose!(result.1, ln_det, rtol);
+        }
     }
     for rows in 1..5 {
-        for &shape in &[(rows, rows).into_shape(), (rows, rows).f()] {
-            det!(f64, shape, 1e-9);
-            det!(f32, shape, 1e-4);
-            det!(c64, shape, 1e-9);
-            det!(c32, shape, 1e-4);
-        }
+        det_impl(random_regular::<f64>(rows), 1e-9);
+        det_impl(random_regular::<f32>(rows), 1e-4);
+        det_impl(random_regular::<c64>(rows), 1e-9);
+        det_impl(random_regular::<c32>(rows), 1e-4);
+        det_impl(random_regular_t::<f64>(rows), 1e-9);
+        det_impl(random_regular_t::<f32>(rows), 1e-4);
+        det_impl(random_regular_t::<c64>(rows), 1e-9);
+        det_impl(random_regular_t::<c32>(rows), 1e-4);
     }
 }
 

tests/generate.rs

@@ -0,0 +1,10 @@
+use ndarray::*;
+use ndarray_linalg::*;
+
+#[test]
+fn random_regular_transpose() {
+    let a: Array2<f32> = random_regular(3);
+    assert!(a.is_standard_layout());
+    let a: Array2<f32> = random_regular_t(3);
+    assert!(!a.is_standard_layout());
+}