Mercurial > octave
diff libinterp/octave-value/ov-bool-mat.cc @ 21660:53728df3e4c9
maint: for clarity, call ndims() rather than length() on dimension vectors.
* ov-re-sparse.cc, QtHandlesUtils.cc, __lin_interpn__.cc, bsxfun.cc,
cellfun.cc, data.cc, dot.cc, ellipj.cc, fft.cc, fft2.cc, fftn.cc, filter.cc,
gl-render.cc, graphics.cc, mex.cc, oct-map.h, sub2ind.cc, symtab.cc, tril.cc,
typecast.cc, utils.cc, variables.cc, ov-base-diag.cc, ov-base-int.cc,
ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc,
ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-re-mat.cc, ov-str-mat.cc,
ov-struct.cc, ov.cc, pt-arg-list.cc, pt-mat.cc, Array-util.cc, Array.cc,
Array.h, CNDArray.cc, CSparse.cc, Sparse.cc, Sparse.h, dNDArray.cc, dSparse.cc,
dim-vector.cc, dim-vector.h, fCNDArray.cc, fNDArray.cc, idx-vector.cc,
bsxfun.h, oct-fftw.cc, mx-inlines.cc, lo-array-errwarn.cc, lo-array-gripes.cc:
For clarity, call ndims() rather than length() on dimension vectors.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 02 May 2016 08:53:18 -0700 |
| parents | 66cae7a6dc47 |
| children | 263d18409fdf |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-bool-mat.cc Fri Apr 29 16:40:38 2016 -0400 +++ b/libinterp/octave-value/ov-bool-mat.cc Mon May 02 08:53:18 2016 -0700 @@ -178,14 +178,14 @@ bool octave_bool_matrix::save_ascii (std::ostream& os) { - dim_vector d = dims (); - if (d.length () > 2) + dim_vector dv = dims (); + if (dv.ndims () > 2) { NDArray tmp = array_value (); - os << "# ndims: " << d.length () << "\n"; + os << "# ndims: " << dv.ndims () << "\n"; - for (int i = 0; i < d.length (); i++) - os << " " << d(i); + for (int i = 0; i < dv.ndims (); i++) + os << " " << dv(i); os << "\n" << tmp; } @@ -289,16 +289,16 @@ octave_bool_matrix::save_binary (std::ostream& os, bool& /* save_as_floats */) { - dim_vector d = dims (); - if (d.length () < 1) + dim_vector dv = dims (); + if (dv.ndims () < 1) return false; // Use negative value for ndims to differentiate with old format!! - int32_t tmp = - d.length (); + int32_t tmp = - dv.ndims (); os.write (reinterpret_cast<char *> (&tmp), 4); - for (int i = 0; i < d.length (); i++) + for (int i = 0; i < dv.ndims (); i++) { - tmp = d(i); + tmp = dv(i); os.write (reinterpret_cast<char *> (&tmp), 4); } @@ -382,7 +382,7 @@ if (empty) return (empty > 0); - int rank = dv.length (); + int rank = dv.ndims (); hid_t space_hid, data_hid; space_hid = data_hid = -1; boolNDArray m = bool_array_value ();