Revise layout func

Author: termoshtt

src/layout.rs

@@ -9,7 +9,7 @@ pub type LEN = i32;
 pub type Col = i32;
 pub type Row = i32;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Layout {
     C((Row, LDA)),
     F((Col, LDA)),
@@ -87,15 +87,15 @@ impl<A, S> AllocatedArray for ArrayBase<S, Ix2>
     type Elem = A;
 
     fn layout(&self) -> Result<Layout> {
+        let shape = self.shape();
         let strides = self.strides();
-        if ::std::cmp::min(strides[0], strides[1]) != 1 {
-            return Err(StrideError::new(strides[0], strides[1]).into());
+        if shape[0] == strides[1] as usize {
+            return Ok(Layout::F((self.cols() as i32, self.rows() as i32)));
         }
-        if strides[0] > strides[1] {
-            Ok(Layout::C((self.rows() as i32, self.cols() as i32)))
-        } else {
-            Ok(Layout::F((self.cols() as i32, self.rows() as i32)))
+        if shape[1] == strides[0] as usize {
+            return Ok(Layout::C((self.rows() as i32, self.cols() as i32)));
         }
+        Err(StrideError::new(strides[0], strides[1]).into())
     }
 
     fn square_layout(&self) -> Result<Layout> {

src/prelude.rs

@@ -2,6 +2,7 @@
 pub use assert::*;
 pub use generate::*;
 pub use types::*;
+pub use layout::*;
 
 pub use cholesky::*;
 pub use eigh::*;

tests/layout.rs

@@ -0,0 +1,35 @@
+
+extern crate ndarray;
+extern crate ndarray_linalg;
+
+use ndarray::*;
+use ndarray_linalg::prelude::*;
+use ndarray_linalg::layout::Layout;
+
+#[test]
+fn layout_c_3x1() {
+    let a: Array2<f64> = Array::zeros((3, 1));
+    println!("a = {:?}", &a);
+    assert_eq!(a.layout().unwrap(), Layout::C((3, 1)));
+}
+
+#[test]
+fn layout_f_3x1() {
+    let a: Array2<f64> = Array::zeros((3, 1).f());
+    println!("a = {:?}", &a);
+    assert_eq!(a.layout().unwrap(), Layout::F((1, 3)));
+}
+
+#[test]
+fn layout_c_3x2() {
+    let a: Array2<f64> = Array::zeros((3, 2));
+    println!("a = {:?}", &a);
+    assert_eq!(a.layout().unwrap(), Layout::C((3, 2)));
+}
+
+#[test]
+fn layout_f_3x2() {
+    let a: Array2<f64> = Array::zeros((3, 2).f());
+    println!("a = {:?}", &a);
+    assert_eq!(a.layout().unwrap(), Layout::F((2, 3)));
+}