Remove old QR

Author: termoshtt

src/matrix.rs

@@ -6,12 +6,11 @@ use ndarray::DataMut;
 use lapack::c::Layout;
 
 use super::error::{LinalgError, StrideError};
-use super::impls::qr::ImplQR;
 use super::impls::svd::ImplSVD;
 use super::impls::solve::ImplSolve;
 
-pub trait MFloat: ImplQR + ImplSVD + ImplSolve + NdFloat {}
-impl<A: ImplQR + ImplSVD + ImplSolve + NdFloat> MFloat for A {}
+pub trait MFloat: ImplSVD + ImplSolve + NdFloat {}
+impl<A: ImplSVD + ImplSolve + NdFloat> MFloat for A {}
 
 /// Methods for general matrices
 pub trait Matrix: Sized {
@@ -24,8 +23,6 @@ pub trait Matrix: Sized {
     fn layout(&self) -> Result<Layout, StrideError>;
     /// singular-value decomposition (SVD)
     fn svd(self) -> Result<(Self, Self::Vector, Self), LinalgError>;
-    /// QR decomposition
-    fn qr(self) -> Result<(Self, Self), LinalgError>;
     /// LU decomposition
     fn lu(self) -> Result<(Self::Permutator, Self, Self), LinalgError>;
     /// permutate matrix (inplace)
@@ -89,37 +86,6 @@ impl<A: MFloat> Matrix for Array<A, Ix2> {
             Layout::ColumnMajor => Ok((ua.reversed_axes(), sv, va.reversed_axes())),
         }
     }
-    fn qr(self) -> Result<(Self, Self), LinalgError> {
-        let (n, m) = self.size();
-        let strides = self.strides();
-        let k = min(n, m);
-        let layout = self.layout()?;
-        let (q, r) = ImplQR::qr(layout, m, n, self.clone().into_raw_vec())?;
-        let (qa, ra) = if strides[0] < strides[1] {
-            (Array::from_vec(q).into_shape((m, n)).unwrap().reversed_axes(),
-             Array::from_vec(r).into_shape((m, n)).unwrap().reversed_axes())
-        } else {
-            (Array::from_vec(q).into_shape((n, m)).unwrap(), Array::from_vec(r).into_shape((n, m)).unwrap())
-        };
-        let qm = if m > k {
-            let (qsl, _) = qa.view().split_at(Axis(1), k);
-            qsl.to_owned()
-        } else {
-            qa
-        };
-        let mut rm = if n > k {
-            let (rsl, _) = ra.view().split_at(Axis(0), k);
-            rsl.to_owned()
-        } else {
-            ra
-        };
-        for ((i, j), val) in rm.indexed_iter_mut() {
-            if i > j {
-                *val = A::zero();
-            }
-        }
-        Ok((qm, rm))
-    }
     fn lu(self) -> Result<(Self::Permutator, Self, Self), LinalgError> {
         let (n, m) = self.size();
         let k = min(n, m);
@@ -167,10 +133,6 @@ impl<A: MFloat> Matrix for RcArray<A, Ix2> {
         let (u, s, v) = self.into_owned().svd()?;
         Ok((u.into_shared(), s.into_shared(), v.into_shared()))
     }
-    fn qr(self) -> Result<(Self, Self), LinalgError> {
-        let (q, r) = self.into_owned().qr()?;
-        Ok((q.into_shared(), r.into_shared()))
-    }
     fn lu(self) -> Result<(Self::Permutator, Self, Self), LinalgError> {
         let (p, l, u) = self.into_owned().lu()?;
         Ok((p, l.into_shared(), u.into_shared()))

src/traits.rs

@@ -37,7 +37,7 @@ impl<A, S> OperationNorm for ArrayBase<S, Ix2>
 }
 
 pub trait QR<Q, R> {
-    fn qr2(self) -> Result<(Q, R)>;
+    fn qr(self) -> Result<(Q, R)>;
 }
 
 impl<A, S, Sq, Sr> QR<ArrayBase<Sq, Ix2>, ArrayBase<Sr, Ix2>> for ArrayBase<S, Ix2>
@@ -46,7 +46,7 @@ impl<A, S, Sq, Sr> QR<ArrayBase<Sq, Ix2>, ArrayBase<Sr, Ix2>> for ArrayBase<S, I
           Sq: DataOwned<Elem = A> + DataMut,
           Sr: DataOwned<Elem = A> + DataMut
 {
-    fn qr2(mut self) -> Result<(ArrayBase<Sq, Ix2>, ArrayBase<Sr, Ix2>)> {
+    fn qr(mut self) -> Result<(ArrayBase<Sq, Ix2>, ArrayBase<Sr, Ix2>)> {
         let n = self.rows();
         let m = self.cols();
         let k = ::std::cmp::min(n, m);

tests/qr.rs

@@ -10,7 +10,7 @@ fn $funcname() {
     let a = $random($n, $m, $t);
     let ans = a.clone();
     println!("a = \n{:?}", &a);
-    let (q, r) : (Array2<_>, Array2<_>) = a.qr2().unwrap();
+    let (q, r) : (Array2<_>, Array2<_>) = a.qr().unwrap();
     println!("q = \n{:?}", &q);
     println!("r = \n{:?}", &r);
     assert_close_l2!(&q.t().dot(&q), &Array::eye(min($n, $m)), 1e-7);