Mercurial > hg > octave-max
changeset 3508:5fcfe05d76e1
[project @ 2000-02-01 21:38:03 by jwe]
| author | jwe |
|---|---|
| date | Tue, 01 Feb 2000 21:38:03 +0000 |
| parents | 00fdd363c098 |
| children | a17e16bcd1ac |
| files | liboctave/ChangeLog liboctave/base-de.h |
| diffstat | 2 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,7 @@ 2000-02-01 John W. Eaton <jwe@bevo.che.wisc.edu> + * base-de.h: Use tt instead of t as arg names. + * DASSL.cc (dassl_fcn_ptr, dassl_jac_ptr): New typedefs. * LSODE.cc: lsode_fcn_ptr, lsode_jac_ptr): Ditto. * Quad.cc (quad_fcn_ptr): Ditto.
--- a/liboctave/base-de.h +++ b/liboctave/base-de.h @@ -53,12 +53,12 @@ // integration. // Return the vector of states at output time t. - virtual ColumnVector do_integrate (double t) = 0; + virtual ColumnVector do_integrate (double tt) = 0; // Return a matrix of states at each output time specified by t. // The rows of the result matrix should each correspond to a new // output time. - virtual Matrix do_integrate (const ColumnVector& t) = 0; + virtual Matrix do_integrate (const ColumnVector& tt) = 0; // There must also be a way for us to force the integration to // restart. @@ -68,28 +68,28 @@ // get additional information. // Integrate to t from current point. - virtual ColumnVector integrate (double t) - { return do_integrate (t); } + virtual ColumnVector integrate (double tt) + { return do_integrate (tt); } // Set new x0, t0 and integrate to t. - virtual ColumnVector integrate (const ColumnVector& x0, double t0, double t) + virtual ColumnVector integrate (const ColumnVector& x0, double t0, double tt) { initialize (x0, t0); - return do_integrate (t); + return do_integrate (tt); } // Integrate from current point and return output at all points // specified by t. - virtual Matrix integrate (const ColumnVector t) - { return do_integrate (t); } + virtual Matrix integrate (const ColumnVector tt) + { return do_integrate (tt); } // Set new x0, t0 and integrate to return output at all points // specified by t. virtual Matrix integrate (const ColumnVector& x0, double t0, - const ColumnVector t) + const ColumnVector tt) { initialize (x0, t0); - return do_integrate (t); + return do_integrate (tt); } virtual void initialize (const ColumnVector& x0, double t0)