code formatting and refactoring

Author: espdev

src/lib.rs

@@ -119,7 +119,6 @@
 //! See [issue](https://github.com/vbarrielle/sprs/issues/184) for details.
 //!
 
-
 mod errors;
 mod ndarrayext;
 mod sprsext;

src/ndarrayext.rs

@@ -26,7 +26,10 @@ use crate::{CsapsError::ReshapeError, Result};
 
 
 pub fn diff<'a, T: 'a, D, V>(data: V, axis: Option<Axis>) -> Array<T, D>
-    where T: NumOps + ScalarOperand, D: Dimension, V: AsArray<'a, T, D>
+    where
+        T: NumOps + ScalarOperand,
+        D: Dimension,
+        V: AsArray<'a, T, D>
 {
     let data_view = data.into();
     let axis = axis.unwrap_or(Axis(data_view.ndim() - 1));
@@ -39,8 +42,9 @@ pub fn diff<'a, T: 'a, D, V>(data: V, axis: Option<Axis>) -> Array<T, D>
 
 
 pub fn to_2d<'a, T: 'a, D, I>(data: I, axis: Axis) -> Result<ArrayView2<'a, T>>
-    where D: Dimension,
-          I: AsArray<'a, T, D>,
+    where
+        D: Dimension,
+        I: AsArray<'a, T, D>,
 {
     let data_view = data.into();
     let ndim = data_view.ndim();
@@ -95,9 +99,10 @@ pub fn to_2d_simple<'a, T: 'a, D>(data: ArrayView<'a, T, D>) -> Result<ArrayView
 
 
 pub fn from_2d<'a, T: 'a, D, S, I>(data: I, shape: S, axis: Axis) -> Result<ArrayView<'a, T, S::Dim>>
-    where D: Dimension,
-          S: IntoDimension<Dim = D>,
-          I: AsArray<'a, T, Ix2>,
+    where
+        D: Dimension,
+        S: IntoDimension<Dim = D>,
+        I: AsArray<'a, T, Ix2>,
 {
     let shape = shape.into_dimension();
     let ndim = shape.ndim();
@@ -145,9 +150,10 @@ pub fn from_2d<'a, T: 'a, D, S, I>(data: I, shape: S, axis: Axis) -> Result<Arra
 ///
 /// This code works if `bins` is increasing
 pub fn digitize<'a, T: 'a, A, B>(arr: A, bins: B) -> Array1<usize>
-    where T: NdFloat + AlmostEqual,
-          A: AsArray<'a, T, Ix1>,
-          B: AsArray<'a, T, Ix1>,
+    where
+        T: NdFloat + AlmostEqual,
+        A: AsArray<'a, T, Ix1>,
+        B: AsArray<'a, T, Ix1>,
 {
     let arr_view = arr.into();
     let bins_view = bins.into();

src/ndg.rs

@@ -111,7 +111,9 @@ impl<'a, T, D> NdGridSpline<'a, T, D>
 /// and data dimension.
 ///
 /// The methods API of `GridCubicSmoothingSpline` is implemented as builder-like pattern or in other
-/// words as chained API (also as `CubicSmoothingSpline` struct):
+/// words as chained API (also as `CubicSmoothingSpline` struct).
+///
+/// # Examples
 ///
 /// ```
 /// use ndarray::array;
@@ -263,7 +265,6 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D>
     /// - If the spline yet has not been computed
     ///
     pub fn evaluate(&self, xi: &[ArrayView1<'a, T>]) -> Result<Array<T, D>> {
-        let xi = xi.to_vec();
         self.evaluate_validate(&xi)?;
         let yi = self.evaluate_spline(&xi);
 

src/ndg/validate.rs

@@ -1,7 +1,7 @@
 use ndarray::{
     NdFloat,
-    ArrayView1,
     ArrayView,
+    ArrayView1,
     Dimension,
 };
 
@@ -39,6 +39,16 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D>
             )
         }
 
+        for xi_ax in xi.iter() {
+            if xi_ax.len() < 1 {
+                return Err(
+                    InvalidInputData(
+                        "The sizes of `xi` vectors must be greater or equal to 1".to_string()
+                    )
+                )
+            }
+        }
+
         Ok(())
     }
 }

src/sprsext.rs

@@ -12,7 +12,8 @@ use sprs_ldl::LdlNumeric;
 /// because sprs crate does not provide DIA matrices currently.
 ///
 pub fn diags<T>(diags: Array2<T>, offsets: &[isize], shape: Shape) -> CsMat<T>
-    where T: NdFloat
+    where
+        T: NdFloat
 {
     let (rows, cols) = shape;
 
@@ -73,7 +74,8 @@ pub fn diags<T>(diags: Array2<T>, offsets: &[isize], shape: Shape) -> CsMat<T>
 ///
 ///
 pub fn diagonal<T>(m: &CsMat<T>, k: isize) -> Array1<T>
-    where T: NdFloat
+    where
+        T: NdFloat
 {
     let (rows, cols) = m.shape();
 
@@ -90,7 +92,8 @@ fn diagonal_csr<T>(k: isize,
                 indptr: &[usize],
                 indices: &[usize],
                 data: &[T]) -> Array1<T>
-    where T: NdFloat
+    where
+        T: NdFloat
 {
     let (rows, cols) = shape;
 
@@ -131,7 +134,8 @@ fn diagonal_csr<T>(k: isize,
 /// b: MxN stack of b-vectors where M is equal to A rows/cols and N is the data dimensional
 ///
 pub fn solve<T>(a: &CsMat<T>, b: &Array2<T>) -> Array2<T>
-    where T: NdFloat
+    where
+        T: NdFloat
 {
     let mut x = Array2::<T>::zeros(b.raw_dim());
 

src/umv.rs

@@ -49,7 +49,8 @@ pub struct NdSpline<'a, T: NdFloat>
 
 
 impl<'a, T> NdSpline<'a, T>
-    where T: NdFloat + AlmostEqual
+    where
+        T: NdFloat + AlmostEqual
 {
     /// Creates `NdSpline` struct from given `breaks` and `coeffs`
     ///
@@ -114,7 +115,9 @@ impl<'a, T> NdSpline<'a, T>
 /// and data dimension.
 ///
 /// The methods API of `CubicSmoothingSpline` is implemented as builder-loke pattern or in other
-/// words as chained API:
+/// words as chained API.
+///
+/// # Examples
 ///
 /// ```
 /// use csaps::CubicSmoothingSpline;
@@ -146,7 +149,9 @@ impl<'a, T> NdSpline<'a, T>
 /// ```
 ///
 pub struct CubicSmoothingSpline<'a, T, D>
-    where T: NdFloat, D: Dimension
+    where
+        T: NdFloat,
+        D: Dimension
 {
     /// X data sites (also breaks)
     x: ArrayView1<'a, T>,
@@ -169,7 +174,9 @@ pub struct CubicSmoothingSpline<'a, T, D>
 
 
 impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
-    where T: NdFloat + Default + AlmostEqual, D: Dimension
+    where
+        T: NdFloat + Default + AlmostEqual,
+        D: Dimension
 {
     /// Creates `CubicSmoothingSpline` struct from the given `X` data sites and `Y` data values
     ///
@@ -182,8 +189,9 @@ impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
     ///   equal to 2 and etc.
     ///
     pub fn new<X, Y>(x: X, y: Y) -> Self
-        where X: AsArray<'a, T>,
-              Y: AsArray<'a, T, D>
+        where
+            X: AsArray<'a, T>,
+            Y: AsArray<'a, T, D>
     {
         CubicSmoothingSpline {
             x: x.into(),
@@ -236,7 +244,8 @@ impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
     /// `weights.len()` must be equal to `x.len()`
     ///
     pub fn with_weights<W>(mut self, weights: W) -> Self
-        where W: AsArray<'a, T>
+        where
+            W: AsArray<'a, T>
     {
         self.invalidate();
         self.weights = Some(weights.into());
@@ -248,7 +257,8 @@ impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
     /// `weights.len()` must be equal to `x.len()`
     ///
     pub fn with_optional_weights<W>(mut self, weights: Option<W>) -> Self
-        where W: AsArray<'a, T>
+        where
+            W: AsArray<'a, T>
     {
         self.invalidate();
         self.weights = weights.map(|w| w.into());
@@ -297,7 +307,8 @@ impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
     /// - If the spline yet has not been computed
     ///
     pub fn evaluate<X>(&self, xi: X) -> Result<Array<T, D>>
-        where X: AsArray<'a, T>
+        where
+            X: AsArray<'a, T>
     {
         let xi = xi.into();
         self.evaluate_validate(xi)?;

src/umv/evaluate.rs

@@ -1,12 +1,25 @@
-use ndarray::{NdFloat, Dimension, Array, Array1, Array2, ArrayView1, Axis, s, stack, ArrayView2};
+use ndarray::{
+    NdFloat,
+    Dimension,
+    Array,
+    Array1,
+    Array2,
+    ArrayView1,
+    ArrayView2,
+    Axis,
+    s,
+    stack,
+};
+
 use almost::AlmostEqual;
 
 use crate::{Result, ndarrayext};
 use super::{CubicSmoothingSpline, NdSpline};
 
 
 impl<'a, T> NdSpline<'a, T>
-    where T: NdFloat + AlmostEqual
+    where
+        T: NdFloat + AlmostEqual
 {
     /// Implements evaluating the spline on the given mesh of Xi-sites
     ///

src/umv/make.rs

@@ -7,7 +7,9 @@ use super::{NdSpline, CubicSmoothingSpline};
 
 
 impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
-    where T: NdFloat + Default + AlmostEqual, D: Dimension
+    where
+        T: NdFloat + Default + AlmostEqual,
+        D: Dimension
 {
     pub(super) fn make_spline(&mut self) -> Result<()> {
         let one = T::one();

src/umv/validate.rs

@@ -17,7 +17,9 @@ use crate::{
 
 
 impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
-    where T: NdFloat + Default + AlmostEqual, D: Dimension
+    where
+        T: NdFloat + Default + AlmostEqual,
+        D: Dimension
 {
     pub(super) fn make_validate(&self) -> Result<()> {
         let x_size = self.x.len();
@@ -84,7 +86,7 @@ impl<'a, T, D> CubicSmoothingSpline<'a, T, D>
         if xi.len() < 1 {
             return Err(
                 InvalidInputData(
-                    "The size of data vectors must be greater or equal to 1".to_string()
+                    "The size of `xi` vector must be greater or equal to 1".to_string()
                 )
             )
         }

src/validate.rs

@@ -5,7 +5,8 @@ use crate::{Result, CsapsError::InvalidInputData};
 
 
 pub(crate) fn validate_data_sites<T>(x: ArrayView1<T>) -> Result<()>
-    where T: NdFloat + AlmostEqual
+    where
+        T: NdFloat + AlmostEqual
 {
     for w in x.windows(2) {
         let e1 = w[0];