diff yetilab/matrix/test/test_matrix.yeti @ 258:f3b7b5d20f88

Replace matrix thresholded with a more general filter function that works for sparse matrices too
author Chris Cannam
date Wed, 22 May 2013 08:56:51 +0100
parents f00ab8baa6d7
children fae62dca8048
line wrap: on
line diff
--- a/yetilab/matrix/test/test_matrix.yeti	Tue May 21 22:37:28 2013 +0100
+++ b/yetilab/matrix/test/test_matrix.yeti	Wed May 22 08:56:51 2013 +0100
@@ -449,12 +449,12 @@
         compareMatrices (mat.toSparse (mat.toDense m)) m
 ),
 
-"thresholded-\(name)": \(
+"filter-\(name)": \(
     m = newMatrix (ColumnMajor ()) [[1,2,0],[-1,-4,6],[0,0,3]];
     compareMatrices
-       (mat.thresholded 2 m)
-       (newMatrix (ColumnMajor ()) [[0,0,0],[0,-4,6],[0,0,3]]) and
-        compare (mat.density (mat.thresholded 2 m)) (3/9)
+       (mat.filter (> 2) m)
+       (newMatrix (ColumnMajor ()) [[0,0,0],[0,0,6],[0,0,3]]) and
+        compare (mat.density (mat.filter (> 2) m)) (2/9)
 ),
 
 "newSparseMatrix-\(name)": \(