srenblad/nalgebra
1
0
Fork 0
forked from M-Labs/nalgebra
Code Pull Requests Activity

Merge pull request #16 from nathanic/master

Browse Source 
Fix coordinate calculation in DMat::from_fn().
This commit is contained in:
Sébastien Crozet 2014-07-27 09:11:18 +02:00
commit 335bdd8a01
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
doc
lib
TODO
target/

2
src/structs/dmat.rs
View File

@ -139,7 +139,7 @@ impl<N> DMat<N> {
DMat {
nrows: nrows,
ncols: ncols,
mij: Vec::from_fn(nrows * ncols, |i| { let m = i % ncols; f(m, m - i * ncols) })
mij: Vec::from_fn(nrows * ncols, |i| f(i % nrows, i / nrows))
}
}

13
src/tests/mat.rs
View File

@ -266,3 +266,16 @@ fn test_decomp_qr_mat5() {
fn test_decomp_qr_mat6() {
test_decomp_qr_impl!(Mat6<f64>);
}
#[test]
fn test_from_fn() {
let actual: DMat<uint> = DMat::from_fn( 3, 4,
|i,j| 10*i + j);
let expected: DMat<uint> = DMat::from_row_vec(3, 4,
[0_0, 0_1, 0_2, 0_3,
1_0, 1_1, 1_2, 1_3,
2_0, 2_1, 2_2, 2_3 ]);
assert_eq!(actual, expected);
}