hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Relax Float bound {Metric,Inner}Space and Matrix traits

Browse source 
This makes the trait more flexible.
This contributes to #496.
This commit is contained in:
Egor Larionov 2020-05-18 14:18:04 -07:00 committed by Dzmitry Malyshau
parent 50a345b7c4
commit b9e82914db
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/structure.rs
View file

@ -195,7 +195,7 @@ where
/// Examples are vectors, points, and quaternions. /// Examples are vectors, points, and quaternions.
pub trait MetricSpace: Sized { pub trait MetricSpace: Sized {
/// The metric to be returned by the `distance` function. /// The metric to be returned by the `distance` function.
type Metric: BaseFloat; type Metric: Float;
/// Returns the squared distance. /// Returns the squared distance.
/// ///
@ -219,19 +219,16 @@ pub trait MetricSpace: Sized {
/// Examples include vectors and quaternions. /// Examples include vectors and quaternions.
pub trait InnerSpace: VectorSpace pub trait InnerSpace: VectorSpace
where where
Self::Scalar: Float,
// FIXME: Ugly type signatures - blocked by rust-lang/rust#24092 // FIXME: Ugly type signatures - blocked by rust-lang/rust#24092
<Self as VectorSpace>::Scalar: BaseFloat, Self: MetricSpace<Metric = <Self as VectorSpace>::Scalar>
Self: MetricSpace<Metric = <Self as VectorSpace>::Scalar>,
// Self: approx::AbsDiffEq<Epsilon = <Self as VectorSpace>::Scalar>,
// Self: approx::RelativeEq<Epsilon = <Self as VectorSpace>::Scalar>,
Self: approx::UlpsEq<Epsilon = <Self as VectorSpace>::Scalar>,
{ {
/// Vector dot (or inner) product. /// Vector dot (or inner) product.
fn dot(self, other: Self) -> Self::Scalar; fn dot(self, other: Self) -> Self::Scalar;
/// Returns `true` if the vector is perpendicular (at right angles) to the /// Returns `true` if the vector is perpendicular (at right angles) to the
/// other vector. /// other vector.
fn is_perpendicular(self, other: Self) -> bool { fn is_perpendicular(self, other: Self) -> bool where Self::Scalar: approx::UlpsEq {
ulps_eq!(Self::dot(self, other), &Self::Scalar::zero()) ulps_eq!(Self::dot(self, other), &Self::Scalar::zero())
} }
@ -252,7 +249,7 @@ where
} }
/// Returns the angle between two vectors in radians. /// Returns the angle between two vectors in radians.
fn angle(self, other: Self) -> Rad<Self::Scalar> { fn angle(self, other: Self) -> Rad<Self::Scalar> where Self::Scalar: BaseFloat {
Rad::acos(Self::dot(self, other) / (self.magnitude() * other.magnitude())) Rad::acos(Self::dot(self, other) / (self.magnitude() * other.magnitude()))
} }
@ -427,14 +424,14 @@ where
/// see `SquareMatrix`. /// see `SquareMatrix`.
pub trait Matrix: VectorSpace pub trait Matrix: VectorSpace
where where
Self::Scalar: BaseFloat, Self::Scalar: Float,
// FIXME: Ugly type signatures - blocked by rust-lang/rust#24092 // FIXME: Ugly type signatures - blocked by rust-lang/rust#24092
Self: Index<usize, Output = <Self as Matrix>::Column>, Self: Index<usize, Output = <Self as Matrix>::Column>,
Self: IndexMut<usize, Output = <Self as Matrix>::Column>, Self: IndexMut<usize, Output = <Self as Matrix>::Column>,
Self: approx::AbsDiffEq<Epsilon = <Self as VectorSpace>::Scalar>, //Self: approx::AbsDiffEq<Epsilon = <Self as VectorSpace>::Scalar>,
Self: approx::RelativeEq<Epsilon = <Self as VectorSpace>::Scalar>, //Self: approx::RelativeEq<Epsilon = <Self as VectorSpace>::Scalar>,
Self: approx::UlpsEq<Epsilon = <Self as VectorSpace>::Scalar>, //Self: approx::UlpsEq<Epsilon = <Self as VectorSpace>::Scalar>,
{ {
/// The row vector of the matrix. /// The row vector of the matrix.
type Row: VectorSpace<Scalar = Self::Scalar> + Array<Element = Self::Scalar>; type Row: VectorSpace<Scalar = Self::Scalar> + Array<Element = Self::Scalar>;
@ -482,7 +479,7 @@ where
/// A column-major major matrix where the rows and column vectors are of the same dimensions. /// A column-major major matrix where the rows and column vectors are of the same dimensions.
pub trait SquareMatrix pub trait SquareMatrix
where where
Self::Scalar: BaseFloat, Self::Scalar: Float,
Self: One, Self: One,
Self: iter::Product<Self>, Self: iter::Product<Self>,
@ -543,14 +540,14 @@ where
/// Test if this matrix is invertible. /// Test if this matrix is invertible.
#[inline] #[inline]
fn is_invertible(&self) -> bool { fn is_invertible(&self) -> bool where Self::Scalar: approx::UlpsEq {
ulps_ne!(self.determinant(), &Self::Scalar::zero()) ulps_ne!(self.determinant(), &Self::Scalar::zero())
} }
/// Test if this matrix is the identity matrix. That is, it is diagonal /// Test if this matrix is the identity matrix. That is, it is diagonal
/// and every element in the diagonal is one. /// and every element in the diagonal is one.
#[inline] #[inline]
fn is_identity(&self) -> bool { fn is_identity(&self) -> bool where Self: approx::UlpsEq {
ulps_eq!(self, &Self::identity()) ulps_eq!(self, &Self::identity())
} }