octave: liboctave/numeric/DASRT.cc annotate

annotate liboctave/numeric/DASRT.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	597f3ee61a48
children	2e484f9f1f18

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 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	3 // Copyright (C) 2002-2023 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 ////////////////////////////////////////////////////////////////////////
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 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"
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	28 #endif
46388d6a4e44 [project @ 2002-07-16 06:20:39 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
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	33 #include "DASRT.h"
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	34 #include "f77-fcn.h"
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	35 #include "lo-error.h"
4180 84fe3ca3a246 [project @ 2002-11-15 04:47:01 by jwe] jwe parents: 4133 diff changeset	36 #include "quit.h"
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	37
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	38 typedef F77_INT (dasrt_fcn_ptr) (const double&, 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	39 double , F77_INT&, double , F77_INT *);
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	40
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	41 typedef F77_INT (dasrt_jac_ptr) (const double&, 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	42 double , const double&, double , F77_INT *);
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	43
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	44 typedef F77_INT (*dasrt_constr_ptr) (const F77_INT&, const double&,
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	45 const double *, const F77_INT&,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	46 double , double , F77_INT *);
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	47
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	48 extern "C"
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4548 diff changeset	49 {
6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4548 diff changeset	50 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	51 F77_FUNC (ddasrt, DDASRT) (dasrt_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	52 F77_DBLE , 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 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	54 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	55 const F77_INT&, F77_DBLE , F77_INT ,
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	56 dasrt_jac_ptr, dasrt_constr_ptr, const F77_INT&,
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	57 F77_INT *);
4552 6f3382e08a52 [project @ 2003-10-27 20:38:02 by jwe] jwe parents: 4548 diff changeset	58 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	59
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	60 static DAEFunc::DAERHSFunc user_fsub;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	61 static DAEFunc::DAEJacFunc user_jsub;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	62 static DAERTFunc::DAERTConstrFunc user_csub;
3993 f23bc69132cc [project @ 2002-07-16 20:18:56 by jwe] jwe parents: 3992 diff changeset	63
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	64 static F77_INT nn;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	65
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	66 static F77_INT
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	67 ddasrt_f (const double& t, 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	68 double delta, F77_INT& ires, double , F77_INT *)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	69 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	70 ColumnVector tmp_state (nn);
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	71 ColumnVector tmp_deriv (nn);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 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++)
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	74 {
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	75 tmp_state(i) = state[i];
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	76 tmp_deriv(i) = deriv[i];
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	77 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 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
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	81 ColumnVector tmp_fval = (*user_fsub) (tmp_state, tmp_deriv, t, tmp_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	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);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	84
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23475 diff changeset	85 if (tmp_fval.isempty ())
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	86 ires = -2;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	87 else
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	88 {
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	89 for (F77_INT i = 0; i < nn; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	90 delta[i] = tmp_fval(i);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	91 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	92
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	93 return 0;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	94 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	95
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	96 F77_INT
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	97 ddasrt_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	98 double pd, const double& cj, double , F77_INT *)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	99 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	100 // FIXME: would be nice to avoid copying the data.
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	101
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	102 ColumnVector tmp_state (nn);
48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	103 ColumnVector tmp_deriv (nn);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	104
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	105 for (F77_INT i = 0; i < nn; i++)
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	106 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14138 diff changeset	107 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	108 tmp_state.elem (i) = state[i];
3991 48d2bc4a3729 [project @ 2002-07-16 17:46:50 by jwe] jwe parents: 3990 diff changeset	109 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	110
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	111 Matrix tmp_pd = (*user_jsub) (tmp_state, tmp_deriv, time, cj);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	112
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	113 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	114 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	115 pd[nn * j + i] = tmp_pd.elem (i, j);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	116
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	117 return 0;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	118 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	119
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	120 static F77_INT
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	121 ddasrt_g (const F77_INT& neq, const double& t, const double *state,
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	122 const F77_INT& m_ng, double gout, double , F77_INT *)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	123 {
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	124 F77_INT n = neq;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	125
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	126 ColumnVector tmp_state (n);
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	127 for (F77_INT i = 0; i < n; i++)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	128 tmp_state(i) = state[i];
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	129
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	130 ColumnVector tmp_fval = (*user_csub) (tmp_state, t);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	131
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	132 for (F77_INT i = 0; i < m_ng; i++)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	133 gout[i] = tmp_fval(i);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	134
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	135 return 0;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	136 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	137
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	138 void
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	139 DASRT::integrate (double tout)
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	140 {
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	141 // I suppose this is the safe thing to do. If this is the first
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	142 // call, or if anything about the problem has changed, we should
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	143 // start completely fresh.
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	144
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	145 if (! m_initialized \|\| m_restart
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	146 \|\| DAEFunc::m_reset \|\| DAERTFunc::m_reset \|\| DASRT_options::m_reset)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	147 {
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	148 m_integration_error = false;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	149
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	150 m_initialized = true;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	151
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	152 m_info.resize (dim_vector (15, 1));
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	153
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	154 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: 29358 diff changeset	155 m_info(i) = 0;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	156
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	157 F77_INT n = octave::to_f77_int (size ());
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	158
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	159 nn = n;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	160
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	161 // DAERTFunc
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	162
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	163 user_csub = DAERTFunc::constraint_function ();
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	164
402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	165 if (user_csub)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	166 {
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	167 ColumnVector tmp = (*user_csub) (m_x, m_t);
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	168 m_ng = octave::to_f77_int (tmp.numel ());
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	169 }
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	170 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	171 m_ng = 0;
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	172
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	173 F77_INT maxord = octave::to_f77_int (maximum_order ());
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	174 if (maxord >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	175 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	176 if (maxord > 0 && maxord < 6)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	177 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	178 m_info(8) = 1;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	179 m_iwork(2) = maxord;
10314 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 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	182 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	183 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	184 ("dassl: invalid value for maximum order");
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	185 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	186 return;
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 }
4133 402d7b86a0a2 [project @ 2002-10-29 23:57:34 by jwe] jwe parents: 4066 diff changeset	189
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	190 m_liw = 21 + n;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	191 m_lrw = 50 + 9n + nn + 3*m_ng;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	192
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	193 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: 29358 diff changeset	194 m_rwork.resize (dim_vector (m_lrw, 1));
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	195
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	196 m_info(0) = 0;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	197
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	198 if (m_stop_time_set)
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: 29358 diff changeset	200 m_info(3) = 1;
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	201 m_rwork(0) = m_stop_time;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	202 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	203 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	204 m_info(3) = 0;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	205
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	206 m_restart = false;
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	207
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	208 // DAEFunc
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	209
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	210 user_fsub = DAEFunc::function ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	211 user_jsub = DAEFunc::jacobian_function ();
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	212
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	213 if (user_fsub)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	214 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	215 octave_idx_type ires = 0;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	216
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	217 ColumnVector fval = (*user_fsub) (m_x, m_xdot, m_t, ires);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	218
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	219 if (fval.numel () != m_x.numel ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	220 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	221 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	222 ("dasrt: inconsistent sizes for state and residual vectors");
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	223
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	224 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	225 return;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	226 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	227 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	228 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	229 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	230 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	231 ("dasrt: no user supplied RHS subroutine!");
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	232
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	233 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	234 return;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	235 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	236
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	237 m_info(4) = (user_jsub ? 1 : 0);
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	238
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	239 DAEFunc::m_reset = false;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	240
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	241 m_jroot.resize (dim_vector (m_ng, 1), 1);
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	242
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	243 DAERTFunc::m_reset = false;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	244
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	245 // DASRT_options
a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	246
4050 6481f41a79f3 [project @ 2002-08-17 02:18:18 by jwe] jwe parents: 4049 diff changeset	247 double mss = maximum_step_size ();
6481f41a79f3 [project @ 2002-08-17 02:18:18 by jwe] jwe parents: 4049 diff changeset	248 if (mss >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	249 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	250 m_rwork(1) = mss;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	251 m_info(6) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	252 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	253 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	254 m_info(6) = 0;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	255
4050 6481f41a79f3 [project @ 2002-08-17 02:18:18 by jwe] jwe parents: 4049 diff changeset	256 double iss = initial_step_size ();
6481f41a79f3 [project @ 2002-08-17 02:18:18 by jwe] jwe parents: 4049 diff changeset	257 if (iss >= 0.0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	258 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	259 m_rwork(2) = iss;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	260 m_info(7) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	261 }
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	262 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	263 m_info(7) = 0;
4049 a35a3c5d4740 [project @ 2002-08-16 08:54:31 by jwe] jwe parents: 4043 diff changeset	264
22988 cd33c785e80e put to_f77_int inside octave namespace John W. Eaton <jwe@octave.org> parents: 22960 diff changeset	265 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	266 if (sl >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	267 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	268 m_info(11) = 1;
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	269 m_iwork(20) = sl;
10314 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: 4043 diff changeset	271 else
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	272 m_info(11) = 0;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	273
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	274 m_abs_tol = absolute_tolerance ();
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	275 m_rel_tol = relative_tolerance ();
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	276
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	277 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: 29358 diff changeset	278 F77_INT rel_tol_len = octave::to_f77_int (m_rel_tol.numel ());
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	279
f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	280 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	281 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	282 m_info.elem (1) = 0;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	283 }
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	284 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	285 {
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	286 m_info.elem (1) = 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	287 }
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	288 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	289 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	290 (*current_liboctave_error_handler)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	291 ("dasrt: inconsistent sizes for tolerance arrays");
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	292
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	293 m_integration_error = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	294 return;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	295 }
3998 f6df65db67f9 [project @ 2002-07-24 18:10:39 by jwe] jwe parents: 3997 diff changeset	296
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	297 DASRT_options::m_reset = false;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	298 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	299
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	300 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	301 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	302
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	303 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	304
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	305 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: 29358 diff changeset	306 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	307
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	308 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: 29358 diff changeset	309 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	310
30046 b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	311 F77_INT *pjroot = m_jroot.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	312
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	313 double *dummy = nullptr;
21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	314 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	315
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	316 F77_INT tmp_istate = octave::to_f77_int (m_istate);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	317
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	318 F77_XFCN (ddasrt, DDASRT, (ddasrt_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: 29358 diff changeset	319 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: 29358 diff changeset	320 piwork, m_liw, dummy, idummy, ddasrt_j,
b3717fd85e49 maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. Rik <rik@octave.org> parents: 29358 diff changeset	321 ddasrt_g, m_ng, pjroot));
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	322
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	323 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	324
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	325 switch (m_istate)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	326 {
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	327 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	328 // 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	329 case 2: // The integration to TOUT was successfully completed
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	330 // (T=TOUT) by stepping exactly to TOUT.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	331 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	332 // (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	333 // 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	334 m_t = tout;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	335 break;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	336
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	337 case 4: // The integration was successfully completed
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	338 // by finding one or more roots of G at T.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	339 break;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	340
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	341 case -1: // A large amount of work has been expended.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	342 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	343 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	344 // specified a zero component in ATOL and the
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	345 // corresponding computed solution component is zero.
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	346 // Thus, a pure relative error test is impossible for
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	347 // this component.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	348 case -6: // DDASRT had repeated error test failures on the last
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	349 // attempted step.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	350 case -7: // The corrector could not converge.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	351 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	352 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	353 // error test failures in this step.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	354 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	355 // equal to minus one.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	356 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	357 // returned to the calling program.
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	358 case -12: // DASSL failed to compute the initial YPRIME.
29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	359 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	360 // 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	361 // 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	362 // 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	363 m_integration_error = true;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	364 break;
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	365
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	366 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	367 m_integration_error = true;
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	368 (*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	369 ("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	370 "returned from ddasrt", m_istate);
7482 29980c6b8604 don't check f77_exception_encountered John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	371 break;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	372 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	373 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	374
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	375 DASRT_result
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	376 DASRT::integrate (const ColumnVector& tout)
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	377 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	378 DASRT_result retval;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	379
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	380 Matrix x_out;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	381 Matrix xdot_out;
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	382 ColumnVector t_out = tout;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	383
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	384 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	385 F77_INT n = octave::to_f77_int (size ());
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	386
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	387 if (n_out > 0 && n > 0)
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	388 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	389 x_out.resize (n_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	390 xdot_out.resize (n_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	391
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	392 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	393 {
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	394 x_out(0, i) = m_x(i);
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	395 xdot_out(0, i) = m_xdot(i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	396 }
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 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 integrate (tout(j));
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	401
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	402 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	403 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	404 retval = DASRT_result (x_out, xdot_out, t_out);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	405 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	406 }
3992 53b4eab68976 [project @ 2002-07-16 19:36:52 by jwe] jwe parents: 3991 diff changeset	407
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	408 if (m_istate == 4)
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	409 t_out(j) = m_t;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	410 else
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	411 t_out(j) = tout(j);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	412
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	413 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	414 {
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	415 x_out(j, i) = m_x(i);
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	416 xdot_out(j, i) = m_xdot(i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	417 }
3992 53b4eab68976 [project @ 2002-07-16 19:36:52 by jwe] jwe parents: 3991 diff changeset	418
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	419 if (m_istate == 4)
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 x_out.resize (j+1, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	422 xdot_out.resize (j+1, n);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	423 t_out.resize (j+1);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	424 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	425 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	427 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	428
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	429 retval = DASRT_result (x_out, xdot_out, t_out);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	430
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	431 return retval;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	432 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	433
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	434 DASRT_result
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11574 diff changeset	435 DASRT::integrate (const ColumnVector& tout, const ColumnVector& tcrit)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	436 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	437 DASRT_result retval;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	438
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	439 Matrix x_out;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	440 Matrix xdot_out;
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	441 ColumnVector t_outs = tout;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	442
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	443 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	444 F77_INT n = octave::to_f77_int (size ());
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	445
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	446 if (n_out > 0 && n > 0)
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	447 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	448 x_out.resize (n_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	449 xdot_out.resize (n_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	450
20229 5dfaaaae784f Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). Carnë Draug <carandraug@octave.org> parents: 19697 diff changeset	451 octave_idx_type n_crit = tcrit.numel ();
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	452
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	453 if (n_crit > 0)
10314 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 octave_idx_type i_crit = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	456 octave_idx_type i_out = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 double next_crit = tcrit(0);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 double next_out;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 while (i_out < n_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 bool do_restart = false;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	462
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	463 next_out = tout(i_out);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	464 if (i_crit < n_crit)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	465 next_crit = tcrit(i_crit);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	466
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	467 bool save_output = false;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	468 double t_out;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	469
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	470 if (next_crit == next_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	472 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	473 t_out = next_out;
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	474 save_output = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	475 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	476 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	477 do_restart = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	478 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	479 else if (next_crit < next_out)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	480 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	481 if (i_crit < n_crit)
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 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	484 t_out = next_crit;
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	485 save_output = false;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	486 i_crit++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	487 do_restart = true;
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 else
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 clear_stop_time ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	492 t_out = next_out;
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	493 save_output = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	494 i_out++;
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 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	497 else
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 set_stop_time (next_crit);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	500 t_out = next_out;
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	501 save_output = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	502 i_out++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	503 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	504
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	505 integrate (t_out);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	506
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 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	508 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	509 retval = DASRT_result (x_out, xdot_out, t_outs);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	510 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	511 }
3992 53b4eab68976 [project @ 2002-07-16 19:36:52 by jwe] jwe parents: 3991 diff changeset	512
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	513 if (m_istate == 4)
fc509c3c445a maint: use "m_" prefix for member variables in base-de.h and base-dae.h Rik <rik@octave.org> parents: 30046 diff changeset	514 t_out = m_t;
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	515
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	516 if (save_output)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	517 {
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	518 for (F77_INT i = 0; i < n; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	519 {
30394 f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	520 x_out(i_out-1, i) = m_x(i);
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release. Rik <rik@octave.org> parents: 30067 diff changeset	521 xdot_out(i_out-1, i) = m_xdot(i);
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	522 }
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	523
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	524 t_outs(i_out-1) = t_out;
3994 a41827ec5677 [project @ 2002-07-16 23:57:09 by jwe] jwe parents: 3993 diff changeset	525
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	526 if (m_istate == 4)
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	527 {
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	528 x_out.resize (i_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	529 xdot_out.resize (i_out, n);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	530 t_outs.resize (i_out);
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	531 i_out = n_out;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	532 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	533 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	534
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	535 if (do_restart)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	536 force_restart ();
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	537 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	538
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	539 retval = DASRT_result (x_out, xdot_out, t_outs);
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	540 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	541 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	542 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	543 retval = integrate (tout);
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	544
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	545 if (m_integration_error)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	546 return retval;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	547 }
3990 46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	548 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	549
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	550 return retval;
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	551 }
46388d6a4e44 [project @ 2002-07-16 06:20:39 by jwe] jwe parents: diff changeset	552
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	553 std::string
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	554 DASRT::error_message () const
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	555 {
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	556 std::string retval;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	557
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	558 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	559 buf << m_t;
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5307 diff changeset	560 std::string t_curr = buf.str ();
4043 6fae69a1796e [project @ 2002-08-15 03:36:27 by jwe] jwe parents: 3998 diff changeset	561
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	562 switch (m_istate)
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	563 {
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	564 case 1:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	565 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	566 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	567
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	568 case 2:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	569 retval = "integration completed by stepping exactly to TOUT";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	570 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	571
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	572 case 3:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	573 retval = "integration to tout completed by stepping past TOUT";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	574 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	575
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	576 case 4:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	577 retval = "integration completed by finding one or more roots of G at T";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	578 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	579
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	580 case -1:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	581 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	582 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	583
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	584 case -2:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	585 retval = "the error tolerances are too stringent";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	586 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	587
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	588 case -3:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	589 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	590 "; 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	591 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	592
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	593 case -6:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	594 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	595 + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	596 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	597
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	598 case -7:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	599 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	600 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	601
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	602 case -8:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	603 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	604 ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	605 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	606
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	607 case -9:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	608 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	609 "; repeated test failures)";
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	610 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	611
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	612 case -10:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	613 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	614 + t_curr + ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	615 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	616
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	617 case -11:
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	618 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	619 ')';
3996 98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	620 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	621
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	622 case -12:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	623 retval = "failed to compute consistent initial conditions";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	624 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	625
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	626 case -33:
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	627 retval = "unrecoverable error (see printed message)";
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	628 break;
98107d72871c [project @ 2002-07-17 16:22:05 by jwe] jwe parents: 3995 diff changeset	629
3995 ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	630 default:
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	631 retval = "unknown error state";
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	632 break;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	633 }
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	634
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	635 return retval;
ee0304212be0 [project @ 2002-07-17 04:32:42 by jwe] jwe parents: 3994 diff changeset	636 }

Mercurial > octave

annotate liboctave/numeric/DASRT.cc @ 31771:21f9b34eb893