Mercurial > hg > octave-lyh

diff src/ov-cx-sparse.cc @ 10527:b4d2080b6df7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace nzmax by nnz as needed
author David Bateman <dbateman@free.fr>
date Fri, 16 Apr 2010 16:14:45 +0200
parents aac9f4265048
children 0de5cc44e690
line wrap: on
line diff
--- a/src/ov-cx-sparse.cc
+++ b/src/ov-cx-sparse.cc
@@ -236,7 +236,7 @@
 
   int nr = d(0);
   int nc = d(1);
-  int nz = nzmax ();
+  int nz = nnz ();
 
   int32_t itmp;
   // Use negative value for ndims to be consistent with other formats
@@ -263,7 +263,7 @@
       else
         st = LS_FLOAT;
     }
-  else if (matrix.nzmax () > 8192) // FIXME -- make this configurable.
+  else if (matrix.nnz () > 8192) // FIXME -- make this configurable.
     {
       double max_val, min_val;
       if (matrix.all_integers (max_val, min_val))
@@ -463,7 +463,7 @@
       return false;
     }
   
-  tmp = m.nzmax ();
+  tmp = m.nnz ();
   retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL,
                      H5P_DEFAULT, &tmp) >= 0;
   H5Dclose (data_hid);
@@ -514,7 +514,7 @@
 
   H5Sclose (space_hid);
 
-  hdims[0] = m.nzmax ();
+  hdims[0] = m.nnz ();
   hdims[1] = 1;
 
   space_hid = H5Screate_simple (2, hdims, 0);