Mercurial > hg > octave-lyh
diff liboctave/LSODE.cc @ 461:00f8b2242a18
[project @ 1994-06-06 00:45:57 by jwe]
author | jwe |
---|---|
date | Mon, 06 Jun 1994 00:57:54 +0000 |
parents | 3c23b8ea9099 |
children | 2ca256b77602 |
line wrap: on
line diff
--- a/liboctave/LSODE.cc +++ b/liboctave/LSODE.cc @@ -25,8 +25,13 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include <math.h> #include <float.h> +#include <iostream.h> #include "ODE.h" #include "f77-uscore.h" @@ -73,8 +78,8 @@ rwork[i] = 0.0; } - fun = NULL; - jac = NULL; + fun = 0; + jac = 0; } ODE::ODE (int size) @@ -104,8 +109,8 @@ rwork[i] = 0.0; } - fun = NULL; - jac = NULL; + fun = 0; + jac = 0; } ODE::ODE (const ColumnVector& state, double time, const ODEFunc& f) @@ -194,10 +199,10 @@ ColumnVector ODE::integrate (double tout) { - if (jac == NULL) + if (jac) + method_flag = 21; + else method_flag = 22; - else - method_flag = 21; integration_error = 0;