comparison yetilab/matrix/matrix.yeti @ 246:58e98d146dc1 sparse

Sparsity is actually density

     esac;
 
 width m = (size m).columns;
 height m = (size m).rows;
 
-sparsity m =
+density m =
    ({ rows, columns } = size m;
     cells = rows * columns;
     nonZeroCells d =
         sum
            (map do v:

     generate do row col: abs (getAt row col m) done (size m);
 
 //!!! 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))
         done { rows = (size m1).rows, columns = (size m2).columns }
     fi;

 
 {
     size,
     width,
     height,
-    sparsity,
+    density,
     getAt,
     getColumn,
     getRow,
     isRowMajor?,
     isSparse?,

 //!!! check whether these are right to be .selector rather than just selector
 
     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,
     isRowMajor? is matrix -> boolean,
     isSparse? is matrix -> boolean,