Mercurial > hg > may

changeset 246:58e98d146dc1 sparse

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sparsity is actually density
author Chris Cannam
date Mon, 20 May 2013 18:11:20 +0100
parents 91bde82e34eb
children ce4de16ea65d
files yetilab/matrix/matrix.yeti
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/yetilab/matrix/matrix.yeti	Mon May 20 16:48:44 2013 +0100
+++ b/yetilab/matrix/matrix.yeti	Mon May 20 18:11:20 2013 +0100
@@ -46,7 +46,7 @@
 width m = (size m).columns;
 height m = (size m).rows;
 
-sparsity m =
+density m =
    ({ rows, columns } = size m;
     cells = rows * columns;
     nonZeroCells d =
@@ -356,7 +356,7 @@
 //!!! todo: proper sparse multiply
 product m1 m2 =
     if (size m1).columns != (size m2).rows
-    then failWith "Matrix dimensions incompatible: \(size m1), \(size m2) (\((size m1).columns != (size m2).rows)";
+    then failWith "Matrix dimensions incompatible: \(size m1), \(size m2) (\((size m1).columns) != \((size m2).rows))";
     else
         generate do row col:
             bf.sum (bf.multiply (getRow row m1) (getColumn col m2))
@@ -463,7 +463,7 @@
     size,
     width,
     height,
-    sparsity,
+    density,
     getAt,
     getColumn,
     getRow,
@@ -507,7 +507,7 @@
     size is matrix -> { .rows is number, .columns is number },
     width is matrix -> number,
     height is matrix -> number,
-    sparsity is matrix -> number,
+    density is matrix -> number,
     getAt is number -> number -> matrix -> number,
     getColumn is number -> matrix -> vector,
     getRow is number -> matrix -> vector,