M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #890 from dimforge/row_vector_array_convert 

Re-add conversion between arrays and row vectors.
This commit is contained in:
Sébastien Crozet 2021-05-09 16:50:20 +02:00 committed by GitHub
parent d268c4d7fb b398a5e189
commit 02614cbdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/base/conversion.rs
View File

@ -23,9 +23,9 @@ use crate::base::{
use crate::base::{DVector, VecStorage}; use crate::base::{DVector, VecStorage};
use crate::base::{SliceStorage, SliceStorageMut}; use crate::base::{SliceStorage, SliceStorageMut};
use crate::constraint::DimEq; use crate::constraint::DimEq;
use crate::{SMatrix, SVector}; use crate::{IsNotStaticOne, RowSVector, SMatrix, SVector};
// TODO: too bad this won't work allo slice conversions. // TODO: too bad this won't work for slice conversions.
impl<T1, T2, R1, C1, R2, C2> SubsetOf<OMatrix<T2, R2, C2>> for OMatrix<T1, R1, C1> impl<T1, T2, R1, C1, R2, C2> SubsetOf<OMatrix<T2, R2, C2>> for OMatrix<T1, R1, C1>
where where
R1: Dim, R1: Dim,
@ -118,6 +118,26 @@ impl<T: Scalar, const D: usize> Into<[T; D]> for SVector<T, D> {
} }
} }
impl<T: Scalar, const D: usize> From<[T; D]> for RowSVector<T, D>
where
Const<D>: IsNotStaticOne,
{
#[inline]
fn from(arr: [T; D]) -> Self {
SVector::<T, D>::from(arr).transpose()
}
}
impl<T: Scalar, const D: usize> Into<[T; D]> for RowSVector<T, D>
where
Const<D>: IsNotStaticOne,
{
#[inline]
fn into(self) -> [T; D] {
self.transpose().into()
}
}
macro_rules! impl_from_into_asref_1D( macro_rules! impl_from_into_asref_1D(
($(($NRows: ident, $NCols: ident) => $SZ: expr);* $(;)*) => {$( ($(($NRows: ident, $NCols: ident) => $SZ: expr);* $(;)*) => {$(
impl<T, S> AsRef<[T; $SZ]> for Matrix<T, $NRows, $NCols, S> impl<T, S> AsRef<[T; $SZ]> for Matrix<T, $NRows, $NCols, S>

11
tests/core/conversion.rs
View File

@ -1,5 +1,4 @@
#![cfg(all(feature = "proptest-support", feature = "alga"))] #![cfg(all(feature = "proptest-support"))]
use alga::linear::Transformation;
use na::{ use na::{
self, Affine3, Isometry3, Matrix2, Matrix2x3, Matrix2x4, Matrix2x5, Matrix2x6, Matrix3, self, Affine3, Isometry3, Matrix2, Matrix2x3, Matrix2x4, Matrix2x5, Matrix2x6, Matrix3,
Matrix3x2, Matrix3x4, Matrix3x5, Matrix3x6, Matrix4, Matrix4x2, Matrix4x3, Matrix4x5, Matrix3x2, Matrix3x4, Matrix3x5, Matrix3x6, Matrix4, Matrix4x2, Matrix4x3, Matrix4x5,
@ -16,7 +15,7 @@ use proptest::{prop_assert, prop_assert_eq, proptest};
proptest! { proptest! {
#[test] #[test]
fn translation_conversion(t in translation3(), v in vector3(), p in point3()) { fn translation_conversion(t in translation3(), p in point3()) {
let iso: Isometry3<f64> = na::convert(t); let iso: Isometry3<f64> = na::convert(t);
let sim: Similarity3<f64> = na::convert(t); let sim: Similarity3<f64> = na::convert(t);
let aff: Affine3<f64> = na::convert(t); let aff: Affine3<f64> = na::convert(t);
@ -29,12 +28,6 @@ proptest! {
prop_assert_eq!(t, na::try_convert(prj).unwrap()); prop_assert_eq!(t, na::try_convert(prj).unwrap());
prop_assert_eq!(t, na::try_convert(tr).unwrap() ); prop_assert_eq!(t, na::try_convert(tr).unwrap() );
prop_assert_eq!(t.transform_vector(&v), iso * v);
prop_assert_eq!(t.transform_vector(&v), sim * v);
prop_assert_eq!(t.transform_vector(&v), aff * v);
prop_assert_eq!(t.transform_vector(&v), prj * v);
prop_assert_eq!(t.transform_vector(&v), tr * v);
prop_assert_eq!(t * p, iso * p); prop_assert_eq!(t * p, iso * p);
prop_assert_eq!(t * p, sim * p); prop_assert_eq!(t * p, sim * p);
prop_assert_eq!(t * p, aff * p); prop_assert_eq!(t * p, aff * p);