Mercurial > hg > octave-nkf
view liboctave/numeric/oct-convn.h @ 20439:5dfaaaae784f
Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax().
* liboctave/array/Array.h (Array::capacity): deprecate for ::numel().
* liboctave/array/Sparse.h (Sparse::capacity): deprecate for ::nzmax().
Also move comments into doxygen docs.
* libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc,
libinterp/corefcn/dassl.cc, libinterp/corefcn/jit-typeinfo.h,
libinterp/corefcn/quad.cc, libinterp/corefcn/variables.cc,
libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.h,
libinterp/octave-value/ov.h, liboctave/array/Sparse.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/Quad.cc, liboctave/numeric/base-de.h,
liboctave/numeric/base-min.h, liboctave/numeric/oct-rand.cc: replace use
of capacity by numel() or nzmax() as appropriate.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Sun, 24 May 2015 04:47:20 +0100 |
parents | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 2009-2015 Jaroslav Hajek Copyright (C) 2009 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_oct_convn_h) #define octave_oct_convn_h 1 #include "dMatrix.h" #include "fMatrix.h" #include "CMatrix.h" #include "fCMatrix.h" #include "dNDArray.h" #include "fNDArray.h" #include "CNDArray.h" #include "fCNDArray.h" #include "dRowVector.h" #include "fRowVector.h" #include "CRowVector.h" #include "fCRowVector.h" #include "dColVector.h" #include "fColVector.h" #include "CColVector.h" #include "fCColVector.h" enum convn_type { convn_full, convn_same, convn_valid }; #define CONV_DECLS(TPREF, RPREF) \ extern OCTAVE_API TPREF ## NDArray \ convn (const TPREF ## NDArray& a, const RPREF ## NDArray& b, convn_type ct); \ extern OCTAVE_API TPREF ## Matrix \ convn (const TPREF ## Matrix& a, const RPREF ## Matrix& b, convn_type ct); \ extern OCTAVE_API TPREF ## Matrix \ convn (const TPREF ## Matrix& a, const RPREF ## ColumnVector& c, \ const RPREF ## RowVector& r, convn_type ct) CONV_DECLS ( , ); CONV_DECLS (Complex, ); CONV_DECLS (Complex, Complex); CONV_DECLS (Float, Float); CONV_DECLS (FloatComplex, Float); CONV_DECLS (FloatComplex, FloatComplex); #endif