Merge branch 'main' into cubic

Author: kylecarow

src/n/mod.rs

@@ -190,6 +190,7 @@ where
     fn validate(&self) -> Result<(), ValidateError> {
         self.check_extrapolate(&self.extrapolate)?;
         self.data.validate()?;
+        self.strategy.init(&self.data)?;
         Ok(())
     }
 

src/one/mod.rs

@@ -126,6 +126,7 @@ where
     fn validate(&self) -> Result<(), ValidateError> {
         self.check_extrapolate(&self.extrapolate)?;
         self.data.validate()?;
+        self.strategy.init(&self.data)?;
         Ok(())
     }
 

src/strategy.rs

@@ -7,11 +7,16 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, _data: &InterpData1D<D>) -> Result<(), ValidateError> {
+        Ok(())
+    }
+
     fn interpolate(
         &self,
         data: &InterpData1D<D>,
         point: &[D::Elem; 1],
     ) -> Result<D::Elem, InterpolateError>;
+
     /// Does this type's [`Strategy1D::interpolate`] provision for extrapolation?
     fn allow_extrapolate(&self) -> bool;
 }
@@ -23,13 +28,18 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, data: &InterpData1D<D>) -> Result<(), ValidateError> {
+        (**self).init(data)
+    }
+
     fn interpolate(
         &self,
         data: &InterpData1D<D>,
         point: &[D::Elem; 1],
     ) -> Result<D::Elem, InterpolateError> {
         (**self).interpolate(data, point)
     }
+
     fn allow_extrapolate(&self) -> bool {
         (**self).allow_extrapolate()
     }
@@ -40,11 +50,16 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, _data: &InterpData2D<D>) -> Result<(), ValidateError> {
+        Ok(())
+    }
+
     fn interpolate(
         &self,
         data: &InterpData2D<D>,
         point: &[D::Elem; 2],
     ) -> Result<D::Elem, InterpolateError>;
+
     /// Does this type's [`Strategy2D::interpolate`] provision for extrapolation?
     fn allow_extrapolate(&self) -> bool;
 }
@@ -56,13 +71,18 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, data: &InterpData2D<D>) -> Result<(), ValidateError> {
+        (**self).init(data)
+    }
+
     fn interpolate(
         &self,
         data: &InterpData2D<D>,
         point: &[D::Elem; 2],
     ) -> Result<D::Elem, InterpolateError> {
         (**self).interpolate(data, point)
     }
+
     fn allow_extrapolate(&self) -> bool {
         (**self).allow_extrapolate()
     }
@@ -73,11 +93,16 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, _data: &InterpData3D<D>) -> Result<(), ValidateError> {
+        Ok(())
+    }
+
     fn interpolate(
         &self,
         data: &InterpData3D<D>,
         point: &[D::Elem; 3],
     ) -> Result<D::Elem, InterpolateError>;
+
     /// Does this type's [`Strategy3D::interpolate`] provision for extrapolation?
     fn allow_extrapolate(&self) -> bool;
 }
@@ -89,13 +114,18 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, data: &InterpData3D<D>) -> Result<(), ValidateError> {
+        (**self).init(data)
+    }
+
     fn interpolate(
         &self,
         data: &InterpData3D<D>,
         point: &[D::Elem; 3],
     ) -> Result<D::Elem, InterpolateError> {
         (**self).interpolate(data, point)
     }
+
     fn allow_extrapolate(&self) -> bool {
         (**self).allow_extrapolate()
     }
@@ -106,11 +136,16 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, _data: &InterpDataND<D>) -> Result<(), ValidateError> {
+        Ok(())
+    }
+
     fn interpolate(
         &self,
         data: &InterpDataND<D>,
         point: &[D::Elem],
     ) -> Result<D::Elem, InterpolateError>;
+
     /// Does this type's [`StrategyND::interpolate`] provision for extrapolation?
     fn allow_extrapolate(&self) -> bool;
 }
@@ -122,13 +157,18 @@ where
     D: Data + RawDataClone + Clone,
     D::Elem: PartialEq + Debug,
 {
+    fn init(&self, data: &InterpDataND<D>) -> Result<(), ValidateError> {
+        (**self).init(data)
+    }
+
     fn interpolate(
         &self,
         data: &InterpDataND<D>,
         point: &[D::Elem],
     ) -> Result<D::Elem, InterpolateError> {
         (**self).interpolate(data, point)
     }
+
     fn allow_extrapolate(&self) -> bool {
         (**self).allow_extrapolate()
     }

src/three/mod.rs

@@ -145,6 +145,7 @@ where
     fn validate(&self) -> Result<(), ValidateError> {
         self.check_extrapolate(&self.extrapolate)?;
         self.data.validate()?;
+        self.strategy.init(&self.data)?;
         Ok(())
     }
 

src/two/mod.rs

@@ -131,6 +131,7 @@ where
     fn validate(&self) -> Result<(), ValidateError> {
         self.check_extrapolate(&self.extrapolate)?;
         self.data.validate()?;
+        self.strategy.init(&self.data)?;
         Ok(())
     }