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

Coding style fix.

This commit is contained in:
Sébastien Crozet 2014-10-26 14:40:27 +01:00
parent a0fffe93a9
commit 628aac0961
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/linalg/decompositions.rs
View File

@ -11,10 +11,10 @@ use std::cmp::min;
/// * `dim` - the dimension of the space the resulting matrix operates in /// * `dim` - the dimension of the space the resulting matrix operates in
/// * `start` - the starting dimension of the subspace of the reflexion /// * `start` - the starting dimension of the subspace of the reflexion
/// * `vec` - the vector defining the reflection. /// * `vec` - the vector defining the reflection.
pub fn householder_matrix<N: Float, pub fn householder_matrix<N, V, M>(dim: uint, start: uint, vec: V) -> M
M: Eye + Indexable<(uint, uint), N>, where N: Float,
V: Indexable<uint, N>> M: Eye + Indexable<(uint, uint), N>,
(dim: uint, start: uint, vec: V) -> M { V: Indexable<uint, N> {
let mut qk : M = Eye::new_identity(dim); let mut qk : M = Eye::new_identity(dim);
let subdim = vec.shape(); let subdim = vec.shape();
@ -38,12 +38,10 @@ pub fn householder_matrix<N: Float,
/// ///
/// # Arguments /// # Arguments
/// * `m` - matrix to decompose /// * `m` - matrix to decompose
pub fn qr<N: Float, pub fn qr<N, V, M>(m: &M) -> (M, M)
where N: Float,
V: Indexable<uint, N> + Norm<N>, V: Indexable<uint, N> + Norm<N>,
M: Clone + Eye + ColSlice<V> + Transpose M: Clone + Eye + ColSlice<V> + Transpose + Indexable<(uint, uint), N> + Mul<M, M> {
+ Indexable<(uint, uint), N> + Mul<M, M>>
(m: &M)
-> (M, M) {
let (rows, cols) = m.shape(); let (rows, cols) = m.shape();
assert!(rows >= cols); assert!(rows >= cols);
let mut q : M = Eye::new_identity(rows); let mut q : M = Eye::new_identity(rows);
@ -75,14 +73,12 @@ pub fn qr<N: Float,
} }
/// Eigendecomposition of a square matrix using the qr algorithm. /// Eigendecomposition of a square matrix using the qr algorithm.
pub fn eigen_qr<N: Float, pub fn eigen_qr<N, V, V2, M>(m: &M, eps: &N, niter: uint) -> (M, V2)
V: Indexable<uint, N> + Norm<N>, where N: Float,
V2: Zero, V: Indexable<uint, N> + Norm<N>,
M: Clone + Eye + ColSlice<V> + Transpose V2: Zero,
+ Indexable<(uint, uint), N> + Mul<M, M> M: Clone + Eye + ColSlice<V> + Transpose + Indexable<(uint, uint), N> + Mul<M, M>
+ Diag<V2> + ApproxEq<N> + Add<M, M> + Diag<V2> + ApproxEq<N> + Add<M, M> + Sub<M, M> {
+ Sub<M, M>>
(m: &M, eps: &N, niter: uint) -> (M, V2) {
let (rows, cols) = m.shape(); let (rows, cols) = m.shape();
assert!(rows == cols, "The matrix being decomposed must be square."); assert!(rows == cols, "The matrix being decomposed must be square.");