Skip to content

Split generic type T into grid Tg and values Tv types #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kylecarow wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Split generic type T into grid Tg and values Tv types #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bd4a3e
wip exploration
kylecarow Aug 23, 2026
fafd62c
document current limitation
kylecarow Aug 23, 2026
ff14c7a
ci fix
kylecarow Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/interpolator/enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ where
Interp1D(Interp1DBase<D, Strategy1DEnum<D::Elem>>),
Interp2D(Interp2DBase<D, Strategy2DEnum<D::Elem>>),
Interp3D(Interp3DBase<D, Strategy3DEnum<D::Elem>>),
InterpND(InterpNDBase<D, StrategyNDEnum<D::Elem>>),
InterpND(InterpNDBase<D, D, StrategyNDEnum>),
}
/// Owned interpolator enum (see [`InterpolatorEnumBase`] for the generic form).
pub type InterpolatorEnum<T> = InterpolatorEnumBase<OwnedRepr<T>>;
Expand Down Expand Up @@ -493,14 +493,14 @@ where
}
}

impl<D, S> From<InterpNDBase<D, S>> for InterpolatorEnumBase<D>
impl<D, S> From<InterpNDBase<D, D, S>> for InterpolatorEnumBase<D>
where
D: Data + RawDataClone + Clone,
D::Elem: Float + Debug,
S: Into<StrategyNDEnum<D::Elem>> + Clone,
S: Into<StrategyNDEnum> + Clone,
{
#[inline]
fn from(interpolator: InterpNDBase<D, S>) -> Self {
fn from(interpolator: InterpNDBase<D, D, S>) -> Self {
InterpolatorEnumBase::InterpND(InterpNDBase {
data: interpolator.data,
strategy: interpolator.strategy.into(),
Expand Down Expand Up @@ -579,7 +579,7 @@ where
pub fn new_nd(
grid: Vec<ArrayBase<D, Ix1>>,
values: ArrayBase<D, IxDyn>,
strategy: impl Into<StrategyNDEnum<D::Elem>>,
strategy: impl Into<StrategyNDEnum>,
extrapolate: Extrapolate<D::Elem>,
) -> Result<Self, ValidateError> {
Ok(Self::InterpND(InterpNDBase::new(
Expand Down Expand Up @@ -759,7 +759,7 @@ mod tests {
.unwrap();
let interp1 = InterpolatorEnumBase::from(interp0.clone());

let interp2: InterpNDBase<_, strategy::enums::StrategyNDEnum<f64>> = InterpNDBase::new(
let interp2: InterpNDBase<_, _, strategy::enums::StrategyNDEnum> = InterpNDBase::new(
vec![x.view(), y.view()],
f_xy_dyn.view(),
strategy::Nearest.into(),
Expand Down
Loading
Loading