interpdata type

Author: kylecarow

Cargo.toml

@@ -30,5 +30,4 @@ name = "benchmark"
 harness = false
 
 [features]
-default = ["serde"]
 serde = ["dep:serde", "ndarray/serde"]

src/lib.rs

@@ -187,6 +187,27 @@ impl<T> Interpolator<T> for Box<dyn Interpolator<T>> {
     }
 }
 
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
+#[cfg_attr(
+    feature = "serde",
+    serde(bound = "
+        D: DataOwned,
+        D::Elem: Serialize + DeserializeOwned,
+        Dim<[usize; N]>: Serialize + DeserializeOwned,
+        [ArrayBase<D, Ix1>; N]: Serialize + DeserializeOwned,
+    ")
+)]
+pub struct InterpData<D, const N: usize>
+where
+    Dim<[Ix; N]>: Dimension,
+    D: Data,
+    D::Elem: Num + PartialOrd + Copy + Debug,
+{
+    pub grid: [ArrayBase<D, Ix1>; N],
+    pub values: ArrayBase<D, Dim<[Ix; N]>>,
+}
+
 /// Extrapolation strategy
 ///
 /// Controls what happens if supplied interpolant point

src/one/mod.rs

@@ -6,23 +6,7 @@ mod strategies;
 
 const N: usize = 1;
 
-#[derive(Debug)]
-#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[cfg_attr(
-    feature = "serde",
-    serde(bound = "
-        D: DataOwned,
-        D::Elem: Serialize + DeserializeOwned,
-    ")
-)]
-pub struct InterpData1D<D>
-where
-    D: Data,
-    D::Elem: Num + PartialOrd + Copy + Debug,
-{
-    pub grid: [ArrayBase<D, Ix1>; N],
-    pub values: ArrayBase<D, Ix1>,
-}
+pub type InterpData1D<D> = InterpData<D, N>;
 validate_impl!(InterpData1D<D>);
 impl<D> InterpData1D<D>
 where

src/three/mod.rs

@@ -6,23 +6,7 @@ mod strategies;
 
 const N: usize = 3;
 
-#[derive(Debug)]
-#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[cfg_attr(
-    feature = "serde",
-    serde(bound = "
-        D: DataOwned,
-        D::Elem: Serialize + DeserializeOwned,
-    ")
-)]
-pub struct InterpData3D<D>
-where
-    D: Data,
-    D::Elem: Num + PartialOrd + Copy + Debug,
-{
-    pub grid: [ArrayBase<D, Ix1>; N],
-    pub values: ArrayBase<D, Dim<[Ix; N]>>,
-}
+pub type InterpData3D<D> = InterpData<D, N>;
 validate_impl!(InterpData3D<D>);
 impl<D> InterpData3D<D>
 where

src/two/mod.rs

@@ -6,23 +6,7 @@ mod strategies;
 
 const N: usize = 2;
 
-#[derive(Debug)]
-#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[cfg_attr(
-    feature = "serde",
-    serde(bound = "
-        D: DataOwned,
-        D::Elem: Serialize + DeserializeOwned,
-    ")
-)]
-pub struct InterpData2D<D>
-where
-    D: Data,
-    D::Elem: Num + PartialOrd + Copy + Debug,
-{
-    pub grid: [ArrayBase<D, Ix1>; N],
-    pub values: ArrayBase<D, Ix2>,
-}
+pub type InterpData2D<D> = InterpData<D, N>;
 validate_impl!(InterpData2D<D>);
 impl<D> InterpData2D<D>
 where