Use Ix1/Ix2 instead of Ix #15

Author: termoshtt

src/hermite.rs

@@ -1,7 +1,6 @@
 //! Define trait for Hermite matrices
 
-use ndarray::prelude::*;
-use ndarray::LinalgScalar;
+use ndarray::{Ix2, Array, LinalgScalar};
 use num_traits::float::Float;
 
 use matrix::Matrix;
@@ -21,7 +20,7 @@ pub trait HermiteMatrix: SquareMatrix + Matrix {
     fn ssqrt(self) -> Result<Self, LinalgError>;
 }
 
-impl<A> HermiteMatrix for Array<A, (Ix, Ix)>
+impl<A> HermiteMatrix for Array<A, Ix2>
     where A: ImplQR + ImplSVD + ImplNorm + ImplSolve + ImplEigh + LinalgScalar + Float
 {
     fn eigh(self) -> Result<(Self::Vector, Self), LinalgError> {

src/matrix.rs

@@ -1,8 +1,7 @@
 //! Define trait for general matrix
 
 use std::cmp::min;
-use ndarray::prelude::*;
-use ndarray::LinalgScalar;
+use ndarray::{Ix1, Ix2, Array, Axis, LinalgScalar};
 
 use error::LapackError;
 use qr::ImplQR;
@@ -27,11 +26,11 @@ pub trait Matrix: Sized {
     fn qr(self) -> Result<(Self, Self), LapackError>;
 }
 
-impl<A> Matrix for Array<A, (Ix, Ix)>
+impl<A> Matrix for Array<A, Ix2>
     where A: ImplQR + ImplSVD + ImplNorm + LinalgScalar
 {
     type Scalar = A;
-    type Vector = Array<A, Ix>;
+    type Vector = Array<A, Ix1>;
     fn size(&self) -> (usize, usize) {
         (self.rows(), self.cols())
     }

src/square.rs

@@ -1,7 +1,6 @@
 //! Define trait for Hermite matrices
 
-use ndarray::prelude::*;
-use ndarray::LinalgScalar;
+use ndarray::{Ix2, Array, LinalgScalar};
 use num_traits::float::Float;
 
 use matrix::Matrix;
@@ -37,7 +36,7 @@ pub trait SquareMatrix: Matrix {
     }
 }
 
-impl<A> SquareMatrix for Array<A, (Ix, Ix)>
+impl<A> SquareMatrix for Array<A, Ix2>
     where A: ImplQR + ImplNorm + ImplSVD + ImplSolve + LinalgScalar + Float
 {
     fn inv(self) -> Result<Self, LinalgError> {

src/vector.rs

@@ -1,7 +1,6 @@
 //! Define trait for vectors
 
-use ndarray::prelude::*;
-use ndarray::LinalgScalar;
+use ndarray::{LinalgScalar, Array, Ix1};
 use num_traits::float::Float;
 
 /// Methods for vectors
@@ -11,7 +10,7 @@ pub trait Vector {
     fn norm(&self) -> Self::Scalar;
 }
 
-impl<A: Float + LinalgScalar> Vector for Array<A, Ix> {
+impl<A: Float + LinalgScalar> Vector for Array<A, Ix1> {
     type Scalar = A;
     fn norm(&self) -> Self::Scalar {
         self.dot(&self).sqrt()

tests/inv.rs

@@ -9,7 +9,7 @@ use ndarray_linalg::prelude::*;
 use rand::distributions::*;
 use ndarray_rand::RandomExt;
 
-fn all_close(a: Array<f64, (Ix, Ix)>, b: Array<f64, (Ix, Ix)>) {
+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,

tests/qr.rs

@@ -9,7 +9,7 @@ use ndarray_linalg::prelude::*;
 use rand::distributions::*;
 use ndarray_rand::RandomExt;
 
-fn all_close(a: Array<f64, (Ix, Ix)>, b: Array<f64, (Ix, Ix)>) {
+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,

tests/ssqrt.rs

@@ -9,7 +9,7 @@ use ndarray::prelude::*;
 use ndarray_linalg::prelude::*;
 use ndarray_rand::RandomExt;
 
-fn all_close(a: &Array<f64, (Ix, Ix)>, b: &Array<f64, (Ix, Ix)>) {
+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,

tests/svd.rs

@@ -10,7 +10,7 @@ use ndarray_linalg::prelude::*;
 use rand::distributions::*;
 use ndarray_rand::RandomExt;
 
-fn all_close(a: Array<f64, (Ix, Ix)>, b: Array<f64, (Ix, Ix)>) {
+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,