change api for using slice of ArrayView1 instead of AsArray

because it is currently impossible. AsRef<_> trait should be implemented for ArrayBase

Author: espdev

src/ndg.rs

@@ -130,12 +130,12 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D>
         D: Dimension
 {
     /// Creates `NdGridCubicSmoothingSpline` struct from the given `X` data sites and `Y` data values
-    pub fn new<X, Y>(x: &'a [X], y: Y) -> Self
-        where X: AsArray<'a, T> + AsRef<[T]>,
-              Y: AsArray<'a, T, D>
+    pub fn new<Y>(x: &[ArrayView1<'a, T>], y: Y) -> Self
+        where
+            Y: AsArray<'a, T, D>
     {
         GridCubicSmoothingSpline {
-            x: x.iter().map_into().collect(),
+            x: x.to_vec(),
             y: y.into(),
             weights: None,
             smooth: None,
@@ -147,18 +147,9 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D>
     ///
     /// `weights.len()` must be equal to `x.len()`
     ///
-    pub fn with_weights<W>(mut self, weights: &'a [Option<W>]) -> Self
-        where W: AsArray<'a, T> + AsRef<[T]>
-    {
-        let weights = weights.iter().map(|w| {
-            match w {
-                Some(w) => Some(w.into()),
-                None => None,
-            }
-        }).collect();
-
+    pub fn with_weights(mut self, weights: &[Option<ArrayView1<'a, T>>]) -> Self {
         self.invalidate();
-        self.weights = Some(weights);
+        self.weights = Some(weights.to_vec());
         self
     }
 
@@ -199,13 +190,21 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D>
     /// - If the `xi` data is invalid
     /// - If the spline yet has not been computed
     ///
-    pub fn evaluate<X>(&self, xi: &'a [X]) -> Result<Array<T, D>>
-        where X: AsArray<'a, T> + AsRef<[T]>
-    {
-        let xi: Vec<ArrayView1<'a, T>> = xi.iter().map_into().collect();
+    pub fn evaluate(&self, xi: &[ArrayView1<'a, T>]) -> Result<Array<T, D>> {
+        let xi = xi.to_vec();
         self.evaluate_spline(&xi)
     }
 
+    /// Returns the ref to smoothing parameters vector or None
+    pub fn smooth(&self) -> Option<&Vec<Option<T>>> {
+        self.smooth.as_ref()
+    }
+
+    /// Returns ref to `NdGridSpline` struct with data of computed spline or None
+    pub fn spline(&self) -> Option<&NdGridSpline<'a, T, D>> {
+        self.spline.as_ref()
+    }
+
     /// Invalidate computed spline
     fn invalidate(&mut self) {
         self.spline = None;

src/ndg/validate.rs

@@ -42,7 +42,7 @@ pub(super) fn validate_xy<T, D>(x: &[ArrayView1<'_, T>], y: ArrayView<'_, T, D>)
     if x.len() != y.ndim() {
         return Err(
             InvalidInputData(
-                format!("The number of `x` data sites ({}) is not equal to `y` data dimensionality ({})",
+                format!("The number of `x` data site vectors ({}) is not equal to `y` data dimensionality ({})",
                         x.len(), y.ndim())
             )
         )

tests/ndg_make.rs

@@ -8,14 +8,16 @@ fn test_make_surface() {
     let x0 = array![1., 2., 3.];
     let x1 = array![1., 2., 3., 4.];
 
-    let x = vec![&x0, &x1];
+    let x = vec![x0.view(), x1.view()];
 
     let y = array![
         [1., 2., 3., 4.],
         [5., 6., 7., 8.],
         [9., 10., 11., 12.],
     ];
 
-    let spline = GridCubicSmoothingSpline::new(&x, &y)
+    let s = GridCubicSmoothingSpline::new(&x, &y)
         .make().unwrap();
+
+    assert!(s.spline().is_some())
 }