Mercurial > octave-nkf
view liboctave/array/CColVector.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
/* Copyright (C) 1994-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_CColVector_h) #define octave_CColVector_h 1 #include "MArray.h" #include "mx-defs.h" class OCTAVE_API ComplexColumnVector : public MArray<Complex> { friend class ComplexMatrix; friend class ComplexRowVector; public: ComplexColumnVector (void) : MArray<Complex> (dim_vector (0, 1)) { } explicit ComplexColumnVector (octave_idx_type n) : MArray<Complex> (dim_vector (n, 1)) { } explicit ComplexColumnVector (const dim_vector& dv) : MArray<Complex> (dv.as_column ()) { } ComplexColumnVector (octave_idx_type n, const Complex& val) : MArray<Complex> (dim_vector (n, 1), val) { } ComplexColumnVector (const ComplexColumnVector& a) : MArray<Complex> (a) { } ComplexColumnVector (const MArray<Complex>& a) : MArray<Complex> (a.as_column ()) { } ComplexColumnVector (const Array<Complex>& a) : MArray<Complex> (a.as_column ()) { } explicit ComplexColumnVector (const ColumnVector& a); ComplexColumnVector& operator = (const ComplexColumnVector& a) { MArray<Complex>::operator = (a); return *this; } bool operator == (const ComplexColumnVector& a) const; bool operator != (const ComplexColumnVector& a) const; // destructive insert/delete/reorder operations ComplexColumnVector& insert (const ColumnVector& a, octave_idx_type r); ComplexColumnVector& insert (const ComplexColumnVector& a, octave_idx_type r); ComplexColumnVector& fill (double val); ComplexColumnVector& fill (const Complex& val); ComplexColumnVector& fill (double val, octave_idx_type r1, octave_idx_type r2); ComplexColumnVector& fill (const Complex& val, octave_idx_type r1, octave_idx_type r2); ComplexColumnVector stack (const ColumnVector& a) const; ComplexColumnVector stack (const ComplexColumnVector& a) const; ComplexRowVector hermitian (void) const; ComplexRowVector transpose (void) const; friend OCTAVE_API ComplexColumnVector conj (const ComplexColumnVector& a); // resize is the destructive equivalent for this one ComplexColumnVector extract (octave_idx_type r1, octave_idx_type r2) const; ComplexColumnVector extract_n (octave_idx_type r1, octave_idx_type n) const; // column vector by column vector -> column vector operations ComplexColumnVector& operator += (const ColumnVector& a); ComplexColumnVector& operator -= (const ColumnVector& a); // matrix by column vector -> column vector operations friend OCTAVE_API ComplexColumnVector operator * (const ComplexMatrix& a, const ColumnVector& b); friend OCTAVE_API ComplexColumnVector operator * (const ComplexMatrix& a, const ComplexColumnVector& b); // matrix by column vector -> column vector operations friend OCTAVE_API ComplexColumnVector operator * (const Matrix& a, const ComplexColumnVector& b); // diagonal matrix by column vector -> column vector operations friend OCTAVE_API ComplexColumnVector operator * (const DiagMatrix& a, const ComplexColumnVector& b); friend OCTAVE_API ComplexColumnVector operator * (const ComplexDiagMatrix& a, const ColumnVector& b); friend OCTAVE_API ComplexColumnVector operator * (const ComplexDiagMatrix& a, const ComplexColumnVector& b); // other operations Complex min (void) const; Complex max (void) const; ColumnVector abs (void) const; // i/o friend OCTAVE_API std::ostream& operator << (std::ostream& os, const ComplexColumnVector& a); friend OCTAVE_API std::istream& operator >> (std::istream& is, ComplexColumnVector& a); void resize (octave_idx_type n, const Complex& rfv = Complex (0)) { Array<Complex>::resize (dim_vector (n, 1), rfv); } void clear (octave_idx_type n) { Array<Complex>::clear (n, 1); } }; MARRAY_FORWARD_DEFS (MArray, ComplexColumnVector, Complex) #endif