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

Further coding style fixes.

This commit is contained in:
Sébastien Crozet 2013-08-05 10:15:11 +02:00
parent c59911168e
commit efd14f9e88
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/mat_spec.rs
View File

@ -6,103 +6,103 @@ use traits::inv::Inv;
// some specializations: // some specializations:
impl<N: DivisionRing + Clone> impl<N: DivisionRing + Clone>
Inv for Mat1<N> { Inv for Mat1<N> {
#[inline] #[inline]
fn inverse(&self) -> Option<Mat1<N>> { fn inverse(&self) -> Option<Mat1<N>> {
let mut res : Mat1<N> = self.clone(); let mut res : Mat1<N> = self.clone();
if res.inplace_inverse() { if res.inplace_inverse() {
Some(res) Some(res)
}
else {
None
}
} }
else {
None
}
}
#[inline] #[inline]
fn inplace_inverse(&mut self) -> bool { fn inplace_inverse(&mut self) -> bool {
if self.m11.is_zero() { if self.m11.is_zero() {
false false
}
else {
self.m11 = One::one::<N>() / self.m11;
true
}
} }
else {
self.m11 = One::one::<N>() / self.m11;
true
}
}
} }
impl<N: DivisionRing + Clone> impl<N: DivisionRing + Clone>
Inv for Mat2<N> { Inv for Mat2<N> {
#[inline] #[inline]
fn inverse(&self) -> Option<Mat2<N>> { fn inverse(&self) -> Option<Mat2<N>> {
let mut res : Mat2<N> = self.clone(); let mut res : Mat2<N> = self.clone();
if res.inplace_inverse() { if res.inplace_inverse() {
Some(res) Some(res)
}
else {
None
}
} }
else {
None
}
}
#[inline] #[inline]
fn inplace_inverse(&mut self) -> bool { fn inplace_inverse(&mut self) -> bool {
let det = self.m11 * self.m22 - self.m21 * self.m12; let det = self.m11 * self.m22 - self.m21 * self.m12;
if det.is_zero() { if det.is_zero() {
false false
} }
else { else {
*self = Mat2::new(self.m22 / det , -self.m12 / det, *self = Mat2::new(self.m22 / det , -self.m12 / det,
-self.m21 / det, self.m11 / det); -self.m21 / det, self.m11 / det);
true true
}
} }
}
} }
impl<N: DivisionRing + Clone> impl<N: DivisionRing + Clone>
Inv for Mat3<N> { Inv for Mat3<N> {
#[inline] #[inline]
fn inverse(&self) -> Option<Mat3<N>> { fn inverse(&self) -> Option<Mat3<N>> {
let mut res = self.clone(); let mut res = self.clone();
if res.inplace_inverse() { if res.inplace_inverse() {
Some(res) Some(res)
}
else {
None
}
} }
else {
None #[inline]
fn inplace_inverse(&mut self) -> bool {
let minor_m12_m23 = self.m22 * self.m33 - self.m32 * self.m23;
let minor_m11_m23 = self.m21 * self.m33 - self.m31 * self.m23;
let minor_m11_m22 = self.m21 * self.m32 - self.m31 * self.m22;
let det = self.m11 * minor_m12_m23
- self.m12 * minor_m11_m23
+ self.m13 * minor_m11_m22;
if det.is_zero() {
false
}
else {
*self = Mat3::new(
(minor_m12_m23 / det),
((self.m13 * self.m32 - self.m33 * self.m12) / det),
((self.m12 * self.m23 - self.m22 * self.m13) / det),
(-minor_m11_m23 / det),
((self.m11 * self.m33 - self.m31 * self.m13) / det),
((self.m13 * self.m21 - self.m23 * self.m11) / det),
(minor_m11_m22 / det),
((self.m12 * self.m31 - self.m32 * self.m11) / det),
((self.m11 * self.m22 - self.m21 * self.m12) / det)
);
true
}
} }
}
#[inline]
fn inplace_inverse(&mut self) -> bool {
let minor_m12_m23 = self.m22 * self.m33 - self.m32 * self.m23;
let minor_m11_m23 = self.m21 * self.m33 - self.m31 * self.m23;
let minor_m11_m22 = self.m21 * self.m32 - self.m31 * self.m22;
let det = self.m11 * minor_m12_m23
- self.m12 * minor_m11_m23
+ self.m13 * minor_m11_m22;
if det.is_zero() {
false
}
else {
*self = Mat3::new(
(minor_m12_m23 / det),
((self.m13 * self.m32 - self.m33 * self.m12) / det),
((self.m12 * self.m23 - self.m22 * self.m13) / det),
(-minor_m11_m23 / det),
((self.m11 * self.m33 - self.m31 * self.m13) / det),
((self.m13 * self.m21 - self.m23 * self.m11) / det),
(minor_m11_m22 / det),
((self.m12 * self.m31 - self.m32 * self.m11) / det),
((self.m11 * self.m22 - self.m21 * self.m12) / det)
);
true
}
}
} }