diff --git a/src/ndarrayext.rs b/src/ndarrayext.rs index c99bcee..efe2ce1 100644 --- a/src/ndarrayext.rs +++ b/src/ndarrayext.rs @@ -46,7 +46,7 @@ pub fn to_2d<'a, T: 'a, D, I>(data: I, axis: Axis) -> Result> let axis_size = shape[axis.0]; let new_shape = [numel / axis_size, axis_size]; - match data_view.permuted_axes(axes).into_shape_with_order(new_shape) { + match data_view.permuted_axes(axes).into_shape(new_shape) { Ok(view_2d) => Ok(view_2d), Err(error) => Err( ReshapeTo2d { @@ -68,7 +68,7 @@ pub fn to_2d_simple<'a, T: 'a, D>(data: ArrayView<'a, T, D>) -> Result Ok(data_2d), Err(error) => Err( ReshapeTo2d { @@ -98,7 +98,7 @@ pub fn from_2d<'a, T: 'a, D, S, I>(data: I, shape: S, axis: Axis) -> Result { let mut axes_tmp: Vec = (0..ndim).collect(); let end_axis = axes_tmp.pop().unwrap(); diff --git a/src/ndg/evaluate.rs b/src/ndg/evaluate.rs index fe4869a..290f46e 100644 --- a/src/ndg/evaluate.rs +++ b/src/ndg/evaluate.rs @@ -47,7 +47,7 @@ impl<'a, T, D> NdGridSpline<'a, T, D> let shape: D = dim_from_vec(self.ndim, coeffs_shape); coeffs_2d - .into_shape_with_order(shape).unwrap() + .into_shape(shape).unwrap() .permuted_axes(permuted_axes.clone()) .to_owned() }; diff --git a/src/ndg/make.rs b/src/ndg/make.rs index 5b11925..b00a00d 100644 --- a/src/ndg/make.rs +++ b/src/ndg/make.rs @@ -66,7 +66,7 @@ impl<'a, T, D> GridCubicSmoothingSpline<'a, T, D> let new_shape: D = dim_from_vec(ndim, coeffs_shape); spline.coeffs() - .into_shape_with_order(new_shape).unwrap() + .into_shape(new_shape).unwrap() .permuted_axes(permuted_axes.clone()) .to_owned() };