Mercurial > octave
diff libinterp/octave-value/ov-cell.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 | 40de9f8f23a6 |
| children | 263d18409fdf |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-cell.cc Fri Apr 29 16:40:38 2016 -0400 +++ b/libinterp/octave-value/ov-cell.cc Mon May 02 08:53:18 2016 -0700 @@ -704,18 +704,18 @@ bool octave_cell::save_ascii (std::ostream& os) { - dim_vector d = dims (); - if (d.length () > 2) + dim_vector dv = dims (); + if (dv.ndims () > 2) { - 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"; Cell tmp = cell_value (); - for (octave_idx_type i = 0; i < d.numel (); i++) + for (octave_idx_type i = 0; i < dv.numel (); i++) { octave_value o_val = tmp.elem (i); @@ -857,22 +857,22 @@ bool octave_cell::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 - 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); } Cell tmp = cell_value (); - for (octave_idx_type i = 0; i < d.numel (); i++) + for (octave_idx_type i = 0; i < dv.numel (); i++) { octave_value o_val = tmp.elem (i); @@ -972,7 +972,7 @@ if (empty) return (empty > 0); - hsize_t rank = dv.length (); + hsize_t rank = dv.ndims (); hid_t space_hid, data_hid, size_hid; space_hid = data_hid = size_hid = -1; @@ -1328,14 +1328,14 @@ // except if the struct is a column vector. dim_vector result_dv; - if (m_dv(m_dv.length () - 1) == 1) - result_dv.resize (m_dv.length ()); + if (m_dv(m_dv.ndims () - 1) == 1) + result_dv.resize (m_dv.ndims ()); else - result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. + result_dv.resize (m_dv.ndims () + 1); // Add 1 for the fields. result_dv(0) = num_fields; - for (int i = 1; i < result_dv.length (); i++) + for (int i = 1; i < result_dv.ndims (); i++) result_dv(i) = m_dv(i-1); NoAlias<Cell> c (result_dv);