Mercurial > hg > octave-thorsten
changeset 3509:a17e16bcd1ac
[project @ 2000-02-01 21:45:52 by jwe]
| author | jwe |
|---|---|
| date | Tue, 01 Feb 2000 21:45:53 +0000 |
| parents | 5fcfe05d76e1 |
| children | 81a6b40c0769 |
| files | liboctave/ChangeLog liboctave/DAE.cc liboctave/DAE.h |
| diffstat | 3 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,6 +1,7 @@ 2000-02-01 John W. Eaton <jwe@bevo.che.wisc.edu> * base-de.h: Use tt instead of t as arg names. + * DAE.h, DAE.cc: Likewise, also xx for x. * DASSL.cc (dassl_fcn_ptr, dassl_jac_ptr): New typedefs. * LSODE.cc: lsode_fcn_ptr, lsode_jac_ptr): Ditto.
--- a/liboctave/DAE.cc +++ b/liboctave/DAE.cc @@ -31,32 +31,32 @@ #include "DAE.h" #include "lo-error.h" -DAE::DAE (const ColumnVector& x, const ColumnVector& xxdot, - double t, DAEFunc& f) - : base_diff_eqn (x, t), DAEFunc (f), xdot (xxdot) +DAE::DAE (const ColumnVector& xx, const ColumnVector& xxdot, + double tt, DAEFunc& f) + : base_diff_eqn (xx, tt), DAEFunc (f), xdot (xxdot) { if (x.length () != xdot.length ()) ; // XXX FIXME XXX -- exception! } void -DAE::initialize (const ColumnVector& xx, double t) +DAE::initialize (const ColumnVector& xx, double tt) { if (xx.length () != xdot.length ()) ; // XXX FIXME XXX -- exception! else - base_diff_eqn::initialize (xx, t); + base_diff_eqn::initialize (xx, tt); } void DAE::initialize (const ColumnVector& xx, const ColumnVector& xxdot, - double t) + double tt) { if (xx.length () != xxdot.length ()) ; // XXX FIXME XXX -- exception! else { - base_diff_eqn::initialize (xx, t); + base_diff_eqn::initialize (xx, tt); xdot = xxdot; } }
--- a/liboctave/DAE.h +++ b/liboctave/DAE.h @@ -38,11 +38,11 @@ DAE (void) : base_diff_eqn (), DAEFunc (), xdot () { } - DAE (const ColumnVector& x, double t, DAEFunc& f) - : base_diff_eqn (x, t), DAEFunc (f), xdot (x.capacity (), 0.0) { } + DAE (const ColumnVector& xx, double tt, DAEFunc& f) + : base_diff_eqn (xx, tt), DAEFunc (f), xdot (x.capacity (), 0.0) { } - DAE (const ColumnVector& x, const ColumnVector& xxdot, - double t, DAEFunc& f); + DAE (const ColumnVector& xx, const ColumnVector& xxdot, + double tt, DAEFunc& f); DAE (const DAE& a) : base_diff_eqn (a), DAEFunc (a), xdot (a.xdot) { } @@ -63,10 +63,10 @@ ColumnVector state_derivative (void) { return xdot; } - void initialize (const ColumnVector& x, double t); + void initialize (const ColumnVector& xx, double tt); - void initialize (const ColumnVector& x, const ColumnVector& xxdot, - double t); + void initialize (const ColumnVector& xx, const ColumnVector& xxdot, + double tt); protected: