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

fixing style issues

This commit is contained in:
Vincent Barrielle 2014-05-10 12:48:25 +02:00
parent d1a58f960c
commit a213a3da93
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/linalg/decompositions.rs
View File

@ -8,8 +8,8 @@ use std::cmp::min;
/// QR decomposition using Householder reflections /// QR decomposition using Householder reflections
/// # Arguments /// # Arguments
/// * `m` matrix to decompose /// * `m` - matrix to decompose
pub fn decomp_qr<N: Clone + Num + Float>(m: &DMat<N>) -> (DMat<N>, DMat<N>) { pub fn decomp_qr<N: Clone + Float>(m: &DMat<N>) -> (DMat<N>, DMat<N>) {
let rows = m.nrows(); let rows = m.nrows();
let cols = m.ncols(); let cols = m.ncols();
assert!(rows >= cols); assert!(rows >= cols);
@ -23,8 +23,8 @@ pub fn decomp_qr<N: Clone + Num + Float>(m: &DMat<N>) -> (DMat<N>, DMat<N>) {
for j in range(start, rows) { for j in range(start, rows) {
for i in range(start, rows) { for i in range(start, rows) {
unsafe { unsafe {
let vv = vec.at_fast(i-start)*vec.at_fast(j-start); let vv = vec.at_fast(i - start) * vec.at_fast(j - start);
let qkij = qk.at_fast(i,j); let qkij = qk.at_fast(i, j);
qk.set_fast(i, j, qkij - vv - vv); qk.set_fast(i, j, qkij - vv - vv);
} }
} }
@ -32,11 +32,10 @@ pub fn decomp_qr<N: Clone + Num + Float>(m: &DMat<N>) -> (DMat<N>, DMat<N>) {
qk qk
}; };
let iterations = min(rows-1, cols); let iterations = min(rows - 1, cols);
for ite in range(0u, iterations) { for ite in range(0u, iterations) {
let mut v = r.col_slice(ite, ite, rows); let mut v = r.col_slice(ite, ite, rows);
//let mut v = r.col_slice<DVec<N>>(ite, rows-ite, rows);
let alpha = let alpha =
if unsafe { v.at_fast(ite) } >= Zero::zero() { if unsafe { v.at_fast(ite) } >= Zero::zero() {
-Norm::norm(&v) -Norm::norm(&v)

4
src/traits/structure.rs
View File

@ -94,13 +94,13 @@ pub trait Col<C> {
/// Trait to access part of a column of a matrix /// Trait to access part of a column of a matrix
pub trait ColSlice<C> { pub trait ColSlice<C> {
/// Returns a view to a slice of a column of a matrix. /// Returns a view to a slice of a column of a matrix.
fn col_slice(&self, col_id :uint, row_start: uint, row_end: uint) -> C; fn col_slice(&self, col_id: uint, row_start: uint, row_end: uint) -> C;
} }
/// Trait to access part of a row of a matrix /// Trait to access part of a row of a matrix
pub trait RowSlice<R> { pub trait RowSlice<R> {
/// Returns a view to a slice of a row of a matrix. /// Returns a view to a slice of a row of a matrix.
fn row_slice(&self, row_id :uint, col_start: uint, col_end: uint) -> R; fn row_slice(&self, row_id: uint, col_start: uint, col_end: uint) -> R;
} }
/// Trait of objects having a spacial dimension known at compile time. /// Trait of objects having a spacial dimension known at compile time.