octave: liboctave/numeric/LSODE.cc annotate

annotate liboctave/numeric/LSODE.cc @ 21136:7cac4e7458f2

maint: clean up code around calls to current_liboctave_error_handler. Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code. * Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc, PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc, Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc, fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc, floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc, sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc, pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc: Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code.

author	Rik <rik@octave.org>
date	Sat, 23 Jan 2016 13:52:03 -0800
parents	1edf15793cac
children	f7121e111991

rev	line source
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	1 /*
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17769 diff changeset	3 Copyright (C) 1993-2015 John W. Eaton
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	4
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	6
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5765 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5765 diff changeset	10 option) any later version.
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	11
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	15 for more details.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	16
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5765 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5765 diff changeset	19 <http://www.gnu.org/licenses/>.
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	20
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	21 */
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	22
238 780cbbc57b7c [project @ 1993-11-30 20:23:04 by jwe] jwe parents: 227 diff changeset	23 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1011 diff changeset	24 #include <config.h>
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	25 #endif
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	26
1367 9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe] jwe parents: 1360 diff changeset	27 #include <cfloat>
9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe] jwe parents: 1360 diff changeset	28
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5553 diff changeset	29 #include <sstream>
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5553 diff changeset	30
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1482 diff changeset	31 #include "LSODE.h"
1847 2ffe49eb95a5 [project @ 1996-02-03 12:47:55 by jwe] jwe parents: 1842 diff changeset	32 #include "f77-fcn.h"
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 3 diff changeset	33 #include "lo-error.h"
7231 2eb392d058bb [project @ 2007-11-30 18:53:29 by jwe] jwe parents: 7017 diff changeset	34 #include "lo-math.h"
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	35 #include "quit.h"
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	36
11495 8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	37 typedef octave_idx_type (*lsode_fcn_ptr) (const octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	38 const double&, double*,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	39 double*, octave_idx_type&);
3507 00fdd363c098 [project @ 2000-02-01 21:31:44 by jwe] jwe parents: 3504 diff changeset	40
11495 8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	41 typedef octave_idx_type (*lsode_jac_ptr) (const octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	42 const double&, double*,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	43 const octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	44 const octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	45 double*, const octave_idx_type&);
3507 00fdd363c098 [project @ 2000-02-01 21:31:44 by jwe] jwe parents: 3504 diff changeset	46
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	47 extern "C"
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4231 diff changeset	48 {
6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4231 diff changeset	49 F77_RET_T
11495 8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	50 F77_FUNC (dlsode, DLSODE) (lsode_fcn_ptr, octave_idx_type&, double*,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	51 double&, double&, octave_idx_type&, double&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	52 const double*, octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	53 octave_idx_type&, octave_idx_type&,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	54 double, octave_idx_type&, octave_idx_type,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	55 octave_idx_type&, lsode_jac_ptr,
8a5e980da6aa style fixes John W. Eaton <jwe@octave.org> parents: 10350 diff changeset	56 octave_idx_type&);
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4231 diff changeset	57 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	58
532 2ca256b77602 [project @ 1994-07-20 19:56:55 by jwe] jwe parents: 461 diff changeset	59 static ODEFunc::ODERHSFunc user_fun;
2ca256b77602 [project @ 1994-07-20 19:56:55 by jwe] jwe parents: 461 diff changeset	60 static ODEFunc::ODEJacFunc user_jac;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	61 static ColumnVector *tmp_x;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	62
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	63 static octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	64 lsode_f (const octave_idx_type& neq, const double& time, double *,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	65 double *deriv, octave_idx_type& ierr)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	66 {
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	67 BEGIN_INTERRUPT_WITH_EXCEPTIONS;
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	68
2343 d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	69 ColumnVector tmp_deriv;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	70
1360 7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	71 // NOTE: this won't work if LSODE passes copies of the state vector.
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	72 // In that case we have to create a temporary vector object
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	73 // and copy.
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	74
1251 97eac19837dc [project @ 1995-04-11 15:58:32 by jwe] jwe parents: 1192 diff changeset	75 tmp_deriv = (user_fun) (tmp_x, time);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	76
20974 1edf15793cac maint: Use is_empty rather than "numel () == 0" for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	77 if (tmp_deriv.is_empty ())
1251 97eac19837dc [project @ 1995-04-11 15:58:32 by jwe] jwe parents: 1192 diff changeset	78 ierr = -1;
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	79 else
1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	80 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	81 for (octave_idx_type i = 0; i < neq; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	82 deriv[i] = tmp_deriv.elem (i);
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	83 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	84
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	85 END_INTERRUPT_WITH_EXCEPTIONS;
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	86
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	87 return 0;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	88 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	89
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	90 static octave_idx_type
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	91 lsode_j (const octave_idx_type& neq, const double& time, double *,
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	92 const octave_idx_type&, const octave_idx_type&, double *pd,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	93 const octave_idx_type& nrowpd)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	94 {
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	95 BEGIN_INTERRUPT_WITH_EXCEPTIONS;
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	96
1251 97eac19837dc [project @ 1995-04-11 15:58:32 by jwe] jwe parents: 1192 diff changeset	97 Matrix tmp_jac (neq, neq);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	98
1360 7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	99 // NOTE: this won't work if LSODE passes copies of the state vector.
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	100 // In that case we have to create a temporary vector object
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	101 // and copy.
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1321 diff changeset	102
1251 97eac19837dc [project @ 1995-04-11 15:58:32 by jwe] jwe parents: 1192 diff changeset	103 tmp_jac = (user_jac) (tmp_x, time);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	104
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	105 for (octave_idx_type j = 0; j < neq; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	106 for (octave_idx_type i = 0; i < neq; i++)
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	107 pd[nrowpd * j + i] = tmp_jac (i, j);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	108
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	109 END_INTERRUPT_WITH_EXCEPTIONS;
84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	110
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	111 return 0;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	112 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	113
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	114 ColumnVector
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1482 diff changeset	115 LSODE::do_integrate (double tout)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	116 {
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1882 diff changeset	117 ColumnVector retval;
8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1882 diff changeset	118
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	119 static octave_idx_type nn = 0;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	120
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	121 if (! initialized \|\| restart \|\| ODEFunc::reset \|\| LSODE_options::reset)
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1882 diff changeset	122 {
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	123 integration_error = false;
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1882 diff changeset	124
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	125 initialized = true;
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	126
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	127 istate = 1;
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	128
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	129 octave_idx_type n = size ();
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	130
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	131 nn = n;
3955 dc970f5941ee [project @ 2002-05-23 20:28:56 by jwe] jwe parents: 3954 diff changeset	132
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	133 octave_idx_type max_maxord = 0;
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	134
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	135 if (integration_method () == "stiff")
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	136 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	137 max_maxord = 5;
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	138
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	139 if (jac)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	140 method_flag = 21;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	141 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	142 method_flag = 22;
3955 dc970f5941ee [project @ 2002-05-23 20:28:56 by jwe] jwe parents: 3954 diff changeset	143
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	144 liw = 20 + n;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	145 lrw = 22 + n * (9 + n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	146 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	147 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	148 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	149 max_maxord = 12;
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	150
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	151 method_flag = 10;
3955 dc970f5941ee [project @ 2002-05-23 20:28:56 by jwe] jwe parents: 3954 diff changeset	152
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	153 liw = 20;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	154 lrw = 22 + 16 * n;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	155 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	156
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	157 maxord = maximum_order ();
1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	158
11574 a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	159 iwork.resize (dim_vector (liw, 1));
5552 bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	160
bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	161 for (octave_idx_type i = 4; i < 9; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	162 iwork(i) = 0;
5552 bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	163
11574 a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	164 rwork.resize (dim_vector (lrw, 1));
5552 bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	165
bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	166 for (octave_idx_type i = 4; i < 9; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	167 rwork(i) = 0;
5552 bcc328604953 [project @ 2005-11-30 05:48:59 by jwe] jwe parents: 5307 diff changeset	168
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	169 if (maxord >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	170 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	171 if (maxord > 0 && maxord <= max_maxord)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	172 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	173 iwork(4) = maxord;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	174 iopt = 1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	175 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	176 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	177 {
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 20974 diff changeset	178 // FIXME: Should this be a warning?
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	179 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	180 ("lsode: invalid value for maximum order");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	181 integration_error = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	182 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	183 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	184 }
4231 1032fb9ec0d1 [project @ 2002-12-19 19:58:29 by jwe] jwe parents: 4192 diff changeset	185
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	186 if (stop_time_set)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	187 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	188 itask = 4;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	189 rwork(0) = stop_time;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	190 iopt = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	191 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	192 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	193 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	194 itask = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	195 }
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	196
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	197 restart = false;
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	198
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	199 // ODEFunc
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	200
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	201 // NOTE: this won't work if LSODE passes copies of the state vector.
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	202 // In that case we have to create a temporary vector object
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	203 // and copy.
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	204
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	205 tmp_x = &x;
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	206
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	207 user_fun = function ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	208 user_jac = jacobian_function ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	209
2343 d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	210 ColumnVector xdot = (*user_fun) (x, t);
d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	211
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	212 if (x.numel () != xdot.numel ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	213 {
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 20974 diff changeset	214 // FIXME: Should this be a warning?
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	215 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	216 ("lsode: inconsistent sizes for state and derivative vectors");
2343 d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	217
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	218 integration_error = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	219 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	220 }
2343 d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	221
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	222 ODEFunc::reset = false;
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	223
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	224 // LSODE_options
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	225
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	226 rel_tol = relative_tolerance ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	227 abs_tol = absolute_tolerance ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	228
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20229 diff changeset	229 octave_idx_type abs_tol_len = abs_tol.numel ();
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	230
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	231 if (abs_tol_len == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	232 itol = 1;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	233 else if (abs_tol_len == n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	234 itol = 2;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	235 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	236 {
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 20974 diff changeset	237 // FIXME: Should this be a warning?
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	238 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	239 ("lsode: inconsistent sizes for state and absolute tolerance vectors");
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	240
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	241 integration_error = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	242 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	243 }
2343 d7592de300ea [project @ 1996-07-24 21:42:44 by jwe] jwe parents: 1993 diff changeset	244
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	245 double iss = initial_step_size ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	246 if (iss >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	247 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	248 rwork(4) = iss;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	249 iopt = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	250 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	251
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	252 double maxss = maximum_step_size ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	253 if (maxss >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	254 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	255 rwork(5) = maxss;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	256 iopt = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	257 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	258
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	259 double minss = minimum_step_size ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	260 if (minss >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	261 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	262 rwork(6) = minss;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	263 iopt = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	264 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	265
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	266 octave_idx_type sl = step_limit ();
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	267 if (sl > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	268 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	269 iwork(5) = sl;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	270 iopt = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	271 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	272
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	273 LSODE_options::reset = false;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	274 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	275
11502 4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	276 double *px = x.fortran_vec ();
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	277
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	278 double *pabs_tol = abs_tol.fortran_vec ();
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	279
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	280 octave_idx_type *piwork = iwork.fortran_vec ();
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	281 double *prwork = rwork.fortran_vec ();
4638800cd660 delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes John W. Eaton <jwe@octave.org> parents: 11495 diff changeset	282
4583 70da2b8c91dd [project @ 2003-10-31 15:18:31 by jwe] jwe parents: 4552 diff changeset	283 F77_XFCN (dlsode, DLSODE, (lsode_f, nn, px, t, tout, itol, rel_tol,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	284 pabs_tol, itask, istate, iopt, prwork, lrw,
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	285 piwork, liw, lsode_j, method_flag));
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	286
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	287 switch (istate)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	288 {
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	289 case 1: // prior to initial integration step.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	290 case 2: // lsode was successful.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	291 retval = x;
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	292 t = tout;
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	293 break;
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	294
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	295 case -1: // excess work done on this call (perhaps wrong mf).
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	296 case -2: // excess accuracy requested (tolerances too small).
8807 401d54a83690 use 'invalid', not 'illegal' John W. Eaton <jwe@octave.org> parents: 7482 diff changeset	297 case -3: // invalid input detected (see printed message).
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	298 case -4: // repeated error test failures (check all inputs).
12600 7c000c70f873 LSODE.cc: Add semicolon to error messages to prevent run-together text. Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	299 case -5: // repeated convergence failures (perhaps bad Jacobian
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	300 // supplied or wrong choice of mf or tolerances).
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	301 case -6: // error weight became zero during problem. (solution
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	302 // component i vanished, and atol or atol(i) = 0.)
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	303 case -13: // return requested in user-supplied function.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	304 integration_error = true;
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	305 break;
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	306
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	307 default:
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	308 integration_error = true;
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	309 (*current_liboctave_error_handler)
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 20974 diff changeset	310 ("unrecognized value of istate (= %d) returned from lsode", istate);
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	311 break;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	312 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	313
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1882 diff changeset	314 return retval;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	315 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	316
3959 5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	317 std::string
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	318 LSODE::error_message (void) const
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	319 {
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	320 std::string retval;
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	321
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5553 diff changeset	322 std::ostringstream buf;
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5553 diff changeset	323 buf << t;
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5553 diff changeset	324 std::string t_curr = buf.str ();
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	325
3959 5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	326 switch (istate)
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	327 {
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	328 case 1:
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	329 retval = "prior to initial integration step";
3959 5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	330 break;
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	331
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	332 case 2:
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	333 retval = "successful exit";
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	334 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	335
3959 5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	336 case 3:
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	337 retval = "prior to continuation call with modified parameters";
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	338 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	339
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	340 case -1:
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	341 retval = std::string ("excess work on this call (t = ")
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	342 + t_curr + "; perhaps wrong integration method)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	343 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	344
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	345 case -2:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	346 retval = "excess accuracy requested (tolerances too small)";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	347 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	348
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	349 case -3:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	350 retval = "invalid input detected (see printed message)";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	351 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	352
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	353 case -4:
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	354 retval = std::string ("repeated error test failures (t = ")
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	355 + t_curr + "; check all inputs)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	356 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	357
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	358 case -5:
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	359 retval = std::string ("repeated convergence failures (t = ")
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	360 + t_curr
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	361 + "; perhaps bad Jacobian supplied or wrong choice of integration method or tolerances)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	362 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	363
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	364 case -6:
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	365 retval = std::string ("error weight became zero during problem. (t = ")
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	366 + t_curr
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	367 + "; solution component i vanished, and atol or atol(i) == 0)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	368 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	369
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	370 case -13:
4042 8bc97120fbd5 [project @ 2002-08-15 02:30:40 by jwe] jwe parents: 3998 diff changeset	371 retval = "return requested in user-supplied function (t = "
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	372 + t_curr + ")";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	373 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	374
3959 5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	375 default:
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	376 retval = "unknown error state";
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	377 break;
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	378 }
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	379
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	380 return retval;
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	381 }
5a848097fe4a [project @ 2002-05-24 17:58:16 by jwe] jwe parents: 3955 diff changeset	382
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	383 Matrix
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1482 diff changeset	384 LSODE::do_integrate (const ColumnVector& tout)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	385 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	386 Matrix retval;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	387
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	388 octave_idx_type n_out = tout.numel ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	389 octave_idx_type n = size ();
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	390
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	391 if (n_out > 0 && n > 0)
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	392 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	393 retval.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	394
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	395 for (octave_idx_type i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	396 retval.elem (0, i) = x.elem (i);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	397
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	398 for (octave_idx_type j = 1; j < n_out; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	399 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	400 ColumnVector x_next = do_integrate (tout.elem (j));
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	401
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	402 if (integration_error)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	403 return retval;
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	404
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	405 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	406 retval.elem (j, i) = x_next.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	407 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	408 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	409
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	410 return retval;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	411 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	412
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	413 Matrix
3511 d92134062783 [project @ 2000-02-01 22:06:28 by jwe] jwe parents: 3507 diff changeset	414 LSODE::do_integrate (const ColumnVector& tout, const ColumnVector& tcrit)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	415 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	416 Matrix retval;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	417
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	418 octave_idx_type n_out = tout.numel ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	419 octave_idx_type n = size ();
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	420
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	421 if (n_out > 0 && n > 0)
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	422 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	423 retval.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	424
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	425 for (octave_idx_type i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 retval.elem (0, i) = x.elem (i);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	427
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	428 octave_idx_type n_crit = tcrit.numel ();
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	429
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	430 if (n_crit > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	431 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	432 octave_idx_type i_crit = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	433 octave_idx_type i_out = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	434 double next_crit = tcrit.elem (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	435 double next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	436 while (i_out < n_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	437 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	438 bool do_restart = false;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	439
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	440 next_out = tout.elem (i_out);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	441 if (i_crit < n_crit)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	442 next_crit = tcrit.elem (i_crit);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	443
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	444 octave_idx_type save_output;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	445 double t_out;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	446
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	447 if (next_crit == next_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	448 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	449 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	450 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	451 save_output = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	452 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	453 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	454 do_restart = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	455 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	456 else if (next_crit < next_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 if (i_crit < n_crit)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 t_out = next_crit;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	462 save_output = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	463 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	464 do_restart = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	465 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	466 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	467 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	468 clear_stop_time ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	469 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	470 save_output = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	472 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	473 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	474 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	475 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	476 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	477 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	478 save_output = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	479 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	480 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	481
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	482 ColumnVector x_next = do_integrate (t_out);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	483
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	484 if (integration_error)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	485 return retval;
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	486
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	487 if (save_output)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	488 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	489 for (octave_idx_type i = 0; i < n; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	490 retval.elem (i_out-1, i) = x_next.elem (i);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	491 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	492
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	493 if (do_restart)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	494 force_restart ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	495 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	496 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	497 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	498 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	499 retval = do_integrate (tout);
258 1c9a678906fb [project @ 1993-12-14 06:24:04 by jwe] jwe parents: 238 diff changeset	500
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	501 if (integration_error)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	502 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	503 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	504 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	505
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	506 return retval;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	507 }

Mercurial > octave

annotate liboctave/numeric/LSODE.cc @ 21136:7cac4e7458f2