Mercurial > octave-nkf

comparison libinterp/corefcn/utils.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 29eb47fe8e8c
children 421e3ebfca8d
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
265 { 265 {
266 dir_path p (path); 266 dir_path p (path);
267 267
268 string_vector sv = p.find_all_first_of (names); 268 string_vector sv = p.find_all_first_of (names);
269 269
270 octave_idx_type len = sv.length (); 270 octave_idx_type len = sv.numel ();
271 271
272 for (octave_idx_type i = 0; i < len; i++) 272 for (octave_idx_type i = 0; i < len; i++)
273 sv[i] = octave_env::make_absolute (sv[i]); 273 sv[i] = octave_env::make_absolute (sv[i]);
274 274
275 return sv; 275 return sv;
276 } 276 }
277 277
278 static string_vector 278 static string_vector
279 make_absolute (const string_vector& sv) 279 make_absolute (const string_vector& sv)
280 { 280 {
281 octave_idx_type len = sv.length (); 281 octave_idx_type len = sv.numel ();
282 282
283 string_vector retval (len); 283 string_vector retval (len);
284 284
285 for (octave_idx_type i = 0; i < len; i++) 285 for (octave_idx_type i = 0; i < len; i++)
286 retval[i] = octave_env::make_absolute (sv[i]); 286 retval[i] = octave_env::make_absolute (sv[i]);
314 314
315 if (nargin == 1 || nargin == 2) 315 if (nargin == 1 || nargin == 2)
316 { 316 {
317 string_vector names = args(0).all_strings (); 317 string_vector names = args(0).all_strings ();
318 318
319 if (! error_state && names.length () > 0) 319 if (! error_state && names.numel () > 0)
320 { 320 {
321 if (nargin == 1) 321 if (nargin == 1)
322 retval = 322 retval =
323 octave_env::make_absolute (load_path::find_first_of (names)); 323 octave_env::make_absolute (load_path::find_first_of (names));
324 else if (nargin == 2) 324 else if (nargin == 2)
397 { 397 {
398 std::string path = args(0).string_value (); 398 std::string path = args(0).string_value ();
399 399
400 string_vector names = args(1).all_strings (); 400 string_vector names = args(1).all_strings ();
401 401
402 if (! error_state && names.length () > 0) 402 if (! error_state && names.numel () > 0)
403 { 403 {
404 if (nargin == 2) 404 if (nargin == 2)
405 retval = search_path_for_file (path, names); 405 retval = search_path_for_file (path, names);
406 else if (nargin == 3) 406 else if (nargin == 3)
407 { 407 {
1216 Array<double> v = a.vector_value (); 1216 Array<double> v = a.vector_value ();
1217 1217
1218 if (error_state) 1218 if (error_state)
1219 return; 1219 return;
1220 1220
1221 octave_idx_type n = v.length (); 1221 octave_idx_type n = v.numel ();
1222 dim.resize (n); 1222 dim.resize (n);
1223 for (octave_idx_type i = 0; i < n; i++) 1223 for (octave_idx_type i = 0; i < n; i++)
1224 dim(i) = static_cast<int> (fix (v(i))); 1224 dim(i) = static_cast<int> (fix (v(i)));
1225 } 1225 }
1226 else 1226 else