Mercurial > octave-nkf
view liboctave/array/MArray.h @ 20263:00cf2847355d
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 | 4197fc428c7d |
children |
line wrap: on
line source
// Template array classes with like-type math ops /* Copyright (C) 1993-2015 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_MArray_h) #define octave_MArray_h 1 #include "Array.h" // N-dimensional array with math ops. // But first, some preprocessor abuse... #include "MArray-decl.h" MARRAY_OPS_FORWARD_DECLS (MArray, ) template <class T> class MArray : public Array<T> { protected: // For jit support MArray (T *sdata, octave_idx_type slen, octave_idx_type *adims, void *arep) : Array<T> (sdata, slen, adims, arep) { } public: MArray (void) : Array<T> () { } explicit MArray (const dim_vector& dv) : Array<T> (dv) { } explicit MArray (const dim_vector& dv, const T& val) : Array<T> (dv, val) { } MArray (const MArray<T>& a) : Array<T> (a) { } template <class U> MArray (const Array<U>& a) : Array<T> (a) { } ~MArray (void) { } MArray<T>& operator = (const MArray<T>& a) { Array<T>::operator = (a); return *this; } MArray<T> reshape (const dim_vector& new_dims) const { return Array<T>::reshape (new_dims); } MArray<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const { return Array<T>::permute (vec, inv); } MArray<T> ipermute (const Array<octave_idx_type>& vec) const { return Array<T>::ipermute (vec); } MArray squeeze (void) const { return Array<T>::squeeze (); } MArray<T> transpose (void) const { return Array<T>::transpose (); } MArray<T> hermitian (T (*fcn) (const T&) = 0) const { return Array<T>::hermitian (fcn); } // Performs indexed accumulative addition. void idx_add (const idx_vector& idx, T val); void idx_add (const idx_vector& idx, const MArray<T>& vals); void idx_min (const idx_vector& idx, const MArray<T>& vals); void idx_max (const idx_vector& idx, const MArray<T>& vals); void idx_add_nd (const idx_vector& idx, const MArray<T>& vals, int dim = -1); void changesign (void); }; #endif