Mercurial > hg > octave-nkf
view liboctave/numeric/DASPK.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) 1996-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_DASPK_h) #define octave_DASPK_h 1 #include <cfloat> #include "DASPK-opts.h" #include "lo-math.h" class OCTAVE_API DASPK : public DAE, public DASPK_options { public: DASPK (void) : DAE (), DASPK_options (), initialized (false), liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { } DASPK (const ColumnVector& s, double tm, DAEFunc& f) : DAE (s, tm, f), DASPK_options (), initialized (false), liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { } DASPK (const ColumnVector& s, const ColumnVector& deriv, double tm, DAEFunc& f) : DAE (s, deriv, tm, f), DASPK_options (), initialized (false), liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { } ~DASPK (void) { } ColumnVector do_integrate (double t); Matrix do_integrate (const ColumnVector& tout); Matrix do_integrate (const ColumnVector& tout, const ColumnVector& tcrit); Matrix integrate (const ColumnVector& tout, Matrix& xdot_out); Matrix integrate (const ColumnVector& tout, Matrix& xdot_out, const ColumnVector& tcrit); std::string error_message (void) const; private: bool initialized; octave_idx_type liw; octave_idx_type lrw; Array<octave_idx_type> info; Array<octave_idx_type> iwork; Array<double> rwork; Array<double> abs_tol; Array<double> rel_tol; }; #endif