Mercurial > octave-nkf
comparison libinterp/corefcn/variables.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 | b70cc4bd8109 |
comparison
equal
deleted
inserted
replaced
| 20266:83792dd9bcc1 | 20267:a9574e3c6e9e |
|---|---|
| 2215 { | 2215 { |
| 2216 if (exclusive) | 2216 if (exclusive) |
| 2217 { | 2217 { |
| 2218 string_vector fcns = symbol_table::user_function_names (); | 2218 string_vector fcns = symbol_table::user_function_names (); |
| 2219 | 2219 |
| 2220 int fcount = fcns.length (); | 2220 int fcount = fcns.numel (); |
| 2221 | 2221 |
| 2222 for (int i = 0; i < fcount; i++) | 2222 for (int i = 0; i < fcount; i++) |
| 2223 { | 2223 { |
| 2224 std::string nm = fcns[i]; | 2224 std::string nm = fcns[i]; |
| 2225 | 2225 |
| 2241 { | 2241 { |
| 2242 if (idx == argc) | 2242 if (idx == argc) |
| 2243 { | 2243 { |
| 2244 string_vector gvars = symbol_table::global_variable_names (); | 2244 string_vector gvars = symbol_table::global_variable_names (); |
| 2245 | 2245 |
| 2246 int gcount = gvars.length (); | 2246 int gcount = gvars.numel (); |
| 2247 | 2247 |
| 2248 for (int i = 0; i < gcount; i++) | 2248 for (int i = 0; i < gcount; i++) |
| 2249 symbol_table::clear_global (gvars[i]); | 2249 symbol_table::clear_global (gvars[i]); |
| 2250 } | 2250 } |
| 2251 else | 2251 else |
| 2252 { | 2252 { |
| 2253 if (exclusive) | 2253 if (exclusive) |
| 2254 { | 2254 { |
| 2255 string_vector gvars = symbol_table::global_variable_names (); | 2255 string_vector gvars = symbol_table::global_variable_names (); |
| 2256 | 2256 |
| 2257 int gcount = gvars.length (); | 2257 int gcount = gvars.numel (); |
| 2258 | 2258 |
| 2259 for (int i = 0; i < gcount; i++) | 2259 for (int i = 0; i < gcount; i++) |
| 2260 { | 2260 { |
| 2261 std::string nm = gvars[i]; | 2261 std::string nm = gvars[i]; |
| 2262 | 2262 |
| 2282 { | 2282 { |
| 2283 if (exclusive) | 2283 if (exclusive) |
| 2284 { | 2284 { |
| 2285 string_vector lvars = symbol_table::variable_names (); | 2285 string_vector lvars = symbol_table::variable_names (); |
| 2286 | 2286 |
| 2287 int lcount = lvars.length (); | 2287 int lcount = lvars.numel (); |
| 2288 | 2288 |
| 2289 for (int i = 0; i < lcount; i++) | 2289 for (int i = 0; i < lcount; i++) |
| 2290 { | 2290 { |
| 2291 std::string nm = lvars[i]; | 2291 std::string nm = lvars[i]; |
| 2292 | 2292 |