Merge vector and util into norm submod

Author: termoshtt

src/assert.rs

@@ -3,7 +3,7 @@
 use ndarray::*;
 
 use super::types::*;
-use super::vector::*;
+use super::norm::*;
 
 pub fn rclose<A, Tol>(test: A, truth: A, rtol: Tol) -> Result<Tol, Tol>
     where A: Field + Absolute<Output = Tol>,

src/lib.rs

@@ -57,12 +57,12 @@ pub mod solve;
 pub mod cholesky;
 pub mod eigh;
 
-pub mod vector;
 pub mod matrix;
 pub mod square;
 pub mod triangular;
 
-pub mod util;
 pub mod generate;
 pub mod assert;
+pub mod norm;
+
 pub mod prelude;

src/vector.rs renamed to src/norm.rs

@@ -1,6 +1,8 @@
 //! Define trait for vectors
 
+use std::ops::*;
 use ndarray::*;
+
 use super::types::*;
 
 /// Define norm as a metric linear space (not as a matrix)
@@ -40,3 +42,23 @@ impl<A, S, D, T> Norm for ArrayBase<S, D>
         })
     }
 }
+
+pub enum NormalizeAxis {
+    Row = 0,
+    Column = 1,
+}
+
+/// normalize in L2 norm
+pub fn normalize<A, S, T>(mut m: ArrayBase<S, Ix2>, axis: NormalizeAxis) -> (ArrayBase<S, Ix2>, Vec<T>)
+    where A: Field + Absolute<Output = T> + Div<T, Output = A>,
+          S: DataMut<Elem = A>,
+          T: RealField
+{
+    let mut ms = Vec::new();
+    for mut v in m.axis_iter_mut(Axis(axis as usize)) {
+        let n = v.norm();
+        ms.push(n);
+        v.map_inplace(|x| *x = *x / n)
+    }
+    (m, ms)
+}

src/prelude.rs

@@ -1,8 +1,7 @@
-pub use vector::Norm;
 pub use matrix::Matrix;
 pub use square::SquareMatrix;
 pub use triangular::*;
-pub use util::*;
+pub use norm::*;
 pub use types::*;
 pub use generate::*;
 pub use assert::*;

src/util.rs

@@ -5,23 +5,3 @@ use std::ops::Div;
 
 use super::types::*;
 use super::vector::*;
-
-pub enum NormalizeAxis {
-    Row = 0,
-    Column = 1,
-}
-
-/// normalize in L2 norm
-pub fn normalize<A, S, T>(mut m: ArrayBase<S, Ix2>, axis: NormalizeAxis) -> (ArrayBase<S, Ix2>, Vec<T>)
-    where A: Field + Absolute<Output = T> + Div<T, Output = A>,
-          S: DataMut<Elem = A>,
-          T: RealField
-{
-    let mut ms = Vec::new();
-    for mut v in m.axis_iter_mut(Axis(axis as usize)) {
-        let n = v.norm();
-        ms.push(n);
-        v.map_inplace(|x| *x = *x / n)
-    }
-    (m, ms)
-}