Mercurial > octave
diff libinterp/octave-value/ov-struct.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 | 3d60ed163b70 |
| children | 263d18409fdf |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-struct.cc Fri Apr 29 16:40:38 2016 -0400 +++ b/libinterp/octave-value/ov-struct.cc Mon May 02 08:53:18 2016 -0700 @@ -648,7 +648,7 @@ static bool scalar (const dim_vector& dims) { - return dims.length () == 2 && dims(0) == 1 && dims(1) == 1; + return dims.ndims () == 2 && dims(0) == 1 && dims(1) == 1; } @@ -661,9 +661,9 @@ const dim_vector dv = dims (); - os << "# ndims: " << dv.length () << "\n"; - - for (int i = 0; i < dv.length (); i++) + os << "# ndims: " << dv.ndims () << "\n"; + + for (int i = 0; i < dv.ndims (); i++) os << " " << dv(i); os << "\n"; @@ -764,16 +764,16 @@ octave_idx_type nf = m.nfields (); - dim_vector d = dims (); - if (d.length () < 1) + dim_vector dv = dims (); + if (dv.ndims () < 1) return false; // Use negative value for ndims - int32_t di = - d.length (); + int32_t di = - dv.ndims (); os.write (reinterpret_cast<char *> (&di), 4); - for (int i = 0; i < d.length (); i++) + for (int i = 0; i < dv.ndims (); i++) { - di = d(i); + di = dv(i); os.write (reinterpret_cast<char *> (&di), 4); } @@ -1326,9 +1326,9 @@ const dim_vector dv = dims (); - os << "# ndims: " << dv.length () << "\n"; - - for (int i = 0; i < dv.length (); i++) + os << "# ndims: " << dv.ndims () << "\n"; + + for (int i = 0; i < dv.ndims (); i++) os << " " << dv(i); os << "\n";