Mercurial > hg > octave-nkf
diff liboctave/MSparse.cc @ 5681:233d98d95659
[project @ 2006-03-16 17:48:55 by dbateman]
| author | dbateman |
|---|---|
| date | Thu, 16 Mar 2006 17:48:56 +0000 |
| parents | 2857357f9d3c |
| children | 8e0f1eda266b |
line wrap: on
line diff
--- a/liboctave/MSparse.cc +++ b/liboctave/MSparse.cc @@ -52,7 +52,7 @@ gripe_nonconformant ("operator +=" , a_nr, a_nc, b_nr, b_nc); else { - r = MSparse<T> (a_nr, a_nc, (a.nzmax () + b.nzmax ())); + r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); octave_idx_type jx = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) @@ -125,7 +125,7 @@ gripe_nonconformant ("operator -=" , a_nr, a_nc, b_nr, b_nc); else { - r = MSparse<T> (a_nr, a_nc, (a.nzmax () + b.nzmax ())); + r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); octave_idx_type jx = 0; for (octave_idx_type i = 0 ; i < a_nc ; i++) @@ -207,7 +207,7 @@ { \ octave_idx_type nr = a.rows (); \ octave_idx_type nc = a.cols (); \ - octave_idx_type nz = a.nzmax (); \ + octave_idx_type nz = a.nnz (); \ \ MSparse<T> r (nr, nc, nz); \ \ @@ -253,7 +253,7 @@ { \ octave_idx_type nr = a.rows (); \ octave_idx_type nc = a.cols (); \ - octave_idx_type nz = a.nzmax (); \ + octave_idx_type nz = a.nnz (); \ \ MSparse<T> r (nr, nc, nz); \ \ @@ -292,7 +292,7 @@ gripe_nonconformant ("operator " # OP, a_nr, a_nc, b_nr, b_nc); \ else \ { \ - r = MSparse<T> (a_nr, a_nc, (a.nzmax () + b.nzmax ())); \ + r = MSparse<T> (a_nr, a_nc, (a.nnz () + b.nnz ())); \ \ octave_idx_type jx = 0; \ r.cidx (0) = 0; \ @@ -367,7 +367,7 @@ gripe_nonconformant (#FCN, a_nr, a_nc, b_nr, b_nc); \ else \ { \ - r = MSparse<T> (a_nr, a_nc, (a.nzmax () > b.nzmax () ? a.nzmax () : b.nzmax ())); \ + r = MSparse<T> (a_nr, a_nc, (a.nnz () > b.nnz () ? a.nnz () : b.nnz ())); \ \ octave_idx_type jx = 0; \ r.cidx (0) = 0; \ @@ -494,7 +494,7 @@ operator - (const MSparse<T>& a) { MSparse<T> retval (a); - octave_idx_type nz = a.nzmax (); + octave_idx_type nz = a.nnz (); for (octave_idx_type i = 0; i < nz; i++) retval.data(i) = - retval.data(i); return retval;