make interp_array more generic

Conflicts:
	src/interp1d.rs

Author: jonasBoss

src/interp1d.rs

@@ -12,7 +12,7 @@ use std::{fmt::Debug, ops::Sub};
 
 use ndarray::{
     s, Array, ArrayBase, ArrayView, Axis, AxisDescription, Data, DimAdd, Dimension, IntoDimension,
-    Ix1, NdIndex, OwnedRepr, RemoveAxis, Slice,
+    Ix1, OwnedRepr, RemoveAxis, Slice,
 };
 use num_traits::{cast, Num, NumCast};
 
@@ -183,25 +183,20 @@ where
     /// let result = interpolator.interp_array(&query).unwrap();
     /// # assert_abs_diff_eq!(result, expected, epsilon=f64::EPSILON);
     /// ```
-    pub fn interp_array<Dq>(
+    pub fn interp_array<Sq, Dq>(
         &self,
-        xs: &ArrayBase<Sx, Dq>,
+        xs: &ArrayBase<Sq, Dq>,
     ) -> Result<Array<Sd::Elem, <Dq as DimAdd<D::Smaller>>::Output>, InterpolateError>
     where
-        D: RemoveAxis,
+        Sq: Data<Elem = Sd::Elem>,
         Dq: Dimension + DimAdd<D::Smaller>,
-        Dq::Pattern: NdIndex<Dq>,
     {
         let mut dim = <Dq as DimAdd<D::Smaller>>::Output::default();
         dim.as_array_view_mut()
             .into_iter()
-            .zip(
-                xs.shape()
-                    .iter()
-                    .chain(self.data.raw_dim().as_array_view().slice(s![1..])),
-            )
-            .for_each(|(new_axis, len)| {
-                *new_axis = *len;
+            .zip(xs.shape().iter().chain(self.data.shape()[1..].iter()))
+            .for_each(|(new_axis, &len)| {
+                *new_axis = len;
             });
         let mut ys = Array::zeros(dim);
 

tests/interp1d.rs

@@ -193,3 +193,13 @@ fn interp_multi_fn() {
         epsilon = f64::EPSILON
     );
 }
+
+#[test]
+fn interp_array_with_differnt_repr(){
+    let interp = Interp1D::builder(array![1.0, 2.0, 3.0, 4.0, 5.0, 5.0, 4.0, 3.0, 2.0, 1.0])
+        .build()
+        .unwrap();
+    let x_query = array![[1.0, 2.0, 9.0], [4.0, 5.0, 7.5]];
+    let y_expect = array![[2.0, 3.0, 1.0], [5.0, 5.0, 2.5]];
+    assert_eq!(interp.interp_array(&x_query.view()).unwrap(), y_expect);
+}