diff --git a/src/base/conversion.rs b/src/base/conversion.rs index acb40411..7dfc0701 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}; @@ -19,12 +21,8 @@ use crate::base::{ ArrayStorage, DVectorView, DVectorViewMut, DefaultAllocator, Matrix, MatrixView, MatrixViewMut, OMatrix, Scalar, }; -//TODO: move near From implementation? #[cfg(any(feature = "std", feature = "alloc"))] -use crate::base::{DMatrixView, SMatrixView, SVectorView}; - -#[cfg(any(feature = "std", feature = "alloc"))] -use crate::base::{DMatrix, DVector, RowDVector, VecStorage}; +use crate::base::{DVector, RowDVector, VecStorage}; use crate::base::{ViewStorage, ViewStorageMut}; use crate::constraint::DimEq; use crate::{IsNotStaticOne, RowSVector, SMatrix, SVector, VectorView, VectorViewMut}; @@ -433,34 +431,65 @@ where } #[cfg(any(feature = "std", feature = "alloc"))] -impl<'a, T: Scalar, const R: usize, const C: usize> From<&'a DMatrix> for SMatrix { - fn from(m: &'a DMatrix) -> Self { - let v: DMatrixView<'a, T> = m.as_view(); - SMatrixView::::from(&v).clone_owned() +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 R: usize, const C: usize> From<&'a SMatrix> for DMatrix { - fn from(m: &'a SMatrix) -> Self { - let v: SMatrixView<'a, T, R, C> = m.as_view(); - DMatrixView::::from(&v).clone_owned() +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 R: usize> From<&'a DVector> for SVector { - fn from(m: &'a DVector) -> Self { - let v: DVectorView<'a, T> = m.as_view(); - SVectorView::::from(&v).clone_owned() +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 R: usize> From<&'a SVector> for DVector { - fn from(m: &'a SVector) -> Self { - let v: SVectorView<'a, T, R> = m.as_view(); - DVectorView::::from(&v).clone_owned() +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)) } } diff --git a/tests/core/matrix.rs b/tests/core/matrix.rs index 18a167ad..05d69d80 100644 --- a/tests/core/matrix.rs +++ b/tests/core/matrix.rs @@ -1366,22 +1366,6 @@ fn dvector_from_svector() { assert_eq!(d, s); } -#[test] -fn svector3_from_dvector() { - type T = f64; - let d = DVector::::from_fn(3, |i, j| (i * 3) as T + j as T); - let s = Vector3::::from(&d); - assert_eq!(d, s); -} - -#[test] -fn dvector_from_svector3() { - type T = f64; - let s = Vector3::::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; @@ -1398,3 +1382,10 @@ fn svector3_from_dmatrix3x3() { 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); +}