Mercurial > hg > may
changeset 247:ce4de16ea65d sparse
Sparsity is actually density
| author | Chris Cannam |
|---|---|
| date | Mon, 20 May 2013 18:11:36 +0100 |
| parents | 58e98d146dc1 |
| children | 586d46f64902 |
| files | yetilab/matrix/test/test_matrix.yeti |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/yetilab/matrix/test/test_matrix.yeti Mon May 20 18:11:20 2013 +0100 +++ b/yetilab/matrix/test/test_matrix.yeti Mon May 20 18:11:36 2013 +0100 @@ -348,17 +348,17 @@ (newMatrix (RowMajor ()) [[0,3],[6,7]]) ), -"sparsity-\(name)": \( - compare (mat.sparsity (newMatrix (ColumnMajor ()) [[1,2,0],[0,5,0]])) (3/6) and - compare (mat.sparsity (newMatrix (ColumnMajor ()) [[1,2,3],[4,5,6]])) (6/6) and - compare (mat.sparsity (newMatrix (ColumnMajor ()) [[0,0,0],[0,0,0]])) 0 +"density-\(name)": \( + compare (mat.density (newMatrix (ColumnMajor ()) [[1,2,0],[0,5,0]])) (3/6) and + compare (mat.density (newMatrix (ColumnMajor ()) [[1,2,3],[4,5,6]])) (6/6) and + compare (mat.density (newMatrix (ColumnMajor ()) [[0,0,0],[0,0,0]])) 0 ), "toSparse-\(name)": \( m = newMatrix (ColumnMajor ()) [[1,2,0],[-1,-4,6],[0,0,3]]; compareMatrices (mat.toSparse m) m and compareMatrices (mat.toDense (mat.toSparse m)) m and - compare (mat.sparsity (mat.toSparse m)) (6/9) + compare (mat.density (mat.toSparse m)) (6/9) ), "toDense-\(name)": \( @@ -372,7 +372,7 @@ compareMatrices (mat.thresholded 2 m) (newMatrix (ColumnMajor ()) [[0,0,0],[0,-4,6],[0,0,3]]) and - compare (mat.sparsity (mat.thresholded 2 m)) (3/9) + compare (mat.density (mat.thresholded 2 m)) (3/9) ), ]);