Mercurial > octave-nkf

comparison libinterp/octave-value/ov-struct.cc @ 20267:a9574e3c6e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::length() and Sparse::length() in favour of ::numel(). * liboctave/array/Array.h (Array::length): deprecate for ::numel. * liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel. * libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc, libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc, libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc, liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h, liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc, liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc, liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc, liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h, liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc, liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc, liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc, liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc, liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc, liboctave/util/glob-match.h, liboctave/util/kpse.cc, liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc, liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc, liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage of Array::length() and Sparse::length() with ::numel().
author Carnë Draug <carandraug@octave.org>
date Sat, 30 May 2015 03:14:07 +0100
parents b2100e1659ac
children c6224b4e7774
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
155 155
156 if (! error_state) 156 if (! error_state)
157 { 157 {
158 const Cell t = tmp.index (idx.front ()); 158 const Cell t = tmp.index (idx.front ());
159 159
160 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); 160 retval(0) = (t.numel () == 1) ? t(0) : octave_value (t, true);
161 161
162 // We handled two index elements, so tell 162 // We handled two index elements, so tell
163 // next_subsref to skip both of them. 163 // next_subsref to skip both of them.
164 164
165 skip++; 165 skip++;
174 { 174 {
175 if (map.numel () > 0) 175 if (map.numel () > 0)
176 { 176 {
177 const Cell t = dotref (idx.front ()); 177 const Cell t = dotref (idx.front ());
178 178
179 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); 179 retval(0) = (t.numel () == 1) ? t(0) : octave_value (t, true);
180 } 180 }
181 } 181 }
182 break; 182 break;
183 183
184 case '{': 184 case '{':
221 221
222 if (! error_state) 222 if (! error_state)
223 { 223 {
224 const Cell t = tmp.index (idx.front (), auto_add); 224 const Cell t = tmp.index (idx.front (), auto_add);
225 225
226 retval = (t.length () == 1) ? t(0) : octave_value (t, true); 226 retval = (t.numel () == 1) ? t(0) : octave_value (t, true);
227 227
228 // We handled two index elements, so tell 228 // We handled two index elements, so tell
229 // next_subsref to skip both of them. 229 // next_subsref to skip both of them.
230 230
231 skip++; 231 skip++;
240 { 240 {
241 if (map.numel () > 0) 241 if (map.numel () > 0)
242 { 242 {
243 const Cell t = dotref (idx.front (), auto_add); 243 const Cell t = dotref (idx.front (), auto_add);
244 244
245 retval = (t.length () == 1) ? t(0) : octave_value (t, true); 245 retval = (t.numel () == 1) ? t(0) : octave_value (t, true);
246 } 246 }
247 } 247 }
248 break; 248 break;
249 249
250 case '{': 250 case '{':
677 677
678 increment_indent_level (); 678 increment_indent_level ();
679 679
680 string_vector key_list = map.fieldnames (); 680 string_vector key_list = map.fieldnames ();
681 681
682 for (octave_idx_type i = 0; i < key_list.length (); i++) 682 for (octave_idx_type i = 0; i < key_list.numel (); i++)
683 { 683 {
684 std::string key = key_list[i]; 684 std::string key = key_list[i];
685 685
686 Cell val = map.contents (key); 686 Cell val = map.contents (key);
687 687
1398 1398
1399 increment_indent_level (); 1399 increment_indent_level ();
1400 1400
1401 string_vector key_list = map.fieldnames (); 1401 string_vector key_list = map.fieldnames ();
1402 1402
1403 for (octave_idx_type i = 0; i < key_list.length (); i++) 1403 for (octave_idx_type i = 0; i < key_list.numel (); i++)
1404 { 1404 {
1405 std::string key = key_list[i]; 1405 std::string key = key_list[i];
1406 1406
1407 octave_value val = map.contents (key); 1407 octave_value val = map.contents (key);
1408 1408
2015 2015
2016 octave_map m = arg.map_value (); 2016 octave_map m = arg.map_value ();
2017 2017
2018 string_vector keys = m.fieldnames (); 2018 string_vector keys = m.fieldnames ();
2019 2019
2020 if (keys.length () == 0) 2020 if (keys.numel () == 0)
2021 retval = Cell (0, 1); 2021 retval = Cell (0, 1);
2022 else 2022 else
2023 retval = Cell (keys); 2023 retval = Cell (keys);
2024 2024
2025 return retval; 2025 return retval;