# HG changeset patch
# User Chris Cannam
# Date 1369069896 -3600
# Node ID ce4de16ea65dcae527c2b40f7d5941455822cae6
# Parent  58e98d146dc13e445cc765d966d98f9a4b74c6e5
Sparsity is actually density

diff -r 58e98d146dc1 -r ce4de16ea65d yetilab/matrix/test/test_matrix.yeti
--- 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)
 ),
 
 ]);