Mercurial > hg > octave-terminal
changeset 4277:5ab4ac522fec
[project @ 2003-01-03 23:45:06 by jwe]
author | jwe |
---|---|
date | Fri, 03 Jan 2003 23:47:10 +0000 |
parents | 8724cf60d51d |
children | 2cc12970de72 |
files | liboctave/DAERT.h liboctave/ODES.cc liboctave/ODESSA.cc liboctave/base-de.h |
diffstat | 4 files changed, 18 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/DAERT.h +++ b/liboctave/DAERT.h @@ -35,12 +35,12 @@ DAERT (void) : base_diff_alg_eqn (), DAERTFunc () { } - DAERT (const ColumnVector& x, double t, DAERTFunc& f) - : base_diff_alg_eqn (x, t), DAERTFunc (f) { } + DAERT (const ColumnVector& xx, double tt, DAERTFunc& f) + : base_diff_alg_eqn (xx, tt), DAERTFunc (f) { } - DAERT (const ColumnVector& x, const ColumnVector& xdot, double t, + DAERT (const ColumnVector& xx, const ColumnVector& xxdot, double tt, DAERTFunc& f) - : base_diff_alg_eqn (x, xdot, t), DAERTFunc (f) { } + : base_diff_alg_eqn (xx, xxdot, tt), DAERTFunc (f) { } DAERT (const DAERT& a) : base_diff_alg_eqn (a), DAERTFunc (a) { } @@ -58,9 +58,10 @@ ~DAERT (void) { } - void initialize (const ColumnVector& x, const ColumnVector& xdot, double t) + void initialize (const ColumnVector& xx, const ColumnVector& xxdot, + double tt) { - base_diff_alg_eqn::initialize (x, xdot, t); + base_diff_alg_eqn::initialize (xx, xxdot, tt); } };
--- a/liboctave/ODES.cc +++ b/liboctave/ODES.cc @@ -32,17 +32,17 @@ #include "lo-error.h" void -ODES::initialize (const ColumnVector& xx, double t) +ODES::initialize (const ColumnVector& xx, double tt) { - base_diff_eqn::initialize (xx, t); + base_diff_eqn::initialize (xx, tt); xdot = ColumnVector (xx.length (), 0.0); } void -ODES::initialize (const ColumnVector& xx, double t, +ODES::initialize (const ColumnVector& xx, double tt, const ColumnVector& xtheta) { - base_diff_eqn::initialize (xx, t); + base_diff_eqn::initialize (xx, tt); xdot = ColumnVector (xx.length (), 0.0); theta = xtheta; }
--- a/liboctave/ODESSA.cc +++ b/liboctave/ODESSA.cc @@ -212,15 +212,15 @@ y.resize (n, 1, 0.0); } -ODESSA::ODESSA (const ColumnVector& state, const ColumnVector& theta, +ODESSA::ODESSA (const ColumnVector& state, const ColumnVector& xtheta, const Matrix& sensitivity_guess, double time, ODESFunc& f) - : ODES (state, theta, time, f) + : ODES (state, xtheta, time, f) { initialized = false; neq.resize(2); n = state.length(); - npar = theta.length(); + npar = xtheta.length(); neq(0) = n; neq(1) = npar; @@ -230,12 +230,12 @@ for (int i = 0; i < npar; i++) { - par(i) = theta(i); + par(i) = xtheta(i); } sanity_checked = false; - npar = theta.length (); + npar = xtheta.length (); iopt.resize(4); itask = 1;