Replace inv()

Author: termoshtt

src/prelude.rs

@@ -9,3 +9,4 @@ pub use assert::*;
 pub use qr::*;
 pub use svd::*;
 pub use opnorm::*;
+pub use solve::*;

src/solve.rs

@@ -18,7 +18,7 @@ impl<A, S> Factorized<S>
     pub fn solve<Sb>(&self, t: Transpose, mut rhs: ArrayBase<Sb, Ix1>) -> Result<ArrayBase<Sb, Ix1>>
         where Sb: DataMut<Elem = A>
     {
-        A::solve(self.a.layout()?,
+        A::solve(self.a.square_layout()?,
                  t,
                  self.a.as_allocated()?,
                  &self.ipiv,
@@ -32,7 +32,9 @@ impl<A, S> Factorized<S>
           S: DataMut<Elem = A>
 {
     pub fn into_inverse(mut self) -> Result<ArrayBase<S, Ix2>> {
-        A::inv(self.a.layout()?, self.a.as_allocated_mut()?, &self.ipiv)?;
+        A::inv(self.a.square_layout()?,
+               self.a.as_allocated_mut()?,
+               &self.ipiv)?;
         Ok(self.a)
     }
 }

src/square.rs

@@ -1,21 +1,16 @@
 //! Define trait for Hermite matrices
 
 use ndarray::{Ix2, Array, RcArray, ArrayBase, Data};
-use lapack::c::Layout;
 
 use super::matrix::{Matrix, MFloat};
 use super::error::{LinalgError, NotSquareError};
-use super::impls::solve::ImplSolve;
 
 /// Methods for square matrices
 ///
 /// This trait defines method for square matrices,
 /// but does not assure that the matrix is square.
 /// If not square, `NotSquareError` will be thrown.
 pub trait SquareMatrix: Matrix {
-    // fn eig(self) -> (Self::Vector, Self);
-    /// inverse matrix
-    fn inv(self) -> Result<Self, LinalgError>;
     /// trace of matrix
     fn trace(&self) -> Result<Self::Scalar, LinalgError>;
     #[doc(hidden)]
@@ -46,30 +41,13 @@ fn trace<A: MFloat, S>(a: &ArrayBase<S, Ix2>) -> A
 }
 
 impl<A: MFloat> SquareMatrix for Array<A, Ix2> {
-    fn inv(self) -> Result<Self, LinalgError> {
-        self.check_square()?;
-        let (n, _) = self.size();
-        let layout = self.layout()?;
-        let (ipiv, a) = ImplSolve::lu(layout, n, n, self.into_raw_vec())?;
-        let a = ImplSolve::inv(layout, n, a, &ipiv)?;
-        let m = Array::from_vec(a).into_shape((n, n)).unwrap();
-        match layout {
-            Layout::RowMajor => Ok(m),
-            Layout::ColumnMajor => Ok(m.reversed_axes()),
-        }
-    }
     fn trace(&self) -> Result<Self::Scalar, LinalgError> {
         self.check_square()?;
         Ok(trace(self))
     }
 }
 
 impl<A: MFloat> SquareMatrix for RcArray<A, Ix2> {
-    fn inv(self) -> Result<Self, LinalgError> {
-        // XXX unnecessary clone (should use into_owned())
-        let i = self.to_owned().inv()?;
-        Ok(i.into_shared())
-    }
     fn trace(&self) -> Result<Self::Scalar, LinalgError> {
         self.check_square()?;
         Ok(trace(self))