Mercurial > octave
changeset 3312:2396decd33de
[project @ 1999-10-21 18:55:36 by jwe]
| author | jwe |
|---|---|
| date | Thu, 21 Oct 1999 18:55:40 +0000 |
| parents | 48872c196664 |
| children | 27502f8b3ba7 |
| files | doc/interpreter/Makefile.in liboctave/ChangeLog liboctave/DASSL.cc |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/Makefile.in Thu Oct 21 18:33:53 1999 +0000 +++ b/doc/interpreter/Makefile.in Thu Oct 21 18:55:40 1999 +0000 @@ -40,7 +40,8 @@ FORMATTED = octave.dvi octave.ps octave.info octave.info-[0-9]* octave_*.html -DISTFILES = Makefile.in dir octave.1 $(SOURCES) $(TEXINFO) $(FORMATTED) +DISTFILES = Makefile.in dir munge-texi.cc octave.1 \ + $(SOURCES) $(TEXINFO) $(FORMATTED) ifeq ($(wildcard octave.info), ) BINDISTFILES = $(addprefix $(srcdir)/, octave.1 $(FORMATTED))
--- a/liboctave/ChangeLog Thu Oct 21 18:33:53 1999 +0000 +++ b/liboctave/ChangeLog Thu Oct 21 18:55:40 1999 +0000 @@ -1,3 +1,9 @@ +1999-10-21 John W. Eaton <jwe@bevo.che.wisc.edu> + + * DASSL.cc (DASSL::do_integrate (double)): If we have a function + to evaluate the Jacobian, set info(4), not iwork(4). + Set rwork(1) to the maximum step size, not rwork(2). + 1999-10-14 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-time.cc: Include <climits>.
--- a/liboctave/DASSL.cc Thu Oct 21 18:33:53 1999 +0000 +++ b/liboctave/DASSL.cc Thu Oct 21 18:55:40 1999 +0000 @@ -208,9 +208,9 @@ integration_error = 0; if (DAEFunc::jacobian_function ()) - iwork.elem (4) = 1; + info.elem (4) = 1; else - iwork.elem (4) = 0; + info.elem (4) = 0; double *px = x.fortran_vec (); double *pxdot = xdot.fortran_vec (); @@ -237,8 +237,8 @@ if (stop_time_set) { + rwork.elem (0) = stop_time; info.elem (3) = 1; - rwork.elem (0) = stop_time; } else info.elem (3) = 0; @@ -256,7 +256,7 @@ if (maximum_step_size () >= 0.0) { - rwork.elem (2) = maximum_step_size (); + rwork.elem (1) = maximum_step_size (); info.elem (6) = 1; } else