Mercurial > hg > octave-nkf

comparison liboctave/array/Array.h @ 20438:00cf2847355d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). * liboctave/array/Array.h (Array::nelem) deprecate in favour of numel(). (Array::capacity, Array:: length): change to call numel() directly. These methods will be deprecated soon. * liboctave/array/PermMatrix.h (PermMatrix::nelem): deprecate in favour of numel(). * liboctave/array/Range.h (Range::numel) new method to replace nelem(). (Range::nelem) deprecate in favour of the new method numel. * liboctave/array/Sparse.h (Sparse::nelem) deprecate in favour of nzmax(). This one is secially bad because unlike the other classes, it is different from numel(). * libinterp/corefcn/debug.cc, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/max.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audioread.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-mat.cc, libinterp/parse-tree/pt-eval.cc, liboctave/array/Array.cc, liboctave/array/CNDArray.cc, liboctave/array/Range.cc, liboctave/array/dNDArray.cc, liboctave/array/fCNDArray.cc, liboctave/array/fNDArray.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/SparseCmplxLU.cc, liboctave/numeric/SparsedbleLU.cc: replace use of nelem() with numel().
author Carnë Draug <carandraug@octave.org>
date Sun, 24 May 2015 02:41:37 +0100
parents 6af35d4f1ba4
children 5dfaaaae784f
comparison
equal deleted inserted replaced
20437:9f484edd8767 20438:00cf2847355d
250 { clear (dim_vector (r, c)); } 250 { clear (dim_vector (r, c)); }
251 251
252 // Number of elements in the array. These are all synonyms. 252 // Number of elements in the array. These are all synonyms.
253 //@{ 253 //@{
254 //! Number of elements in the array. 254 //! Number of elements in the array.
255 //! Synonymous with length(), nelem(), and numel(). 255 //! Synonymous with numel().
256 octave_idx_type capacity (void) const { return slice_len; } 256 octave_idx_type capacity (void) const { return numel (); }
257 257
258 //! Number of elements in the array. 258 //! Number of elements in the array.
259 /*! Synonymous with capacity(), nelem(), and numel(). 259 /*! Synonymous with capacity() and numel().
260
261 @note This method is deprecated in favour of numel().
260 262
261 @note 263 @note
262 This is @em not the same as @c %length() at the Octave interpreter. 264 This is @em not the same as @c %length() at the Octave interpreter.
263 At the Octave interpreter, the function @c %length() returns the 265 At the Octave interpreter, the function @c %length() returns the
264 length of the greatest dimension. This method returns the total 266 length of the greatest dimension. This method returns the total
265 number of elements. 267 number of elements.
266 */ 268 */
267 octave_idx_type length (void) const { return capacity (); } 269 octave_idx_type length (void) const { return numel (); }
268 270
269 //! Number of elements in the array. 271 //! Number of elements in the array.
270 //! Synonymous with capacity(), length(), and numel(). 272 //! Synonymous with capacity() and numel().
271 octave_idx_type nelem (void) const { return capacity (); } 273 //! @note This method is deprecated in favour of numel().
274 GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return numel (); }
272 275
273 //! Number of elements in the array. 276 //! Number of elements in the array.
274 //! Synonymous with capacity(), length(), and nelem(). 277 //! Synonymous with capacity().
275 octave_idx_type numel (void) const { return nelem (); } 278 octave_idx_type numel (void) const { return slice_len; }
276 //@} 279 //@}
277 280
278 //! Return the array as a column vector. 281 //! Return the array as a column vector.
279 Array<T> as_column (void) const 282 Array<T> as_column (void) const
280 { 283 {