Mercurial > hg > octave-lyh

comparison liboctave/MatrixType.cc @ 10506:bdf5d85cfc5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace nzmax by nnz where appropriate in liboctave
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 10 Apr 2010 21:04:55 +0200
parents 12884915a8e4
children 4d1fc073fbb7
comparison
equal deleted inserted replaced
10505:82ee24bf783c 10506:bdf5d85cfc5e
210 dense (false), full (false), nperm (0), perm (0) 210 dense (false), full (false), nperm (0), perm (0)
211 { 211 {
212 octave_idx_type nrows = a.rows (); 212 octave_idx_type nrows = a.rows ();
213 octave_idx_type ncols = a.cols (); 213 octave_idx_type ncols = a.cols ();
214 octave_idx_type nm = (ncols < nrows ? ncols : nrows); 214 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
215 octave_idx_type nnz = a.nzmax (); 215 octave_idx_type nnz = a.nnz ();
216 216
217 if (octave_sparse_params::get_key ("spumoni") != 0.) 217 if (octave_sparse_params::get_key ("spumoni") != 0.)
218 (*current_liboctave_warning_handler) 218 (*current_liboctave_warning_handler)
219 ("Calculating Sparse Matrix Type"); 219 ("Calculating Sparse Matrix Type");
220 220
531 dense (false), full (false), nperm (0), perm (0) 531 dense (false), full (false), nperm (0), perm (0)
532 { 532 {
533 octave_idx_type nrows = a.rows (); 533 octave_idx_type nrows = a.rows ();
534 octave_idx_type ncols = a.cols (); 534 octave_idx_type ncols = a.cols ();
535 octave_idx_type nm = (ncols < nrows ? ncols : nrows); 535 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
536 octave_idx_type nnz = a.nzmax (); 536 octave_idx_type nnz = a.nnz ();
537 537
538 if (octave_sparse_params::get_key ("spumoni") != 0.) 538 if (octave_sparse_params::get_key ("spumoni") != 0.)
539 (*current_liboctave_warning_handler) 539 (*current_liboctave_warning_handler)
540 ("Calculating Sparse Matrix Type"); 540 ("Calculating Sparse Matrix Type");
541 541