Mercurial > hg > octave-nkf
view liboctave/numeric/ODESFunc.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) 2002-2015 John W. Eaton 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_ODESFunc_h) #define octave_ODESFunc_h 1 #include "dMatrix.h" class ODESFunc { public: struct DAEJac { Matrix *dfdxdot; Matrix *dfdx; }; typedef ColumnVector (*ODES_fsub) (const ColumnVector& x, double, const ColumnVector& theta); typedef ColumnVector (*ODES_bsub) (const ColumnVector& x, double, const ColumnVector& theta, int column); typedef Matrix (*ODES_jsub) (const ColumnVector& x, double, const ColumnVector& theta); ODESFunc (void) : fsub (0), bsub (0), jsub (0) { } ODESFunc (ODES_fsub f) : fsub (f), bsub (0), jsub (0) { } ODESFunc (ODES_fsub f, ODES_bsub b) : fsub (f), bsub (b), jsub (0) { } ODESFunc (ODES_fsub f, ODES_bsub b, ODES_jsub j) : fsub (f), bsub (b), jsub (j) { } ODESFunc (const ODESFunc& a) : fsub (a.fsub), bsub (a.bsub), jsub (a.jsub) { } ODESFunc& operator = (const ODESFunc& a) { if (this != &a) { fsub = a.fsub; bsub = a.bsub; jsub = a.jsub; } return *this; } virtual ~ODESFunc (void) { } ODES_fsub fsub_function (void) const { return fsub; } ODESFunc& set_fsub_function (ODES_fsub f) { fsub = f; return *this; } ODES_bsub bsub_function (void) const { return bsub; } ODESFunc& set_bsub_function (ODES_bsub b) { bsub = b; return *this; } ODES_jsub jsub_function (void) const { return jsub; } ODESFunc& set_jsub_function (ODES_jsub j) { jsub = j; return *this; } protected: ODES_fsub fsub; ODES_bsub bsub; ODES_jsub jsub; }; #endif