Mercurial > octave-nkf
view liboctave/array/MDiagArray2.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) 1996-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_MDiagArray2_h) #define octave_MDiagArray2_h 1 #include "DiagArray2.h" #include "MArray.h" // Two dimensional diagonal array with math ops. // But first, some preprocessor abuse... #include "MArray-decl.h" MDIAGARRAY2_OPS_FORWARD_DECLS (MDiagArray2, ) template <class T> class MDiagArray2 : public DiagArray2<T> { public: MDiagArray2 (void) : DiagArray2<T> () { } MDiagArray2 (octave_idx_type r, octave_idx_type c) : DiagArray2<T> (r, c) { } MDiagArray2 (octave_idx_type r, octave_idx_type c, const T& val) : DiagArray2<T> (r, c, val) { } MDiagArray2 (const MDiagArray2<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const DiagArray2<T>& a) : DiagArray2<T> (a) { } template <class U> MDiagArray2 (const DiagArray2<U>& a) : DiagArray2<T> (a) { } explicit MDiagArray2 (const Array<T>& a) : DiagArray2<T> (a) { } MDiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : DiagArray2<T> (a, r, c) { } ~MDiagArray2 (void) { } MDiagArray2<T>& operator = (const MDiagArray2<T>& a) { DiagArray2<T>::operator = (a); return *this; } MArray<T> array_value () const { return DiagArray2<T>::array_value (); } octave_idx_type nnz (void) const { octave_idx_type retval = 0; const T *d = this->data (); octave_idx_type nel = this->length (); for (octave_idx_type i = 0; i < nel; i++) { if (d[i] != T ()) retval++; } return retval; } MArray<T> diag (octave_idx_type k = 0) const { return DiagArray2<T>::extract_diag (k); } MDiagArray2<T> transpose (void) const { return DiagArray2<T>::transpose (); } MDiagArray2<T> hermitian (T (*fcn) (const T&) = 0) const { return DiagArray2<T>::hermitian (fcn); } bool is_multiple_of_identity (T val) const; // Currently, the OPS functions don't need to be friends, but that // may change. MDIAGARRAY2_OPS_FRIEND_DECLS (MDiagArray2, ) }; #endif