comparison libinterp/corefcn/dasrt.cc @ 20267:a9574e3c6e9e

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 5dfaaaae784f
children 7ac907da9fba
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
89 warned_fcn_imaginary = true; 89 warned_fcn_imaginary = true;
90 } 90 }
91 91
92 retval = ColumnVector (tmp(0).vector_value ()); 92 retval = ColumnVector (tmp(0).vector_value ());
93 93
94 if (error_state || retval.length () == 0) 94 if (error_state || retval.numel () == 0)
95 gripe_user_supplied_eval ("dasrt"); 95 gripe_user_supplied_eval ("dasrt");
96 } 96 }
97 else 97 else
98 gripe_user_supplied_eval ("dasrt"); 98 gripe_user_supplied_eval ("dasrt");
99 } 99 }
129 warned_cf_imaginary = true; 129 warned_cf_imaginary = true;
130 } 130 }
131 131
132 retval = ColumnVector (tmp(0).vector_value ()); 132 retval = ColumnVector (tmp(0).vector_value ());
133 133
134 if (error_state || retval.length () == 0) 134 if (error_state || retval.numel () == 0)
135 gripe_user_supplied_eval ("dasrt"); 135 gripe_user_supplied_eval ("dasrt");
136 } 136 }
137 else 137 else
138 gripe_user_supplied_eval ("dasrt"); 138 gripe_user_supplied_eval ("dasrt");
139 } 139 }
175 warned_jac_imaginary = true; 175 warned_jac_imaginary = true;
176 } 176 }
177 177
178 retval = tmp(0).matrix_value (); 178 retval = tmp(0).matrix_value ();
179 179
180 if (error_state || retval.length () == 0) 180 if (error_state || retval.numel () == 0)
181 gripe_user_supplied_eval ("dasrt"); 181 gripe_user_supplied_eval ("dasrt");
182 } 182 }
183 else 183 else
184 gripe_user_supplied_eval ("dasrt"); 184 gripe_user_supplied_eval ("dasrt");
185 } 185 }
383 octave_value f_arg = args(0); 383 octave_value f_arg = args(0);
384 384
385 if (f_arg.is_cell ()) 385 if (f_arg.is_cell ())
386 { 386 {
387 Cell c = f_arg.cell_value (); 387 Cell c = f_arg.cell_value ();
388 if (c.length () == 1) 388 if (c.numel () == 1)
389 f_arg = c(0); 389 f_arg = c(0);
390 else if (c.length () == 2) 390 else if (c.numel () == 2)
391 { 391 {
392 if (c(0).is_function_handle () || c(0).is_inline_function ()) 392 if (c(0).is_function_handle () || c(0).is_inline_function ())
393 dasrt_f = c(0).function_value (); 393 dasrt_f = c(0).function_value ();
394 else 394 else
395 { 395 {