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

Add a SIMD version of cap_magnitude: simd_cap_magnitude.

This commit is contained in:
Crozet Sébastien 2021-03-06 19:16:22 +01:00
parent 9ce8402ef3
commit b687c63bb2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/base/norm.rs
View File

@ -8,9 +8,9 @@ use crate::allocator::Allocator;
use crate::base::{DefaultAllocator, Dim, DimName, Matrix, MatrixMN, Normed, VectorN}; use crate::base::{DefaultAllocator, Dim, DimName, Matrix, MatrixMN, Normed, VectorN};
use crate::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint}; use crate::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint};
use crate::storage::{Storage, StorageMut}; use crate::storage::{Storage, StorageMut};
use crate::{ComplexField, RealField, Scalar, SimdComplexField, Unit}; use crate::{ComplexField, Scalar, SimdComplexField, Unit};
use simba::scalar::ClosedNeg; use simba::scalar::ClosedNeg;
use simba::simd::{SimdOption, SimdPartialOrd}; use simba::simd::{SimdOption, SimdPartialOrd, SimdValue};
// TODO: this should be be a trait on alga? // TODO: this should be be a trait on alga?
/// A trait for abstract matrix norms. /// A trait for abstract matrix norms.
@ -343,7 +343,7 @@ impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> Matrix<N, R, C, S> {
#[inline] #[inline]
pub fn cap_magnitude(&self, max: N::RealField) -> MatrixMN<N, R, C> pub fn cap_magnitude(&self, max: N::RealField) -> MatrixMN<N, R, C>
where where
N: RealField, N: ComplexField,
DefaultAllocator: Allocator<N, R, C>, DefaultAllocator: Allocator<N, R, C>,
{ {
let n = self.norm(); let n = self.norm();
@ -355,6 +355,20 @@ impl<N: Scalar, R: Dim, C: Dim, S: Storage<N, R, C>> Matrix<N, R, C, S> {
} }
} }
/// Returns a new vector with the same magnitude as `self` clamped between `0.0` and `max`.
#[inline]
pub fn simd_cap_magnitude(&self, max: N::SimdRealField) -> MatrixMN<N, R, C>
where
N: SimdComplexField,
N::Element: Scalar,
DefaultAllocator: Allocator<N, R, C> + Allocator<N::Element, R, C>,
{
let n = self.norm();
let scaled = self.scale(max / n);
let use_scaled = n.simd_gt(max);
scaled.select(use_scaled, self.clone_owned())
}
/// Returns a normalized version of this matrix unless its norm as smaller or equal to `eps`. /// Returns a normalized version of this matrix unless its norm as smaller or equal to `eps`.
/// ///
/// The components of this matrix cannot be SIMD types (see `simd_try_normalize`) instead. /// The components of this matrix cannot be SIMD types (see `simd_try_normalize`) instead.