Merge pull request #22 from termoshtt/traits

Introduce MFloat and HMFloat

Author: termoshtt

src/hermite.rs

@@ -1,21 +1,17 @@
 //! Define trait for Hermite matrices
 
-use ndarray::{Ix2, Array, LinalgScalar};
-use std::fmt::Debug;
-use num_traits::float::Float;
-use num_traits::One;
+use ndarray::{Ix2, Array};
 use lapack::c::Layout;
 
-use matrix::Matrix;
+use matrix::{Matrix, MFloat};
 use square::SquareMatrix;
 use error::LinalgError;
 use eigh::ImplEigh;
-use qr::ImplQR;
-use svd::ImplSVD;
-use norm::ImplNorm;
-use solve::ImplSolve;
 use cholesky::ImplCholesky;
 
+pub trait HMFloat: ImplEigh + ImplCholesky + MFloat {}
+impl<A: ImplEigh + ImplCholesky + MFloat> HMFloat for A {}
+
 /// Methods for Hermite matrix
 pub trait HermiteMatrix: SquareMatrix + Matrix {
     /// eigenvalue decomposition
@@ -28,9 +24,7 @@ pub trait HermiteMatrix: SquareMatrix + Matrix {
     fn deth(self) -> Result<Self::Scalar, LinalgError>;
 }
 
-impl<A> HermiteMatrix for Array<A, Ix2>
-    where A: ImplQR + ImplSVD + ImplNorm + ImplSolve + ImplEigh + ImplCholesky + LinalgScalar + Float + Debug + One
-{
+impl<A: HMFloat> HermiteMatrix for Array<A, Ix2> {
     fn eigh(self) -> Result<(Self::Vector, Self), LinalgError> {
         self.check_square()?;
         let layout = self.layout()?;

src/matrix.rs

@@ -1,9 +1,7 @@
 //! Define trait for general matrix
 
 use std::cmp::min;
-use std::fmt::Debug;
 use ndarray::prelude::*;
-use ndarray::LinalgScalar;
 use lapack::c::Layout;
 
 use error::{LinalgError, StrideError};
@@ -12,6 +10,9 @@ use svd::ImplSVD;
 use norm::ImplNorm;
 use solve::ImplSolve;
 
+pub trait MFloat: ImplQR + ImplSVD + ImplNorm + ImplSolve + NdFloat {}
+impl<A: ImplQR + ImplSVD + ImplNorm + ImplSolve + NdFloat> MFloat for A {}
+
 /// Methods for general matrices
 pub trait Matrix: Sized {
     type Scalar;
@@ -42,9 +43,7 @@ pub trait Matrix: Sized {
     }
 }
 
-impl<A> Matrix for Array<A, Ix2>
-    where A: ImplQR + ImplSVD + ImplNorm + ImplSolve + LinalgScalar + Debug
-{
+impl<A: MFloat> Matrix for Array<A, Ix2> {
     type Scalar = A;
     type Vector = Array<A, Ix1>;
     type Permutator = Vec<i32>;

src/square.rs

@@ -1,15 +1,10 @@
 //! Define trait for Hermite matrices
 
-use ndarray::{Ix2, Array, LinalgScalar};
-use std::fmt::Debug;
-use num_traits::float::Float;
+use ndarray::{Ix2, Array};
 use lapack::c::Layout;
 
-use matrix::Matrix;
+use matrix::{Matrix, MFloat};
 use error::{LinalgError, NotSquareError};
-use qr::ImplQR;
-use svd::ImplSVD;
-use norm::ImplNorm;
 use solve::ImplSolve;
 
 /// Methods for square matrices
@@ -37,9 +32,7 @@ pub trait SquareMatrix: Matrix {
     }
 }
 
-impl<A> SquareMatrix for Array<A, Ix2>
-    where A: ImplQR + ImplNorm + ImplSVD + ImplSolve + LinalgScalar + Float + Debug
-{
+impl<A: MFloat> SquareMatrix for Array<A, Ix2> {
     fn inv(self) -> Result<Self, LinalgError> {
         self.check_square()?;
         let (n, _) = self.size();

src/triangular.rs

@@ -1,14 +1,9 @@
 
-use ndarray::{Ix2, Array, LinalgScalar};
-use std::fmt::Debug;
-use num_traits::float::Float;
+use ndarray::{Ix2, Array};
 
-use matrix::Matrix;
+use matrix::{Matrix, MFloat};
 use square::SquareMatrix;
 use error::LinalgError;
-use qr::ImplQR;
-use svd::ImplSVD;
-use norm::ImplNorm;
 use solve::ImplSolve;
 
 pub trait TriangularMatrix: Matrix + SquareMatrix {
@@ -18,9 +13,7 @@ pub trait TriangularMatrix: Matrix + SquareMatrix {
     fn solve_lower(&self, Self::Vector) -> Result<Self::Vector, LinalgError>;
 }
 
-impl<A> TriangularMatrix for Array<A, Ix2>
-    where A: ImplQR + ImplNorm + ImplSVD + ImplSolve + LinalgScalar + Float + Debug
-{
+impl<A: MFloat> TriangularMatrix for Array<A, Ix2> {
     fn solve_upper(&self, b: Self::Vector) -> Result<Self::Vector, LinalgError> {
         self.check_square()?;
         let (n, _) = self.size();