diff --git a/src/base/conversion.rs b/src/base/conversion.rs index 783e6d9ed..7dfc07014 100644 --- a/src/base/conversion.rs +++ b/src/base/conversion.rs @@ -1,5 +1,7 @@ #[cfg(all(feature = "alloc", not(feature = "std")))] use alloc::vec::Vec; +use core::convert::TryFrom; +use core::panic; use simba::scalar::{SubsetOf, SupersetOf}; use std::borrow::{Borrow, BorrowMut}; use std::convert::{AsMut, AsRef, From, Into}; @@ -428,6 +430,69 @@ where } } +#[cfg(any(feature = "std", feature = "alloc"))] +impl<'a, T: Scalar, const R0: usize, const C0: usize, R1: Dim, C1: Dim> + TryFrom<&VecStorage> for ArrayStorage +{ + // TODO: where to put Error enum ? + type Error = (); + + fn try_from(vstorage: &VecStorage) -> Result { + if R0 * C0 != vstorage.len() { + Err(()) + } else { + let mut data = MaybeUninit::<[[T; R0]; C0]>::uninit(); + unsafe { core::slice::from_raw_parts_mut(data.as_mut_ptr() as *mut T, R0 * C0) } + .clone_from_slice(vstorage.as_slice()); + Ok(Self(unsafe { data.assume_init() })) + } + } +} + +#[cfg(any(feature = "std", feature = "alloc"))] +impl<'a, T: Scalar, const R0: usize, const C0: usize, R1: Dim, C1: Dim> + From<&ArrayStorage> for VecStorage +{ + fn from(astorage: &ArrayStorage) -> Self { + VecStorage::new( + R1::from_usize(R0), + C1::from_usize(C0), + Vec::from(astorage.as_slice()), + ) + } +} + +#[cfg(any(feature = "std", feature = "alloc"))] +impl<'a, T: Scalar, const R0: usize, const C0: usize, R1: Dim, C1: Dim> + From<&'a Matrix>> + for Matrix, Const, ArrayStorage> +where + VecStorage: RawStorage, +{ + fn from(m: &'a Matrix>) -> Self { + match ArrayStorage::::try_from(&m.data) { + Ok(s) => { + assert_eq!(R0, m.nrows()); + assert_eq!(C0, m.ncols()); + Self::from_array_storage(s) + } + Err(_) => panic!("storage dimensions mismatch"), + } + } +} + +#[cfg(any(feature = "std", feature = "alloc"))] +impl<'a, T: Scalar, const R0: usize, const C0: usize, R1: Dim, C1: Dim> + From<&'a Matrix, Const, ArrayStorage>> + for Matrix> +where + VecStorage: RawStorage, +{ + fn from(m: &'a Matrix, Const, ArrayStorage>) -> Self { + Self::from_data(VecStorage::from(&m.data)) + } +} + impl<'a, T, R, C, RView, CView, RStride, CStride, S> From<&'a mut Matrix> for MatrixView<'a, T, RView, CView, RStride, CStride> where diff --git a/tests/core/matrix.rs b/tests/core/matrix.rs index 501a05665..05d69d80c 100644 --- a/tests/core/matrix.rs +++ b/tests/core/matrix.rs @@ -6,7 +6,8 @@ use na::dimension::{U15, U8}; use na::{ self, Const, DMatrix, DVector, Matrix2, Matrix2x3, Matrix2x4, Matrix3, Matrix3x2, Matrix3x4, Matrix4, Matrix4x3, Matrix4x5, Matrix5, Matrix6, MatrixView2x3, MatrixViewMut2x3, OMatrix, - RowVector3, RowVector4, RowVector5, Vector1, Vector2, Vector3, Vector4, Vector5, Vector6, + RowVector3, RowVector4, RowVector5, SMatrix, SVector, Vector1, Vector2, Vector3, Vector4, + Vector5, Vector6, }; #[test] @@ -1332,3 +1333,59 @@ fn parallel_column_iteration_mut() { assert_eq!(first, second); assert_eq!(second, DMatrix::identity(400, 300)); } + +#[test] +fn dmatrix_from_smatrix() { + type T = f64; + let s = SMatrix::::from_fn(|i, j| (i * 3) as T + j as T); + let d = DMatrix::::from(&s); + assert_eq!(d, s); +} + +#[test] +fn smatrix_from_dmatrix() { + type T = f64; + let d = DMatrix::::from_fn(3, 3, |i, j| (i * 3) as T + j as T); + let s = SMatrix::::from(&d); + assert_eq!(d, s); +} + +#[test] +fn svector_from_dvector() { + type T = f64; + let d = DVector::::from_fn(3, |i, j| (i * 3) as T + j as T); + let s = SVector::::from(&d); + assert_eq!(d, s); +} + +#[test] +fn dvector_from_svector() { + type T = f64; + let s = SVector::::from_fn(|i, j| (i * 3) as T + j as T); + let d = DVector::::from(&s); + assert_eq!(d, s); +} + +#[test] +fn svector3_from_dmatrix3x1() { + type T = f64; + let d = DMatrix::::from_fn(3, 1, |i, j| (i * 3) as T + j as T); + let s = Vector3::::from(&d); + assert_eq!(d, s); +} + +#[test] +#[should_panic] +fn svector3_from_dmatrix3x3() { + type T = f64; + let d = DMatrix::::from_fn(3, 3, |i, j| (i * 3) as T + j as T); + let s = Vector3::::from(&d); + assert_eq!(d, s); +} +#[test] +fn dmatrix_from_svector3() { + type T = f64; + let s = SVector::::from_fn(|i, j| (i * 3) as T + j as T); + let d = DMatrix::::from(&s); + assert_eq!(d, s); +}