octave-libtiff: liboctave/numeric/DASSL.cc annotate

annotate liboctave/numeric/DASSL.cc @ 30898:51a3d3a69193

maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. * DAEFunc.h, DASPK.cc, DASSL.cc, LSODE.cc, ODEFunc.h, eigs-base.cc, eigs-base.h, oct-norm.cc, mx-inlines.cc: Replace "func", "fun" in documentation and variable names with "fcn".

author	Rik <rik@octave.org>
date	Tue, 05 Apr 2022 13:20:48 -0700
parents	796f54d4ddbf
children

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30394 diff changeset	3 // Copyright (C) 1993-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21662 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	27 # include "config.h"
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	28 #endif
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	29
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	30 #include <cinttypes>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	31 #include <sstream>
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	32
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	33 #include "DASSL.h"
23475 d691ed308237 maint: Clean up #includes in liboctave/numeric directory. Rik <rik@octave.org> parents: 23457 diff changeset	34 #include "dMatrix.h"
1847 2ffe49eb95a5 [project @ 1996-02-03 12:47:55 by jwe] jwe parents: 1842 diff changeset	35 #include "f77-fcn.h"
227 1a48a1b91489 [project @ 1993-11-15 10:10:35 by jwe] jwe parents: 84 diff changeset	36 #include "lo-error.h"
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4066 diff changeset	37 #include "quit.h"
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	38
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	39 typedef F77_INT (dassl_fcn_ptr) (const double&, const double ,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	40 const double , double , F77_INT&,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	41 double , F77_INT );
3507 00fdd363c098 [project @ 2000-02-01 21:31:44 by jwe] jwe parents: 3487 diff changeset	42
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	43 typedef F77_INT (dassl_jac_ptr) (const double&, const double ,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	44 const double , double , const double&,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	45 double , F77_INT );
3507 00fdd363c098 [project @ 2000-02-01 21:31:44 by jwe] jwe parents: 3487 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: 4429 diff changeset	48 {
6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4429 diff changeset	49 F77_RET_T
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	50 F77_FUNC (ddassl, DDASSL) (dassl_fcn_ptr, const F77_INT&, F77_DBLE&,
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	51 F77_DBLE , F77_DBLE , F77_DBLE&, const F77_INT *,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	52 const F77_DBLE , const F77_DBLE , F77_INT&,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	53 F77_DBLE , const F77_INT&, F77_INT ,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	54 const F77_INT&, const F77_DBLE , const F77_INT ,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	55 dassl_jac_ptr);
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4429 diff changeset	56 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	57
30898 51a3d3a69193 maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. Rik <rik@octave.org> parents: 30564 diff changeset	58 static DAEFunc::DAERHSFunc user_fcn;
532 2ca256b77602 [project @ 1994-07-20 19:56:55 by jwe] jwe parents: 465 diff changeset	59 static DAEFunc::DAEJacFunc user_jac;
3993 f23bc69132cc [project @ 2002-07-16 20:18:56 by jwe] jwe parents: 3991 diff changeset	60
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	61 static F77_INT nn;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	62
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	63 static F77_INT
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	64 ddassl_f (const double& time, const double state, const double deriv,
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	65 double delta, F77_INT& ires, double , F77_INT *)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	66 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	67 // FIXME: would be nice to avoid copying the data.
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	68
1546 a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	69 ColumnVector tmp_deriv (nn);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	70 ColumnVector tmp_state (nn);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	71 ColumnVector tmp_delta (nn);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	72
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	73 for (F77_INT i = 0; i < nn; i++)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	74 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	75 tmp_deriv.elem (i) = deriv[i];
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	76 tmp_state.elem (i) = state[i];
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	77 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	78
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	79 octave_idx_type tmp_ires = ires;
0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	80
30898 51a3d3a69193 maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. Rik <rik@octave.org> parents: 30564 diff changeset	81 tmp_delta = user_fcn (tmp_state, tmp_deriv, time, tmp_ires);
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	82
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	83 ires = octave::to_f77_int (tmp_ires);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	84
3849 5266e351a19c [project @ 2001-11-02 04:50:09 by jwe] jwe parents: 3520 diff changeset	85 if (ires >= 0)
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	86 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23475 diff changeset	87 if (tmp_delta.isempty ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	88 ires = -2;
3849 5266e351a19c [project @ 2001-11-02 04:50:09 by jwe] jwe parents: 3520 diff changeset	89 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	90 {
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	91 for (F77_INT i = 0; i < nn; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	92 delta[i] = tmp_delta.elem (i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	93 }
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	94 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	95
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	96 return 0;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	97 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	98
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	99 static F77_INT
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	100 ddassl_j (const double& time, const double state, const double deriv,
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	101 double pd, const double& cj, double , F77_INT *)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	102 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	103 // FIXME: would be nice to avoid copying the data.
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	104
1546 a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	105 ColumnVector tmp_state (nn);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	106 ColumnVector tmp_deriv (nn);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	107
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	108 for (F77_INT i = 0; i < nn; i++)
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	109 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	110 tmp_deriv.elem (i) = deriv[i];
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	111 tmp_state.elem (i) = state[i];
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	112 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	113
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	114 Matrix tmp_pd = user_jac (tmp_state, tmp_deriv, time, cj);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	115
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	116 for (F77_INT j = 0; j < nn; j++)
0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	117 for (F77_INT i = 0; i < nn; i++)
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	118 pd[nn * j + i] = tmp_pd.elem (i, j);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	119
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	120 return 0;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	121 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	122
1546 a272c4056bab [project @ 1995-10-07 03:38:40 by jwe] jwe parents: 1482 diff changeset	123 ColumnVector
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	124 DASSL::do_integrate (double tout)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	125 {
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	126 ColumnVector retval;
8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	127
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	128 if (! m_initialized \|\| m_restart \|\| DAEFunc::m_reset
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	129 \|\| DASSL_options::m_reset)
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	130 {
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	131 m_integration_error = false;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	132
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	133 m_initialized = true;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	134
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	135 m_info.resize (dim_vector (15, 1));
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	136
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	137 for (F77_INT i = 0; i < 15; i++)
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	138 m_info(i) = 0;
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	139
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	140 F77_INT n = octave::to_f77_int (size ());
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	141
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	142 m_liw = 21 + n;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	143 m_lrw = 40 + 9n + nn;
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	144
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	145 nn = n;
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	146
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	147 m_iwork.resize (dim_vector (m_liw, 1));
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	148 m_rwork.resize (dim_vector (m_lrw, 1));
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	149
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	150 m_info(0) = 0;
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	151
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	152 if (m_stop_time_set)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	153 {
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	154 m_rwork(0) = m_stop_time;
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	155 m_info(3) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	156 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	157 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	158 m_info(3) = 0;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	159
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	160 m_restart = false;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	161
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	162 // DAEFunc
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	163
30898 51a3d3a69193 maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. Rik <rik@octave.org> parents: 30564 diff changeset	164 user_fcn = DAEFunc::function ();
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	165 user_jac = DAEFunc::jacobian_function ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	166
30898 51a3d3a69193 maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. Rik <rik@octave.org> parents: 30564 diff changeset	167 if (user_fcn)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	168 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	169 octave_idx_type ires = 0;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	170
30898 51a3d3a69193 maint: Use "fcn" as preferred abbreviation for "function" in liboctave/. Rik <rik@octave.org> parents: 30564 diff changeset	171 ColumnVector res = (*user_fcn) (m_x, m_xdot, m_t, ires);
3993 f23bc69132cc [project @ 2002-07-16 20:18:56 by jwe] jwe parents: 3991 diff changeset	172
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	173 if (res.numel () != m_x.numel ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	174 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	175 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	176 ("dassl: inconsistent sizes for state and residual vectors");
3849 5266e351a19c [project @ 2001-11-02 04:50:09 by jwe] jwe parents: 3520 diff changeset	177
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	178 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	179 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	180 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	181 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	182 else
10314 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 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	185 ("dassl: no user supplied RHS subroutine!");
2344 968a33af8b3d [project @ 1996-07-24 21:49:32 by jwe] jwe parents: 1993 diff changeset	186
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	187 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	188 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	189 }
2344 968a33af8b3d [project @ 1996-07-24 21:49:32 by jwe] jwe parents: 1993 diff changeset	190
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	191 m_info(4) = (user_jac ? 1 : 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	192
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	193 DAEFunc::m_reset = false;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	194
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	195 // DASSL_options
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	196
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	197 double hmax = maximum_step_size ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	198 if (hmax >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	199 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	200 m_rwork(1) = hmax;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	201 m_info(6) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	202 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	203 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	204 m_info(6) = 0;
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	205
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	206 double h0 = initial_step_size ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	207 if (h0 >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	208 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	209 m_rwork(2) = h0;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	210 m_info(7) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	211 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	212 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	213 m_info(7) = 0;
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	214
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	215 F77_INT sl = octave::to_f77_int (step_limit ());
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	216
0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	217 if (sl >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	218 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	219 m_info(11) = 1;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	220 m_iwork(20) = sl;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	221 }
4429 c1f6200b5f0e [project @ 2003-06-17 04:36:08 by jwe] jwe parents: 4192 diff changeset	222 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	223 m_info(11) = 0;
4429 c1f6200b5f0e [project @ 2003-06-17 04:36:08 by jwe] jwe parents: 4192 diff changeset	224
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	225 F77_INT maxord = octave::to_f77_int (maximum_order ());
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	226 if (maxord >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	227 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	228 if (maxord > 0 && maxord < 6)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	229 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	230 m_info(8) = 1;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	231 m_iwork(2) = maxord;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	232 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	233 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	234 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	235 (*current_liboctave_error_handler)
29417 a6ab7069a87c Use matching format string for Fortran integers. Markus Mützel <markus.muetzel@gmx.de> parents: 29358 diff changeset	236 ("dassl: invalid value for maximum order: %"
a6ab7069a87c Use matching format string for Fortran integers. Markus Mützel <markus.muetzel@gmx.de> parents: 29358 diff changeset	237 OCTAVE_F77_INT_TYPE_FORMAT, maxord);
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	238 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	239 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	240 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	241 }
4047 7b0c139ac8af [project @ 2002-08-15 20:52:55 by jwe] jwe parents: 4043 diff changeset	242
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	243 F77_INT enc = octave::to_f77_int (enforce_nonnegativity_constraints ());
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	244 m_info(9) = (enc ? 1 : 0);
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	245
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	246 F77_INT ccic = octave::to_f77_int (compute_consistent_initial_condition ());
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	247 m_info(10) = (ccic ? 1 : 0);
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	248
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	249 m_abs_tol = absolute_tolerance ();
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	250 m_rel_tol = relative_tolerance ();
289 c23f50e61c58 [project @ 1994-01-13 06:25:58 by jwe] jwe parents: 256 diff changeset	251
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	252 F77_INT abs_tol_len = octave::to_f77_int (m_abs_tol.numel ());
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	253 F77_INT rel_tol_len = octave::to_f77_int (m_rel_tol.numel ());
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	254
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	255 if (abs_tol_len == 1 && rel_tol_len == 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	256 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	257 m_info(1) = 0;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	258 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	259 else if (abs_tol_len == n && rel_tol_len == n)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	260 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	261 m_info(1) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	262 }
4047 7b0c139ac8af [project @ 2002-08-15 20:52:55 by jwe] jwe parents: 4043 diff changeset	263 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	264 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	265 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	266 ("dassl: inconsistent sizes for tolerance arrays");
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	267
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	268 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	269 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	270 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	271
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	272 DASSL_options::m_reset = false;
289 c23f50e61c58 [project @ 1994-01-13 06:25:58 by jwe] jwe parents: 256 diff changeset	273 }
4047 7b0c139ac8af [project @ 2002-08-15 20:52:55 by jwe] jwe parents: 4043 diff changeset	274
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	275 double *px = m_x.fortran_vec ();
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	276 double *pxdot = m_xdot.fortran_vec ();
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	277
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	278 F77_INT *pinfo = m_info.fortran_vec ();
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	279
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	280 double *prel_tol = m_rel_tol.fortran_vec ();
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	281 double *pabs_tol = m_abs_tol.fortran_vec ();
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	282
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	283 double *prwork = m_rwork.fortran_vec ();
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	284 F77_INT *piwork = m_iwork.fortran_vec ();
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	285
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	286 double *dummy = nullptr;
21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	287 F77_INT *idummy = nullptr;
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	288
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	289 F77_INT tmp_istate = octave::to_f77_int (m_istate);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	290
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	291 F77_XFCN (ddassl, DDASSL, (ddassl_f, nn, m_t, px, pxdot, tout, pinfo,
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	292 prel_tol, pabs_tol, tmp_istate, prwork, m_lrw,
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29417 diff changeset	293 piwork, m_liw, dummy, idummy, ddassl_j));
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	294
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	295 m_istate = tmp_istate;
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	296
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	297 switch (m_istate)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	298 {
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	299 case 1: // A step was successfully taken in intermediate-output
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	300 // mode. The code has not yet reached TOUT.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	301 case 2: // The integration to TSTOP was successfully completed
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	302 // (T=TSTOP) by stepping exactly to TSTOP.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	303 case 3: // The integration to TOUT was successfully completed
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	304 // (T=TOUT) by stepping past TOUT. Y(*) is obtained by
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	305 // interpolation. YPRIME(*) is obtained by interpolation.
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	306 retval = m_x;
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	307 m_t = tout;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	308 break;
1360 7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe] jwe parents: 1326 diff changeset	309
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	310 case -1: // A large amount of work has been expended. (~500 steps).
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	311 case -2: // The error tolerances are too stringent.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	312 case -3: // The local error test cannot be satisfied because you
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	313 // specified a zero component in ATOL and the
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	314 // corresponding computed solution component is zero.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	315 // Thus, a pure relative error test is impossible for
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	316 // this component.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	317 case -6: // DDASSL had repeated error test failures on the last
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	318 // attempted step.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	319 case -7: // The corrector could not converge.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	320 case -8: // The matrix of partial derivatives is singular.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	321 case -9: // The corrector could not converge. There were repeated
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	322 // error test failures in this step.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	323 case -10: // The corrector could not converge because IRES was
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	324 // equal to minus one.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	325 case -11: // IRES equal to -2 was encountered and control is being
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	326 // returned to the calling program.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	327 case -12: // DDASSL failed to compute the initial YPRIME.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	328 case -33: // The code has encountered trouble from which it cannot
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	329 // recover. A message is printed explaining the trouble
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21724 diff changeset	330 // and control is returned to the calling program. For
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	331 // example, this occurs when invalid input is detected.
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	332 m_integration_error = true;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	333 break;
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	334
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	335 default:
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	336 m_integration_error = true;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	337 (*current_liboctave_error_handler)
26569 0e77df67b522 Add static compile-time checking of printf functions in liboctave. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	338 ("unrecognized value of istate (= %" OCTAVE_IDX_TYPE_FORMAT ") "
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	339 "returned from ddassl", m_istate);
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	340 break;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	341 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	342
1945 8c4bce5e773e [project @ 1996-02-14 01:03:03 by jwe] jwe parents: 1939 diff changeset	343 return retval;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	344 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	345
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	346 Matrix
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	347 DASSL::do_integrate (const ColumnVector& tout)
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	348 {
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	349 Matrix dummy;
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	350 return integrate (tout, dummy);
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	351 }
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	352
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	353 Matrix
0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	354 DASSL::integrate (const ColumnVector& tout, Matrix& xdot_out)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	355 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	356 Matrix retval;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	357
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	358 octave_idx_type n_out = tout.numel ();
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	359 F77_INT n = octave::to_f77_int (size ());
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	360
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	361 if (n_out > 0 && n > 0)
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	362 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	363 retval.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	364 xdot_out.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	365
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	366 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	367 {
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	368 retval.elem (0, i) = m_x.elem (i);
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	369 xdot_out.elem (0, i) = m_xdot.elem (i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	370 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	371
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	372 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	373 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	374 ColumnVector x_next = do_integrate (tout.elem (j));
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	375
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	376 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	377 return retval;
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	378
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	379 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	380 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	381 retval.elem (j, i) = x_next.elem (i);
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	382 xdot_out.elem (j, i) = m_xdot.elem (i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	383 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	384 }
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
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	387 return retval;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	388 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	389
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	390 Matrix
3519 957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	391 DASSL::do_integrate (const ColumnVector& tout, const ColumnVector& tcrit)
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	392 {
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	393 Matrix dummy;
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	394 return integrate (tout, dummy, tcrit);
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	395 }
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	396
957d7d6ab0e0 [project @ 2000-02-02 06:00:09 by jwe] jwe parents: 3507 diff changeset	397 Matrix
1842 0574a1f3a273 [project @ 1996-02-03 11:44:02 by jwe] jwe parents: 1546 diff changeset	398 DASSL::integrate (const ColumnVector& tout, Matrix& xdot_out,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	399 const ColumnVector& tcrit)
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	400 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	401 Matrix retval;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4047 diff changeset	402
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	403 octave_idx_type n_out = tout.numel ();
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	404 F77_INT n = octave::to_f77_int (size ());
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	405
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	406 if (n_out > 0 && n > 0)
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	407 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	408 retval.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	409 xdot_out.resize (n_out, n);
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	410
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	411 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	412 {
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	413 retval.elem (0, i) = m_x.elem (i);
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	414 xdot_out.elem (0, i) = m_xdot.elem (i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	415 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	416
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	417 octave_idx_type n_crit = tcrit.numel ();
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	418
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	419 if (n_crit > 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	420 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	421 octave_idx_type i_crit = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	422 octave_idx_type i_out = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	423 double next_crit = tcrit.elem (0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	424 double next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	425 while (i_out < n_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	427 bool do_restart = false;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	428
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	429 next_out = tout.elem (i_out);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	430 if (i_crit < n_crit)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	431 next_crit = tcrit.elem (i_crit);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	432
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	433 bool save_output;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	434 double t_out;
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	435
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	436 if (next_crit == next_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 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	439 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	440 save_output = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	441 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	442 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	443 do_restart = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	444 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	445 else if (next_crit < next_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	446 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	447 if (i_crit < n_crit)
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_crit;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	451 save_output = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	452 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	453 do_restart = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	454 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	455 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	456 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 clear_stop_time ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 save_output = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	462 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	463 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	464 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	465 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	466 t_out = next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	467 save_output = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	468 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	469 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	470
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 ColumnVector x_next = do_integrate (t_out);
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	472
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	473 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	474 return retval;
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	475
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	476 if (save_output)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	477 {
22960 0d1422cb7e93 use F77_INT instead of octave_idx_type for liboctave ODE and DAE classes John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	478 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	479 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	480 retval.elem (i_out-1, i) = x_next.elem (i);
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	481 xdot_out.elem (i_out-1, i) = m_xdot.elem (i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	482 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	483 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	484
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	485 if (do_restart)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	486 force_restart ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	487 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	488 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	489 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	490 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	491 retval = integrate (tout, xdot_out);
256 e592734b002b [project @ 1993-12-08 23:36:33 by jwe] jwe parents: 238 diff changeset	492
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	493 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	494 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	495 }
3 9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	496 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	497
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	498 return retval;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe] jwe parents: diff changeset	499 }
289 c23f50e61c58 [project @ 1994-01-13 06:25:58 by jwe] jwe parents: 256 diff changeset	500
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	501 std::string
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	502 DASSL::error_message (void) const
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	503 {
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	504 std::string retval;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	505
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	506 std::ostringstream buf;
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	507 buf << m_t;
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	508 std::string t_curr = buf.str ();
4043 6fae69a1796e [project @ 2002-08-15 03:36:27 by jwe] jwe parents: 3998 diff changeset	509
30067 fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	510 switch (m_istate)
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	511 {
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	512 case 1:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	513 retval = "a step was successfully taken in intermediate-output mode.";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	514 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	515
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	516 case 2:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	517 retval = "integration completed by stepping exactly to TOUT";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	518 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	519
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	520 case 3:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	521 retval = "integration to tout completed by stepping past TOUT";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	522 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	523
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	524 case -1:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	525 retval = "a large amount of work has been expended (t =" + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	526 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	527
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	528 case -2:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	529 retval = "the error tolerances are too stringent";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	530 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	531
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	532 case -3:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	533 retval = "error weight became zero during problem. (t = " + t_curr +
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	534 "; 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	535 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	536
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	537 case -6:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	538 retval = "repeated error test failures on the last attempted step (t = "
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23577 diff changeset	539 + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	540 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	541
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	542 case -7:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	543 retval = "the corrector could not converge (t = " + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	544 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	545
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	546 case -8:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	547 retval = "the matrix of partial derivatives is singular (t = " + t_curr +
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	548 ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	549 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	550
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	551 case -9:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	552 retval = "the corrector could not converge (t = " + t_curr +
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	553 "; repeated test failures)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	554 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	555
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	556 case -10:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	557 retval = "corrector could not converge because IRES was -1 (t = "
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23577 diff changeset	558 + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	559 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	560
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	561 case -11:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	562 retval = "return requested in user-supplied function (t = " + t_curr +
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	563 ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	564 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	565
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	566 case -12:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	567 retval = "failed to compute consistent initial conditions";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	568 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	569
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	570 case -33:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	571 retval = "unrecoverable error (see printed message)";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	572 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	573
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	574 default:
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	575 retval = "unknown error state";
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	576 break;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	577 }
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	578
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	579 return retval;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	580 }

Mercurial > octave-libtiff

annotate liboctave/numeric/DASSL.cc @ 30898:51a3d3a69193