Mercurial > forge
changeset 9386:982dcd268ac4 octave-forge
Somebody crahes odepkg/inst - old files have been checked in. I reverted the files of this directory to my local copy: revision 8337.
line wrap: on
line diff
--- a/main/odepkg/inst/bvp4c.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/bvp4c.m Sun Jan 29 11:42:54 2012 +0000 @@ -115,7 +115,7 @@ u_0 = []; for nn=1:Nvar - u_0(nn,:) = interp1(t_old, u(nn,:), t); + u_0(nn,:) = interp1(t_old, u(nn,:), t); end Nvar = rows(u_0); Nint = length(t)-1 @@ -147,12 +147,12 @@ persistent A = [0 0 0; 5/24 1/3 -1/24; - 1/6 2/3 1/6]; + 1/6 2/3 1/6]; for jj = 1:s for kk = 1:Nint Y = repmat(u(:,kk),1,s) + ... - (reshape(Kin(:,kk,:),Nvar,s) * A.') * h(kk); + (reshape(Kin(:,kk,:),Nvar,s) * A.') * h(kk); diff_K(:,kk,jj) = Kin(:,kk,jj) - f (t(kk)+C(jj)*h(kk), Y); endfor endfor @@ -175,23 +175,23 @@ function x = __bvp4c_solve__ (t, x, h, odefun, bcfun, Nvar, Nint, s) fun = @( x ) ( [__bvp4c_fun_u__(t, - reshape(x(1:Nvar*(Nint+1)),Nvar,(Nint+1)), - reshape(x([1:Nvar*Nint*s]+Nvar*(Nint+1)),Nvar,Nint,s), - h, - s, - Nint, - Nvar)(:) ; - __bvp4c_fun_K__(t, - reshape(x(1:Nvar*(Nint+1)),Nvar,(Nint+1)), - reshape(x([1:Nvar*Nint*s]+Nvar*(Nint+1)),Nvar,Nint,s), - odefun, - h, - s, - Nint, - Nvar)(:); - bcfun(reshape(x(1:Nvar*(Nint+1)),Nvar,Nint+1)(:,1), - reshape(x(1:Nvar*(Nint+1)),Nvar,Nint+1)(:,end)); - ] ); + reshape(x(1:Nvar*(Nint+1)),Nvar,(Nint+1)), + reshape(x([1:Nvar*Nint*s]+Nvar*(Nint+1)),Nvar,Nint,s), + h, + s, + Nint, + Nvar)(:) ; + __bvp4c_fun_K__(t, + reshape(x(1:Nvar*(Nint+1)),Nvar,(Nint+1)), + reshape(x([1:Nvar*Nint*s]+Nvar*(Nint+1)),Nvar,Nint,s), + odefun, + h, + s, + Nint, + Nvar)(:); + bcfun(reshape(x(1:Nvar*(Nint+1)),Nvar,Nint+1)(:,1), + reshape(x(1:Nvar*(Nint+1)),Nvar,Nint+1)(:,end)); + ] ); x = fsolve ( fun, x ); endfunction
--- a/main/odepkg/inst/ode23.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode23.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,34 +19,13 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode23 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode23 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff ordinary differential -%# equations (non--stiff ODEs) or non--stiff differential algebraic equations -%# (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (2,3). +%# This function file can be used to solve a set of non--stiff ordinary differential equations (non--stiff ODEs) or non--stiff differential algebraic equations (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (2,3). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of ODEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{opt} -%# can optionally be a structure array that keeps the options created with the -%# command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally -%# be other input arguments of any type that have to be passed to the function -%# defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of ODEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of ODEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of ODEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example, solve an anonymous implementation of the Van der Pol equation %# @@ -394,12 +373,12 @@ if (all (vdelta <= vtau)) vtimestamp = vtimestamp + vstepsize; vu = y3.'; %# MC2001: the higher order estimation as "local extrapolation" - %# Save the solution every vodeoptions.OutputSave steps - if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) + %# Save the solution every vodeoptions.OutputSave steps + if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - vcntsave = vcntsave + 1; - end + vcntsave = vcntsave + 1; + end vcntloop = vcntloop + 1; vcntiter = 0; %# Call plot only if a valid result has been found, therefore this @@ -417,12 +396,12 @@ end if (vhaveoutputselection) vapproxvals = vapproxvals(vodeoptions.OutputSel); - end + end vpltret = feval (vodeoptions.OutputFcn, vapproxtime, ... - vapproxvals, [], vfunarguments{:}); + vapproxvals, [], vfunarguments{:}); if vpltret %# Leave refinement loop break; - end + end end if (vpltret) %# Leave main loop vunhandledtermination = false;
--- a/main/odepkg/inst/ode23d.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode23d.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,42 +19,20 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode23d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode23d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff delay differential -%# equations (non--stiff DDEs) with a modified version of the well known explicit -%# Runge--Kutta method of order (2,3). +%# This function file can be used to solve a set of non--stiff delay differential equations (non--stiff DDEs) with a modified version of the well known explicit Runge--Kutta method of order (2,3). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of DDEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{lags} -%# is a double vector that describes the lags of time, @var{hist} is a double -%# matrix and describes the history of the DDEs, @var{opt} can optionally be a -%# structure array that keeps the options created with the command @command{odeset} -%# and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments -%# of any type that have to be passed to the function defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of DDEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{lags} is a double vector that describes the lags of time, @var{hist} is a double matrix and describes the history of the DDEs, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# %# In other words, this function will solve a problem of the form %# @example %# dy/dt = fun (t, y(t), y(t-lags(1), y(t-lags(2), @dots{}))) %# y(slot(1)) = init -%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} +%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} %# @end example %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of DDEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} -%# all of type double column vector that keep the informations of the event -%# function if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of DDEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example: %# @itemize @minus @@ -146,7 +124,7 @@ end else %# if (nargin == 5) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -159,7 +137,7 @@ %# Check if the user has given fixed points of time if (length (vslot) > 2), vstepsizegiven = true; %# Step size checking - else vstepsizegiven = false; end + else vstepsizegiven = false; end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -292,7 +270,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -321,7 +299,7 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode23d + %# Starting the initialisation of the core solver ode23d vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value @@ -470,7 +448,7 @@ end vcntloop = vcntloop + 1; vcntiter = 0; - %# Update DDE values for next history calculation + %# Update DDE values for next history calculation vsaveddetime(end+1) = vtimestamp; vsaveddeinput(end+1,:) = vtheinput'; vsavedderesult(end+1,:) = vu; @@ -513,7 +491,7 @@ %# Update the step size for the next integration step if (~vstepsizegiven) %# vdelta may be 0 or even negative - could be an iteration problem - vdelta = max (vdelta, eps); + vdelta = max (vdelta, eps); vstepsize = min (vodeoptions.MaxStep, ... min (0.8 * vstepsize * (vtau ./ vdelta) .^ vpow)); elseif (vstepsizegiven) @@ -590,7 +568,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode23d'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -613,7 +591,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode45.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode45.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,35 +19,13 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode45 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode45 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff ordinary -%# differential equations (non--stiff ODEs) or non--stiff differential algebraic -%# equations (non--stiff DAEs) with the well known explicit Runge--Kutta method -%# of order (4,5). +%# This function file can be used to solve a set of non--stiff ordinary differential equations (non--stiff ODEs) or non--stiff differential algebraic equations (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (4,5). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of ODEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{opt} -%# can optionally be a structure array that keeps the options created with the -%# command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally -%# be other input arguments of any type that have to be passed to the function -%# defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of ODEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of ODEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of ODEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example, solve an anonymous implementation of the Van der Pol equation %# @@ -111,7 +89,7 @@ end else %# if (nargin == 3) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -123,7 +101,7 @@ vstepsizefixed = true; else vstepsizefixed = false; - end + end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -255,7 +233,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -284,12 +262,12 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode45 + %# Starting the initialisation of the core solver ode45 vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value %# 20110611, reported by Nils Strunk - %# Make it possible to solve equations from negativ to zero, + %# Make it possible to solve equations from negativ to zero, %# eg. vres = ode45 (@(t,y) y, [-2 0], 2); vdirection = sign (vtimestop - vtimestamp); %# Direction flag @@ -311,7 +289,7 @@ %# Initialize the OutputFcn if (vhaveoutputfunction) if (vhaveoutputselection) vretout = vretvalresult(vodeoptions.OutputSel); - else vretout = vretvalresult; end + else vretout = vretvalresult; end feval (vodeoptions.OutputFcn, vslot.', ... vretout.', 'init', vfunarguments{:}); end @@ -345,7 +323,7 @@ %# vstepsize = vtimestop - vdirection * vtimestamp; %# 20110611, reported by Nils Strunk %# The endpoint of the time slot must be hit exactly, - %# eg. vsol = ode45 (@(t,y) y, [0 -1], 1); + %# eg. vsol = ode45 (@(t,y) y, [0 -1], 1); vstepsize = vdirection * abs (abs (vtimestop) - abs (vtimestamp)); end @@ -377,7 +355,7 @@ y4(vodeoptions.NonNegative) = abs (y4(vodeoptions.NonNegative)); y5(vodeoptions.NonNegative) = abs (y5(vodeoptions.NonNegative)); end - if (vhaveoutputfunction && vhaverefine) + if (vhaveoutputfunction && vhaverefine) vSaveVUForRefine = vu; end @@ -399,12 +377,12 @@ if (all (vdelta <= vtau)) vtimestamp = vtimestamp + vstepsize; vu = y5.'; %# MC2001: the higher order estimation as "local extrapolation" - %# Save the solution every vodeoptions.OutputSave steps - if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) + %# Save the solution every vodeoptions.OutputSave steps + if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - vcntsave = vcntsave + 1; - end + vcntsave = vcntsave + 1; + end vcntloop = vcntloop + 1; vcntiter = 0; %# Call plot only if a valid result has been found, therefore this @@ -422,12 +400,12 @@ end if (vhaveoutputselection) vapproxvals = vapproxvals(vodeoptions.OutputSel); - end + end vpltret = feval (vodeoptions.OutputFcn, vapproxtime, ... - vapproxvals, [], vfunarguments{:}); + vapproxvals, [], vfunarguments{:}); if vpltret %# Leave refinement loop break; - end + end end if (vpltret) %# Leave main loop vunhandledtermination = false; @@ -454,7 +432,7 @@ if (~vstepsizefixed) %# 20080425, reported by Marco Caliari %# vdelta cannot be negative (because of the absolute value that - %# has been introduced) but it could be 0, then replace the zeros + %# has been introduced) but it could be 0, then replace the zeros %# with the maximum value of vdelta vdelta(find (vdelta == 0)) = max (vdelta); %# It could happen that max (vdelta) == 0 (ie. that the original @@ -527,7 +505,7 @@ if (mod (vcntloop-2,vodeoptions.OutputSave) ~= 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - end + end %# Print additional information if option Stats is set if (strcmp (vodeoptions.Stats, 'on')) @@ -552,7 +530,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode45'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -575,7 +553,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode45d.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode45d.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,42 +19,20 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode45d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode45d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff delay differential -%# equations (non--stiff DDEs) with a modified version of the well known explicit -%# Runge--Kutta method of order (4,5). +%# This function file can be used to solve a set of non--stiff delay differential equations (non--stiff DDEs) with a modified version of the well known explicit Runge--Kutta method of order (4,5). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of DDEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{lags} -%# is a double vector that describes the lags of time, @var{hist} is a double -%# matrix and describes the history of the DDEs, @var{opt} can optionally be a -%# structure array that keeps the options created with the command @command{odeset} -%# and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments -%# of any type that have to be passed to the function defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of DDEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{lags} is a double vector that describes the lags of time, @var{hist} is a double matrix and describes the history of the DDEs, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# %# In other words, this function will solve a problem of the form %# @example %# dy/dt = fun (t, y(t), y(t-lags(1), y(t-lags(2), @dots{}))) %# y(slot(1)) = init -%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} +%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} %# @end example %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of DDEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of DDEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example: %# @itemize @minus @@ -146,7 +124,7 @@ end else %# if (nargin == 5) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -159,7 +137,7 @@ %# Check if the user has given fixed points of time if (length (vslot) > 2), vstepsizegiven = true; %# Step size checking - else vstepsizegiven = false; end + else vstepsizegiven = false; end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -292,7 +270,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -321,7 +299,7 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode45d + %# Starting the initialisation of the core solver ode45d vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value @@ -474,7 +452,7 @@ end vcntloop = vcntloop + 1; vcntiter = 0; - %# Update DDE values for next history calculation + %# Update DDE values for next history calculation vsaveddetime(end+1) = vtimestamp; vsaveddeinput(end+1,:) = vtheinput'; vsavedderesult(end+1,:) = vu; @@ -517,7 +495,7 @@ %# Update the step size for the next integration step if (~vstepsizegiven) %# vdelta may be 0 or even negative - could be an iteration problem - vdelta = max (vdelta, eps); + vdelta = max (vdelta, eps); vstepsize = min (vodeoptions.MaxStep, ... min (0.8 * vstepsize * (vtau ./ vdelta) .^ vpow)); elseif (vstepsizegiven) @@ -594,7 +572,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode45d'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -617,7 +595,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode54.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode54.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,34 +19,13 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode54 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode54 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff ordinary differential -%# equations (non--stiff ODEs) or non--stiff differential algebraic equations -%# (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (5,4). +%# This function file can be used to solve a set of non--stiff ordinary differential equations (non--stiff ODEs) or non--stiff differential algebraic equations (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (5,4). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of ODEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{opt} -%# can optionally be a structure array that keeps the options created with the -%# command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally -%# be other input arguments of any type that have to be passed to the function -%# defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of ODEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of ODEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of ODEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example, solve an anonymous implementation of the Van der Pol equation %# @@ -111,7 +90,7 @@ end else %# if (nargin == 3) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -123,7 +102,7 @@ vstepsizefixed = true; else vstepsizefixed = false; - end + end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -255,7 +234,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -284,12 +263,12 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode54 + %# Starting the initialisation of the core solver ode54 vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value %# 20110611, reported by Nils Strunk - %# Make it possible to solve equations from negativ to zero, + %# Make it possible to solve equations from negativ to zero, %# eg. vres = ode54 (@(t,y) y, [-2 0], 2); vdirection = sign (vtimestop - vtimestamp); %# Direction flag @@ -311,7 +290,7 @@ %# Initialize the OutputFcn if (vhaveoutputfunction) if (vhaveoutputselection) vretout = vretvalresult(vodeoptions.OutputSel); - else vretout = vretvalresult; end + else vretout = vretvalresult; end feval (vodeoptions.OutputFcn, vslot.', ... vretout.', 'init', vfunarguments{:}); end @@ -364,7 +343,7 @@ %# vstepsize = vtimestop - vdirection * vtimestamp; %# 20110611, reported by Nils Strunk %# The endpoint of the time slot must be hit exactly, - %# eg. vsol = ode54 (@(t,y) y, [0 -1], 1); + %# eg. vsol = ode54 (@(t,y) y, [0 -1], 1); vstepsize = vdirection * abs (abs (vtimestop) - abs (vtimestamp)); end @@ -391,9 +370,9 @@ end %# Compute the 4th and the 5th order estimation - y4 = vu.' + vstepsize * (vk * vb4); + y4 = vu.' + vstepsize * (vk * vb4); y5 = vtheinput; - %# y5 = vu.' + vstepsize * (vk * vb5); vb5 is the same as va(6,:), + %# y5 = vu.' + vstepsize * (vk * vb5); vb5 is the same as va(6,:), %# means that we already know y5 from the first six vk's (FSAL) if (vhavenonnegative) @@ -401,7 +380,7 @@ y4(vodeoptions.NonNegative) = abs (y4(vodeoptions.NonNegative)); y5(vodeoptions.NonNegative) = abs (y5(vodeoptions.NonNegative)); end - if (vhaveoutputfunction && vhaverefine) + if (vhaveoutputfunction && vhaverefine) vSaveVUForRefine = vu; end @@ -423,8 +402,8 @@ if (all (vdelta <= vtau)) vtimestamp = vtimestamp + vstepsize; vu = y5.'; %# MC2001: the higher order estimation as "local extrapolation" - %# Save the solution every vodeoptions.OutputSave steps - if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) + %# Save the solution every vodeoptions.OutputSave steps + if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) if (vhaveoutputselection) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu(vodeoptions.OutputSel); @@ -432,8 +411,8 @@ vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; end - vcntsave = vcntsave + 1; - end + vcntsave = vcntsave + 1; + end vcntloop = vcntloop + 1; vcntiter = 0; %# Call plot only if a valid result has been found, therefore this @@ -451,12 +430,12 @@ end if (vhaveoutputselection) vapproxvals = vapproxvals(vodeoptions.OutputSel); - end + end vpltret = feval (vodeoptions.OutputFcn, vapproxtime, ... - vapproxvals, [], vfunarguments{:}); + vapproxvals, [], vfunarguments{:}); if vpltret %# Leave refinement loop break; - end + end end if (vpltret) %# Leave main loop vunhandledtermination = false; @@ -478,7 +457,7 @@ end end else - vk(:,7) = vk(:,1); + vk(:,7) = vk(:,1); %# If we're here, then we've overwritten the k7 that we %# need to copy to k1 to redo the step Since we copy k7 %# into k1, we'll put the k1 back in k7 for now, until it's @@ -489,7 +468,7 @@ if (~vstepsizefixed) %# 20080425, reported by Marco Caliari %# vdelta cannot be negative (because of the absolute value that - %# has been introduced) but it could be 0, then replace the zeros + %# has been introduced) but it could be 0, then replace the zeros %# with the maximum value of vdelta vdelta(find (vdelta == 0)) = max (vdelta); %# It could happen that max (vdelta) == 0 (ie. that the original @@ -562,7 +541,7 @@ if (mod (vcntloop-2,vodeoptions.OutputSave) ~= 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - end + end %# Print additional information if option Stats is set if (strcmp (vodeoptions.Stats, 'on')) @@ -587,7 +566,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode54'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -610,7 +589,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode54d.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode54d.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,42 +19,20 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode54d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode54d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff delay differential -%# equations (non--stiff DDEs) with a modified version of the well known explicit -%# Runge--Kutta method of order (2,3). +%# This function file can be used to solve a set of non--stiff delay differential equations (non--stiff DDEs) with a modified version of the well known explicit Runge--Kutta method of order (2,3). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of DDEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{lags} -%# is a double vector that describes the lags of time, @var{hist} is a double -%# matrix and describes the history of the DDEs, @var{opt} can optionally be a -%# structure array that keeps the options created with the command @command{odeset} -%# and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments -%# of any type that have to be passed to the function defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of DDEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{lags} is a double vector that describes the lags of time, @var{hist} is a double matrix and describes the history of the DDEs, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# %# In other words, this function will solve a problem of the form %# @example %# dy/dt = fun (t, y(t), y(t-lags(1), y(t-lags(2), @dots{}))) %# y(slot(1)) = init -%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} +%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} %# @end example %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of DDEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} -%# all of type double column vector that keep the informations of the event -%# function if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of DDEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example: %# @itemize @minus @@ -146,7 +124,7 @@ end else %# if (nargin == 5) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -159,7 +137,7 @@ %# Check if the user has given fixed points of time if (length (vslot) > 2), vstepsizegiven = true; %# Step size checking - else vstepsizegiven = false; end + else vstepsizegiven = false; end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -292,7 +270,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -321,7 +299,7 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode54d + %# Starting the initialisation of the core solver ode54d vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value @@ -475,7 +453,7 @@ end vcntloop = vcntloop + 1; vcntiter = 0; - %# Update DDE values for next history calculation + %# Update DDE values for next history calculation vsaveddetime(end+1) = vtimestamp; vsaveddeinput(end+1,:) = vtheinput'; vsavedderesult(end+1,:) = vu; @@ -518,7 +496,7 @@ %# Update the step size for the next integration step if (~vstepsizegiven) %# vdelta may be 0 or even negative - could be an iteration problem - vdelta = max (vdelta, eps); + vdelta = max (vdelta, eps); vstepsize = min (vodeoptions.MaxStep, ... min (0.8 * vstepsize * (vtau ./ vdelta) .^ vpow)); elseif (vstepsizegiven) @@ -595,7 +573,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode54d'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -618,7 +596,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode78.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode78.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,34 +19,13 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode78 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode78 (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff ordinary differential -%# equations (non--stiff ODEs) or non--stiff differential algebraic equations -%# (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (7,8). +%# This function file can be used to solve a set of non--stiff ordinary differential equations (non--stiff ODEs) or non--stiff differential algebraic equations (non--stiff DAEs) with the well known explicit Runge--Kutta method of order (7,8). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of ODEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{opt} -%# can optionally be a structure array that keeps the options created with the -%# command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally -%# be other input arguments of any type that have to be passed to the function -%# defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of ODEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of ODEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of ODEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example, solve an anonymous implementation of the Van der Pol equation %# @@ -111,7 +90,7 @@ end else %# if (nargin == 3) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -123,7 +102,7 @@ vstepsizefixed = true; else vstepsizefixed = false; - end + end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -255,7 +234,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -284,12 +263,12 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode78 + %# Starting the initialisation of the core solver ode78 vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value %# 20110611, reported by Nils Strunk - %# Make it possible to solve equations from negativ to zero, + %# Make it possible to solve equations from negativ to zero, %# eg. vres = ode78 (@(t,y) y, [-2 0], 2); vdirection = sign (vtimestop - vtimestamp); %# Direction flag @@ -311,7 +290,7 @@ %# Initialize the OutputFcn if (vhaveoutputfunction) if (vhaveoutputselection) vretout = vretvalresult(vodeoptions.OutputSel); - else vretout = vretvalresult; end + else vretout = vretvalresult; end feval (vodeoptions.OutputFcn, vslot.', ... vretout.', 'init', vfunarguments{:}); end @@ -366,7 +345,7 @@ %# vstepsize = vtimestop - vdirection * vtimestamp; %# 20110611, reported by Nils Strunk %# The endpoint of the time slot must be hit exactly, - %# eg. vsol = ode78 (@(t,y) y, [0 -1], 1); + %# eg. vsol = ode78 (@(t,y) y, [0 -1], 1); vstepsize = vdirection * abs (abs (vtimestop) - abs (vtimestamp)); end @@ -398,7 +377,7 @@ y7(vodeoptions.NonNegative) = abs (y7(vodeoptions.NonNegative)); y8(vodeoptions.NonNegative) = abs (y8(vodeoptions.NonNegative)); end - if (vhaveoutputfunction && vhaverefine) + if (vhaveoutputfunction && vhaverefine) vSaveVUForRefine = vu; end @@ -420,12 +399,12 @@ if (all (vdelta <= vtau)) vtimestamp = vtimestamp + vstepsize; vu = y8.'; %# MC2001: the higher order estimation as "local extrapolation" - %# Save the solution every vodeoptions.OutputSave steps - if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) + %# Save the solution every vodeoptions.OutputSave steps + if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - vcntsave = vcntsave + 1; - end + vcntsave = vcntsave + 1; + end vcntloop = vcntloop + 1; vcntiter = 0; %# Call plot only if a valid result has been found, therefore this @@ -443,12 +422,12 @@ end if (vhaveoutputselection) vapproxvals = vapproxvals(vodeoptions.OutputSel); - end + end vpltret = feval (vodeoptions.OutputFcn, vapproxtime, ... - vapproxvals, [], vfunarguments{:}); + vapproxvals, [], vfunarguments{:}); if vpltret %# Leave refinement loop break; - end + end end if (vpltret) %# Leave main loop vunhandledtermination = false; @@ -475,7 +454,7 @@ if (~vstepsizefixed) %# 20080425, reported by Marco Caliari %# vdelta cannot be negative (because of the absolute value that - %# has been introduced) but it could be 0, then replace the zeros + %# has been introduced) but it could be 0, then replace the zeros %# with the maximum value of vdelta vdelta(find (vdelta == 0)) = max (vdelta); %# It could happen that max (vdelta) == 0 (ie. that the original @@ -548,7 +527,7 @@ if (mod (vcntloop-2,vodeoptions.OutputSave) ~= 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - end + end %# Print additional information if option Stats is set if (strcmp (vodeoptions.Stats, 'on')) @@ -573,7 +552,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode78'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -596,7 +575,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/ode78d.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/ode78d.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -19,42 +19,20 @@ %# @deftypefnx {Command} {[@var{sol}] =} ode78d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} ode78d (@var{@@fun}, @var{slot}, @var{init}, @var{lags}, @var{hist}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of non--stiff delay differential -%# equations (non--stiff DDEs) with a modified version of the well known explicit -%# Runge--Kutta method of order (7,8). +%# This function file can be used to solve a set of non--stiff delay differential equations (non--stiff DDEs) with a modified version of the well known explicit Runge--Kutta method of order (7,8). %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of DDEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{lags} -%# is a double vector that describes the lags of time, @var{hist} is a double -%# matrix and describes the history of the DDEs, @var{opt} can optionally be a -%# structure array that keeps the options created with the command @command{odeset} -%# and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments -%# of any type that have to be passed to the function defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of DDEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{lags} is a double vector that describes the lags of time, @var{hist} is a double matrix and describes the history of the DDEs, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# %# In other words, this function will solve a problem of the form %# @example %# dy/dt = fun (t, y(t), y(t-lags(1), y(t-lags(2), @dots{}))) %# y(slot(1)) = init -%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} +%# y(slot(1)-lags(1)) = hist(1), y(slot(1)-lags(2)) = hist(2), @dots{} %# @end example %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of DDEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} all -%# of type double column vector that keep the informations of the event function -%# if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of DDEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example: %# @itemize @minus @@ -146,7 +124,7 @@ end else %# if (nargin == 5) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -159,7 +137,7 @@ %# Check if the user has given fixed points of time if (length (vslot) > 2), vstepsizegiven = true; %# Step size checking - else vstepsizegiven = false; end + else vstepsizegiven = false; end %# Get the default options that can be set with 'odeset' temporarily vodetemp = odeset; @@ -292,7 +270,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -321,7 +299,7 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver ode78d + %# Starting the initialisation of the core solver ode78d vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value @@ -495,7 +473,7 @@ end vcntloop = vcntloop + 1; vcntiter = 0; - %# Update DDE values for next history calculation + %# Update DDE values for next history calculation vsaveddetime(end+1) = vtimestamp; vsaveddeinput(end+1,:) = vtheinput'; vsavedderesult(end+1,:) = vu; @@ -538,7 +516,7 @@ %# Update the step size for the next integration step if (~vstepsizegiven) %# vdelta may be 0 or even negative - could be an iteration problem - vdelta = max (vdelta, eps); + vdelta = max (vdelta, eps); vstepsize = min (vodeoptions.MaxStep, ... min (0.8 * vstepsize * (vtau ./ vdelta) .^ vpow)); elseif (vstepsizegiven) @@ -615,7 +593,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'ode78d'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -638,7 +616,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured
--- a/main/odepkg/inst/odebwe.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odebwe.m Sun Jan 29 11:42:54 2012 +0000 @@ -19,34 +19,13 @@ %# @deftypefnx {Command} {[@var{sol}] =} odebwe (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# @deftypefnx {Command} {[@var{t}, @var{y}, [@var{xe}, @var{ye}, @var{ie}]] =} odebwe (@var{@@fun}, @var{slot}, @var{init}, [@var{opt}], [@var{par1}, @var{par2}, @dots{}]) %# -%# This function file can be used to solve a set of stiff ordinary differential -%# equations (stiff ODEs) or stiff differential algebraic equations (stiff DAEs) -%# with the Backward Euler method. +%# This function file can be used to solve a set of stiff ordinary differential equations (stiff ODEs) or stiff differential algebraic equations (stiff DAEs) with the Backward Euler method. %# -%# If this function is called with no return argument then plot the solution over -%# time in a figure window while solving the set of ODEs that are defined in a -%# function and specified by the function handle @var{@@fun}. The second input -%# argument @var{slot} is a double vector that defines the time slot, @var{init} -%# is a double vector that defines the initial values of the states, @var{opt} -%# can optionally be a structure array that keeps the options created with the -%# command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally -%# be other input arguments of any type that have to be passed to the function -%# defined by @var{@@fun}. +%# If this function is called with no return argument then plot the solution over time in a figure window while solving the set of ODEs that are defined in a function and specified by the function handle @var{@@fun}. The second input argument @var{slot} is a double vector that defines the time slot, @var{init} is a double vector that defines the initial values of the states, @var{opt} can optionally be a structure array that keeps the options created with the command @command{odeset} and @var{par1}, @var{par2}, @dots{} can optionally be other input arguments of any type that have to be passed to the function defined by @var{@@fun}. %# -%# If this function is called with one return argument then return the solution -%# @var{sol} of type structure array after solving the set of ODEs. The solution -%# @var{sol} has the fields @var{x} of type double column vector for the steps -%# chosen by the solver, @var{y} of type double column vector for the solutions -%# at each time step of @var{x}, @var{solver} of type string for the solver name -%# and optionally the extended time stamp information @var{xe}, the extended -%# solution information @var{ye} and the extended index information @var{ie} -%# all of type double column vector that keep the informations of the event -%# function if an event function handle is set in the option argument @var{opt}. +%# If this function is called with one return argument then return the solution @var{sol} of type structure array after solving the set of ODEs. The solution @var{sol} has the fields @var{x} of type double column vector for the steps chosen by the solver, @var{y} of type double column vector for the solutions at each time step of @var{x}, @var{solver} of type string for the solver name and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector that keep the informations of the event function if an event function handle is set in the option argument @var{opt}. %# -%# If this function is called with more than one return argument then return the -%# time stamps @var{t}, the solution values @var{y} and optionally the extended -%# time stamp information @var{xe}, the extended solution information @var{ye} -%# and the extended index information @var{ie} all of type double column vector. +%# If this function is called with more than one return argument then return the time stamps @var{t}, the solution values @var{y} and optionally the extended time stamp information @var{xe}, the extended solution information @var{ye} and the extended index information @var{ie} all of type double column vector. %# %# For example, solve an anonymous implementation of the Van der Pol equation %# @@ -103,7 +82,7 @@ end else %# if (nargin == 3) - vodeoptions = odeset; + vodeoptions = odeset; vfunarguments = {}; end @@ -115,7 +94,7 @@ vstepsizefixed = true; else vstepsizefixed = false; - end + end %# The adaptive method require a second estimate for %# the comparsion, while the fixed step size algorithm @@ -224,7 +203,7 @@ elseif (isa (vodeoptions.Jacobian, 'function_handle')) vhavejachandle = true; %# jac defined by a function handle else %# no Jacobian - we will use numerical differentiation - vhavejachandle = false; + vhavejachandle = false; end %# Implementation of the option Mass has been finished. This option @@ -239,7 +218,7 @@ %# Implementation of the option MStateDependence has been finished. %# This option can be set by the user to another value than default - %# value. + %# value. if (strcmp (vodeoptions.MStateDependence, 'none')) vmassdependence = false; else vmassdependence = true; @@ -254,7 +233,7 @@ if (~isequal (vodeoptions.Refine, vodetemp.Refine)) warning ('OdePkg:InvalidArgument', ... 'Option "Refine" will be ignored by this solver'); - end + end if (~isequal (vodeoptions.JPattern, vodetemp.JPattern)) warning ('OdePkg:InvalidArgument', ... 'Option "JPattern" will be ignored by this solver'); @@ -284,7 +263,7 @@ 'Option "BDF" will be ignored by this solver'); end - %# Starting the initialisation of the core solver odebwe + %# Starting the initialisation of the core solver odebwe vtimestamp = vslot(1,1); %# timestamp = start time vtimelength = length (vslot); %# length needed if fixed steps vtimestop = vslot(1,vtimelength); %# stop time = last value @@ -307,7 +286,7 @@ vretout = vretvalresult(vodeoptions.OutputSel); else vretout = vretvalresult; - end + end feval (vodeoptions.OutputFcn, vslot.', ... vretout.', 'init', vfunarguments{:}); end @@ -319,9 +298,9 @@ end %# Initialize parameters and counters - vcntloop = 2; vcntcycles = 1; vu = vinit; vcntsave = 2; - vunhandledtermination = true; vpow = 1/2; vnpds = 0; - vcntiter = 0; vcntnewt = 0; vndecomps = 0; vnlinsols = 0; + vcntloop = 2; vcntcycles = 1; vu = vinit; vcntsave = 2; + vunhandledtermination = true; vpow = 1/2; vnpds = 0; + vcntiter = 0; vcntnewt = 0; vndecomps = 0; vnlinsols = 0; %# the following option enables the simplified Newton method %# which evaluates the Jacobian only once instead of the @@ -337,9 +316,9 @@ vstepsize = vtimestop - vdirection * vtimestamp; end - %# Run the time integration for each estimator + %# Run the time integration for each estimator %# from vtimestamp -> vtimestamp+vstepsize - for j = 1:vestimators + for j = 1:vestimators %# Initial value (result of the previous timestep) y0 = vu; %# Initial guess for Newton-Raphson @@ -348,7 +327,7 @@ %# comparsion, but two steps by the Backward Euler %# method for i=1:j - % Initialize the time stepping parameters + % Initialize the time stepping parameters vthestep = vstepsize/j; vthetime = vtimestamp + i*vthestep; vnewtit = 1; @@ -362,7 +341,7 @@ %# that is the matrix pencil of the mass matrix and %# the right-hand-side's Jacobian. Perform a (sparse) %# LU-Decomposition afterwards. - if (vnewtit<=1) || (~vsimplified) + if (vnewtit<=1) | (~vsimplified) %# Get the mass matrix from the left-hand-side if (vhavemasshandle) %# Handle only the dynamic mass matrix, if (vmassdependence) %# constant mass matrices have already @@ -380,12 +359,12 @@ elseif isempty(vodeoptions.Jacobian) %# If no Jacobian is given vjac = feval(@jacobian, vfun, vthetime,y(j,:)',... vfunarguments); %# then we differentiate - end + end vnpds = vnpds + 1; vfulljac = vmass/vthestep - vjac; - %# one could do a matrix decomposition of vfulljac here, + %# one could do a matrix decomposition of vfulljac here, %# but the choice of decomposition depends on the problem - %# and therefore we use the backslash-operator in row 374 + %# and therefore we use the backslash-operator in row 374 end %# Compute the residual @@ -393,8 +372,8 @@ vresnrm(vnewtit+1) = norm(vres,inf); %# Solve the linear system y(j,:) = vfulljac\(-vres+vfulljac*y(j,:)'); - %# the backslash operator decomposes the matrix - %# and solves the system in a single step. + %# the backslash operator decomposes the matrix + %# and solves the system in a single step. vndecomps = vndecomps + 1; vnlinsols = vnlinsols + 1; %# Prepare next iteration @@ -408,7 +387,7 @@ %# Save intermediate solution as initial value %# for the next intermediate step y0 = y(j,:); - %# Count all Newton iterations + %# Count all Newton iterations vcntnewt = vcntnewt + (vnewtit-1); end %# for steps @@ -430,8 +409,8 @@ y3 = y2 + (y2-y1); end - %# If Newton did not converge, repeat step with reduced - %# step size, otherwise calculate the absolute local + %# If Newton did not converge, repeat step with reduced + %# step size, otherwise calculate the absolute local %# truncation error and the acceptable error if vresnrm(vnewtit)>vodeoptions.NewtonTol vdelta = 2; vtau = 1; @@ -453,12 +432,12 @@ vtimestamp = vtimestamp + vstepsize; vu = y2; % or y3 if we want the extrapolation.... - %# Save the solution every vodeoptions.OutputSave steps - if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) + %# Save the solution every vodeoptions.OutputSave steps + if (mod (vcntloop-1,vodeoptions.OutputSave) == 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - vcntsave = vcntsave + 1; - end + vcntsave = vcntsave + 1; + end vcntloop = vcntloop + 1; vcntiter = 0; %# Call plot only if a valid result has been found, therefore this @@ -469,12 +448,12 @@ vpltout = vu(vodeoptions.OutputSel); else vpltout = vu; - end + end vpltret = feval (vodeoptions.OutputFcn, vtimestamp, ... - vpltout.', [], vfunarguments{:}); + vpltout.', [], vfunarguments{:}); if vpltret %# Leave loop vunhandledtermination = false; break; - end + end end %# Call event only if a valid result has been found, therefore this @@ -496,7 +475,7 @@ if (~vstepsizefixed) %# 20080425, reported by Marco Caliari %# vdelta cannot be negative (because of the absolute value that - %# has been introduced) but it could be 0, then replace the zeros + %# has been introduced) but it could be 0, then replace the zeros %# with the maximum value of vdelta vdelta(find (vdelta == 0)) = max (vdelta); %# It could happen that max (vdelta) == 0 (ie. that the original @@ -572,7 +551,7 @@ if (mod (vcntloop-2,vodeoptions.OutputSave) ~= 0) vretvaltime(vcntsave,:) = vtimestamp; vretvalresult(vcntsave,:) = vu; - end + end %# Print additional information if option Stats is set if (strcmp (vodeoptions.Stats, 'on')) @@ -597,7 +576,7 @@ varargout{1}.x = vretvaltime; %# Time stamps are saved in field x varargout{1}.y = vretvalresult; %# Results are saved in field y varargout{1}.solver = 'odebwe'; %# Solver name is saved in field solver - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{1}.ie = vevent{2}; %# Index info which event occured varargout{1}.xe = vevent{3}; %# Time info when an event occured varargout{1}.ye = vevent{4}; %# Results when an event occured @@ -620,7 +599,7 @@ varargout{3} = []; %# LabMat doesn't accept lines like varargout{4} = []; %# varargout{3} = varargout{4} = []; varargout{5} = []; - if (vhaveeventfunction) + if (vhaveeventfunction) varargout{3} = vevent{3}; %# Time info when an event occured varargout{4} = vevent{4}; %# Results when an event occured varargout{5} = vevent{2}; %# Index info which event occured @@ -645,7 +624,7 @@ end vtheinput(j) = vbuffer + vh; df(:,j) = (feval(vfun,vthetime,vtheinput,... - vfunarguments{:}) - vfun0) / vh; + vfunarguments{:}) - vfun0) / vh; vtheinput(j) = vbuffer; end end
--- a/main/odepkg/inst/odeexamples.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odeexamples.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,8 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{}] =} odeexamples (@var{}) -%# Open the differential equations examples menu and allow the user to select a -%# submenu of ODE, DAE, IDE or DDE examples. +%# Open the differential equations examples menu and allow the user to select a submenu of ODE, DAE, IDE or DDE examples. %# @end deftypefn function [] = odeexamples (varargin)
--- a/main/odepkg/inst/odeget.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odeget.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -18,23 +18,9 @@ %# @deftypefn {Function File} {[@var{value}] =} odeget (@var{odestruct}, @var{option}, [@var{default}]) %# @deftypefnx {Command} {[@var{values}] =} odeget (@var{odestruct}, @{@var{opt1}, @var{opt2}, @dots{}@}, [@{@var{def1}, @var{def2}, @dots{}@}]) %# -%# If this function is called with two input arguments and the first input -%# argument @var{odestruct} is of type structure array and the second input -%# argument @var{option} is of type string then return the option value -%# @var{value} that is specified by the option name @var{option} in the OdePkg -%# option structure @var{odestruct}. Optionally if this function is called with -%# a third input argument then return the default value @var{default} if -%# @var{option} is not set in the structure @var{odestruct}. +%# If this function is called with two input arguments and the first input argument @var{odestruct} is of type structure array and the second input argument @var{option} is of type string then return the option value @var{value} that is specified by the option name @var{option} in the OdePkg option structure @var{odestruct}. Optionally if this function is called with a third input argument then return the default value @var{default} if @var{option} is not set in the structure @var{odestruct}. %# -%# If this function is called with two input arguments and the first input -%# argument @var{odestruct} is of type structure array and the second input -%# argument @var{option} is of type cell array of strings then return the option -%# values @var{values} that are specified by the option names @var{opt1}, -%# @var{opt2}, @dots{} in the OdePkg option structure @var{odestruct}. Optionally -%# if this function is called with a third input argument of type cell array then -%# return the default value @var{def1} if @var{opt1} is not set in the structure -%# @var{odestruct}, @var{def2} if @var{opt2} is not set in the structure -%# @var{odestruct}, @dots{} +%# If this function is called with two input arguments and the first input argument @var{odestruct} is of type structure array and the second input argument @var{option} is of type cell array of strings then return the option values @var{values} that are specified by the option names @var{opt1}, @var{opt2}, @dots{} in the OdePkg option structure @var{odestruct}. Optionally if this function is called with a third input argument of type cell array then return the default value @var{def1} if @var{opt1} is not set in the structure @var{odestruct}, @var{def2} if @var{opt2} is not set in the structure @var{odestruct}, @dots{} %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odephas2.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odephas2.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,34 +17,22 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{ret}] =} odephas2 (@var{t}, @var{y}, @var{flag}) %# -%# Open a new figure window and plot the first result from the variable @var{y} -%# that is of type double column vector over the second result from the variable -%# @var{y} while solving. The types and the values of the input parameter @var{t} -%# and the output parameter @var{ret} depend on the input value @var{flag} that -%# is of type string. If @var{flag} is +%# Open a new figure window and plot the first result from the variable @var{y} that is of type double column vector over the second result from the variable @var{y} while solving. The types and the values of the input parameter @var{t} and the output parameter @var{ret} depend on the input value @var{flag} that is of type string. If @var{flag} is %# @table @option %# @item @code{"init"} -%# then @var{t} must be a double column vector of length 2 with the first and the -%# last time step and nothing is returned from this function, +%# then @var{t} must be a double column vector of length 2 with the first and the last time step and nothing is returned from this function, %# @item @code{""} -%# then @var{t} must be a double scalar specifying the actual time step and the -%# return value is false (resp. value 0) for 'not stop solving', +%# then @var{t} must be a double scalar specifying the actual time step and the return value is false (resp. value 0) for 'not stop solving', %# @item @code{"done"} -%# then @var{t} must be a double scalar specifying the last time step and nothing -%# is returned from this function. +%# then @var{t} must be a double scalar specifying the last time step and nothing is returned from this function. %# @end table %# -%# This function is called by a OdePkg solver function if it was specified in an -%# OdePkg options structure with the @command{odeset}. This function is an OdePkg -%# internal helper function therefore it should never be necessary that this -%# function is called directly by a user. There is only little error detection -%# implemented in this function file to achieve the highest performance. +%# This function is called by a OdePkg solver function if it was specified in an OdePkg options structure with the @command{odeset}. This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# -%# For example, solve an anonymous implementation of the "Van der Pol" equation -%# and display the results while solving in a 2D plane +%# For example, solve an anonymous implementation of the "Van der Pol" equation and display the results while solving in a 2D plane %# @example %# fvdb = @@(vt,vy) [vy(2); (1 - vy(1)^2) * vy(2) - vy(1)]; -%# +%# %# vopt = odeset ('OutputFcn', @@odephas2, 'RelTol', 1e-6); %# vsol = ode45 (fvdb, [0 20], [2 0], vopt); %# @end example @@ -66,9 +54,9 @@ %# Return something in varargout{1}, either false for 'not stopping %# the integration' or true for 'stopping the integration' vcounter = vcounter + 1; figure (vfigure); - vyold(:,vcounter) = vy(:,1); + vyold(:,vcounter) = vy(:,1); plot (vyold(1,:), vyold(2,:), '-o', 'markersize', 1); - drawnow; varargout{1} = false; + drawnow; varargout{1} = false; elseif (strcmp (vflag, 'done')) %# Cleanup has to be done, clear the persistent variables because @@ -77,8 +65,6 @@ end -end - %# Local Variables: *** %# mode: octave *** %# End: ***
--- a/main/odepkg/inst/odephas3.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odephas3.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,31 +17,19 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{ret}] =} odephas3 (@var{t}, @var{y}, @var{flag}) %# -%# Open a new figure window and plot the first result from the variable @var{y} -%# that is of type double column vector over the second and the third result -%# from the variable @var{y} while solving. The types and the values of the -%# input parameter @var{t} and the output parameter @var{ret} depend on the -%# input value @var{flag} that is of type string. If @var{flag} is +%# Open a new figure window and plot the first result from the variable @var{y} that is of type double column vector over the second and the third result from the variable @var{y} while solving. The types and the values of the input parameter @var{t} and the output parameter @var{ret} depend on the input value @var{flag} that is of type string. If @var{flag} is %# @table @option %# @item @code{"init"} -%# then @var{t} must be a double column vector of length 2 with the first and -%# the last time step and nothing is returned from this function, +%# then @var{t} must be a double column vector of length 2 with the first and the last time step and nothing is returned from this function, %# @item @code{""} -%# then @var{t} must be a double scalar specifying the actual time step and the -%# return value is false (resp. value 0) for 'not stop solving', +%# then @var{t} must be a double scalar specifying the actual time step and the return value is false (resp. value 0) for 'not stop solving', %# @item @code{"done"} -%# then @var{t} must be a double scalar specifying the last time step and -%# nothing is returned from this function. +%# then @var{t} must be a double scalar specifying the last time step and nothing is returned from this function. %# @end table %# -%# This function is called by a OdePkg solver function if it was specified in an -%# OdePkg options structure with the @command{odeset}. This function is an -%# OdePkg internal helper function therefore it should never be necessary that -%# this function is called directly by a user. There is only little error -%# detection implemented in this function file to achieve the highest performance. +%# This function is called by a OdePkg solver function if it was specified in an OdePkg options structure with the @command{odeset}. This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# -%# For example, solve the "Lorenz attractor" and display the results while -%# solving in a 3D plane +%# For example, solve the "Lorenz attractor" and display the results while solving in a 3D plane %# @example %# function vyd = florenz (vt, vx) %# vyd = [10 * (vx(2) - vx(1)); @@ -49,7 +37,7 @@ %# vx(1) * vx(2) - 8/3 * vx(3)]; %# endfunction %# -%# vopt = odeset ('OutputFcn', @@odephas3); +%# vopt = odeset ('OutputFcn', @@odephas3); %# vsol = ode23 (@@florenz, [0:0.01:7.5], [3 15 1], vopt); %# @end example %# @end deftypefn @@ -83,8 +71,6 @@ end -end - %# Local Variables: *** %# mode: octave *** %# End: ***
--- a/main/odepkg/inst/odepkg.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,16 +17,9 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{}] =} odepkg () %# -%# OdePkg is part of the GNU Octave Repository (the Octave--Forge project). The -%# package includes commands for setting up various options, output functions -%# etc. before solving a set of differential equations with the solver functions -%# that are also included. At this time OdePkg is under development with the -%# main target to make a package that is mostly compatible to proprietary solver -%# products. +%# OdePkg is part of the GNU Octave Repository (the Octave--Forge project). The package includes commands for setting up various options, output functions etc. before solving a set of differential equations with the solver functions that are also included. At this time OdePkg is under development with the main target to make a package that is mostly compatible to proprietary solver products. %# -%# If this function is called without any input argument then open the OdePkg -%# tutorial in the Octave window. The tutorial can also be opened with the -%# following command +%# If this function is called without any input argument then open the OdePkg tutorial in the Octave window. The tutorial can also be opened with the following command %# %# @example %# doc odepkg @@ -48,7 +41,7 @@ function [] = odepkg_validate_mfiles () - %# From command line in the 'inst' directory do something like this: + %# From command line in the 'inst' directory do something like this: %# octave --quiet --eval "odepkg ('odepkg_validate_mfiles')" vfun = {'ode23', 'ode45', 'ode54', 'ode78', ... @@ -65,10 +58,10 @@ function [] = odepkg_validate_ccfiles () - %# From command line in the 'src' directory do something like this: + %# From command line in the 'src' directory do something like this: %# octave --quiet --eval "odepkg ('odepkg_validate_ccfiles')" - vfile = {'odepkg_octsolver_mebdfdae.cc', 'odepkg_octsolver_mebdfi.cc', ... + vfile = {'odepkg_octsolver_mebdfdae.cc', 'odepkg_octsolver_mebdfi.cc', ... 'odepkg_octsolver_ddaskr.cc', ... 'odepkg_octsolver_radau.cc', 'odepkg_octsolver_radau5.cc', ... 'odepkg_octsolver_rodas.cc', 'odepkg_octsolver_seulex.cc'};
--- a/main/odepkg/inst/odepkg_event_handle.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_event_handle.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,33 +17,18 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{sol}] =} odepkg_event_handle (@var{@@fun}, @var{time}, @var{y}, @var{flag}, [@var{par1}, @var{par2}, @dots{}]) %# -%# Return the solution of the event function that is specified as the first -%# input argument @var{@@fun} in form of a function handle. The second input -%# argument @var{time} is of type double scalar and specifies the time of the -%# event evaluation, the third input argument @var{y} either is of type double -%# column vector (for ODEs and DAEs) and specifies the solutions or is of type -%# cell array (for IDEs and DDEs) and specifies the derivatives or the history -%# values, the third input argument @var{flag} is of type string and can be of -%# the form +%# Return the solution of the event function that is specified as the first input argument @var{@@fun} in form of a function handle. The second input argument @var{time} is of type double scalar and specifies the time of the event evaluation, the third input argument @var{y} either is of type double column vector (for ODEs and DAEs) and specifies the solutions or is of type cell array (for IDEs and DDEs) and specifies the derivatives or the history values, the third input argument @var{flag} is of type string and can be of the form %# @table @option %# @item @code{"init"} -%# then initialize internal persistent variables of the function @command{odepkg_event_handle} -%# and return an empty cell array of size 4, +%# then initialize internal persistent variables of the function @command{odepkg_event_handle} and return an empty cell array of size 4, %# @item @code{"calc"} -%# then do the evaluation of the event function and return the solution @var{sol} -%# as type cell array of size 4, +%# then do the evaluation of the event function and return the solution @var{sol} as type cell array of size 4, %# @item @code{"done"} -%# then cleanup internal variables of the function @command{odepkg_event_handle} -%# and return an empty cell array of size 4. +%# then cleanup internal variables of the function @command{odepkg_event_handle} and return an empty cell array of size 4. %# @end table -%# Optionally if further input arguments @var{par1}, @var{par2}, @dots{} of any -%# type are given then pass these parameters through @command{odepkg_event_handle} -%# to the event function. +%# Optionally if further input arguments @var{par1}, @var{par2}, @dots{} of any type are given then pass these parameters through @command{odepkg_event_handle} to the event function. %# -%# This function is an OdePkg internal helper function therefore it should never -%# be necessary that this function is called directly by a user. There is only -%# little error detection implemented in this function file to achieve the highest -%# performance. +%# This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# @end deftypefn %# %# @seealso{odepkg}
--- a/main/odepkg/inst/odepkg_examples_dae.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_examples_dae.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify
--- a/main/odepkg/inst/odepkg_examples_dde.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_examples_dde.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify
--- a/main/odepkg/inst/odepkg_examples_ide.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_examples_ide.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -83,7 +83,7 @@ %! %! function [vres] = fvanderpol (vt, vy, vyd, varargin) %! mu = varargin{1}; -%! vres = [vy(2) - vyd(1); +%! vres = [vy(2) - vyd(1); %! mu * (1 - vy(1)^2) * vy(2) - vy(1) - vyd(2)]; %! endfunction %! @@ -97,7 +97,7 @@ %! %! function [vres] = fvanderpol (vt, vy, vyd, varargin) %! mu = varargin{1}; -%! vres = [vy(2) - vyd(1); +%! vres = [vy(2) - vyd(1); %! mu * (1 - vy(1)^2) * vy(2) - vy(1) - vyd(2)]; %! endfunction %!
--- a/main/odepkg/inst/odepkg_examples_ode.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_examples_ode.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2008, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2008, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -41,7 +41,7 @@ ' your patch with your added example to the OdePkg developer team.\n', ... '\n' ]); vode = input ('Please choose a number from above or press <Enter> to return: '); - clc; if (vode > 0 && vode < 6) + clc; if (vode > 0 & vode < 6) %# We can't use the function 'demo' directly here because it does %# not allow to run other functions within a demo. vexa = example (mfilename (), vode); @@ -66,7 +66,7 @@ %!demo %! # In this example the non-stiff "Van der Pol" equation (mu = 1) is -%! # solved in forward and backward direction and the results are +%! # solved in forward and backward direction and the results are %! # displayed in a figure after solving. Read about the Van der Pol %! # oscillator at http://en.wikipedia.org/wiki/Van_der_Pol_oscillator. %! @@ -92,7 +92,7 @@ %!demo %! # In this example a simple "pendulum with damping" is solved and the -%! # results are displayed in a figure while solving. Read about the +%! # results are displayed in a figure while solving. Read about the %! # pendulum with damping at %! # http://en.wikipedia.org/wiki/Pendulum %! @@ -113,7 +113,7 @@ %! # and the results are plot in a figure after solving. Read about %! # the Lorenz attractor at %! # http://en.wikipedia.org/wiki/Lorenz_equation -%! # +%! # %! # The upper left subfigure shows the three results of the integration %! # over time. The upper right subfigure shows the force f in a two %! # dimensional (x,y) plane as well as the lower left subfigure shows @@ -129,13 +129,13 @@ %! A = odeset ('InitialStep', 1e-3, 'MaxStep', 1e-1); %! [t, y] = ode54 (@florenz, [0 25], [3 15 1], A); %! -%! subplot (2, 2, 1); grid ('on'); +%! subplot (2, 2, 1); grid ('on'); %! plot (t, y(:,1), '-b', t, y(:,2), '-g', t, y(:,3), '-r'); %! legend ('f_x(t)', 'f_y(t)', 'f_z(t)'); -%! subplot (2, 2, 2); grid ('on'); +%! subplot (2, 2, 2); grid ('on'); %! plot (y(:,1), y(:,2), '-b'); %! legend ('f_{xyz}(x, y)'); -%! subplot (2, 2, 3); grid ('on'); +%! subplot (2, 2, 3); grid ('on'); %! plot (y(:,2), y(:,3), '-b'); %! legend ('f_{xyz}(y, z)'); %! subplot (2, 2, 4); grid ('on'); @@ -149,7 +149,7 @@ %! # http://en.wikipedia.org/wiki/R%C3%B6ssler_attractor %! # %! # The upper left subfigure shows the three results of the integration -%! # over time. The upper right subfigure shows the force f in a two +%! # over time. The upper right subfigure shows the force f in a two %! # dimensional (x,y) plane as well as the lower left subfigure shows %! # the force in the (y,z) plane. The three dimensional force is plot %! # in the lower right subfigure. @@ -163,14 +163,14 @@ %! A = odeset ('MaxStep', 1e-1); %! [t, y] = ode78 (@froessler, [0 70], [0.1 0.3 0.1], A); %! -%! subplot (2, 2, 1); grid ('on'); +%! subplot (2, 2, 1); grid ('on'); %! plot (t, y(:,1), '-b;f_x(t);', t, y(:,2), '-g;f_y(t);', \ %! t, y(:,3), '-r;f_z(t);'); -%! subplot (2, 2, 2); grid ('on'); +%! subplot (2, 2, 2); grid ('on'); %! plot (y(:,1), y(:,2), '-b;f_{xyz}(x, y);'); -%! subplot (2, 2, 3); grid ('on'); +%! subplot (2, 2, 3); grid ('on'); %! plot (y(:,2), y(:,3), '-b;f_{xyz}(y, z);'); -%! subplot (2, 2, 4); grid ('on'); +%! subplot (2, 2, 4); grid ('on'); %! plot3 (y(:,1), y(:,2), y(:,3), '-b;f_{xyz}(x, y, z);'); %# Local Variables: ***
--- a/main/odepkg/inst/odepkg_structure_check.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_structure_check.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,19 +17,9 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{newstruct}] =} odepkg_structure_check (@var{oldstruct}, [@var{"solver"}]) %# -%# If this function is called with one input argument of type structure array -%# then check the field names and the field values of the OdePkg structure -%# @var{oldstruct} and return the structure as @var{newstruct} if no error is -%# found. Optionally if this function is called with a second input argument -%# @var{"solver"} of type string taht specifies the name of a valid OdePkg solver -%# then a higher level error detection is performed. The function does not modify -%# any of the field names or field values but terminates with an error if an invalid -%# option or value is found. +%# If this function is called with one input argument of type structure array then check the field names and the field values of the OdePkg structure @var{oldstruct} and return the structure as @var{newstruct} if no error is found. Optionally if this function is called with a second input argument @var{"solver"} of type string taht specifies the name of a valid OdePkg solver then a higher level error detection is performed. The function does not modify any of the field names or field values but terminates with an error if an invalid option or value is found. %# -%# This function is an OdePkg internal helper function therefore it should never -%# be necessary that this function is called directly by a user. There is only -%# little error detection implemented in this function file to achieve the highest -%# performance. +%# This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# %# Run examples with the command %# @example @@ -433,7 +423,7 @@ %! odepkg_structure_check (odeset); %! %!demo -%! # Create the OdePkg options structure A with odeset and check it +%! # Create the OdePkg options structure A with odeset and check it %! # with odepkg_structure_check. This actually is unnecessary %! # because odeset automtically calls odepkg_structure_check before %! # returning.
--- a/main/odepkg/inst/odepkg_testsuite_calcmescd.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_calcmescd.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,13 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{mescd}] =} odepkg_testsuite_calcmescd (@var{solution}, @var{reference}, @var{abstol}, @var{reltol}) %# -%# If this function is called with four input arguments of type double scalar or -%# column vector then return a normalized value for the minimum number of correct -%# digits @var{mescd} that is calculated from the solution at the end of an -%# integration interval @var{solution} and a set of reference values -%# @var{reference}. The input arguments @var{abstol} and @var{reltol} are used -%# to calculate a reference solution that depends on the relative and absolute -%# error tolerances. +%# If this function is called with four input arguments of type double scalar or column vector then return a normalized value for the minimum number of correct digits @var{mescd} that is calculated from the solution at the end of an integration interval @var{solution} and a set of reference values @var{reference}. The input arguments @var{abstol} and @var{reltol} are used to calculate a reference solution that depends on the relative and absolute error tolerances. %# %# Run examples with the command %# @example @@ -47,7 +41,7 @@ %! %!demo %! # Display the value for the mimum number of correct digits in the vector -%! # sol = [1 + 1e10, 2 + 1e10, 3 + 1e10] compared to the reference vector +%! # sol = [1 + 1e10, 2 + 1e10, 3 + 1e10] compared to the reference vector %! # ref = [1, 2, 3]. %! %! odepkg_testsuite_calcmescd ([1 + 1e10, 2 + 1e10, 3 + 1e10], [1, 2, 3], ...
--- a/main/odepkg/inst/odepkg_testsuite_calcscd.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_calcscd.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{scd}] =} odepkg_testsuite_calcscd (@var{solution}, @var{reference}, @var{abstol}, @var{reltol}) %# -%# If this function is called with four input arguments of type double scalar or -%# column vector then return a normalized value for the minimum number of correct -%# digits @var{scd} that is calculated from the solution at the end of an -%# integration interval @var{solution} and a set of reference values -%# @var{reference}. The input arguments @var{abstol} and @var{reltol} are unused -%# but present because of compatibility to the function @command{odepkg_testsuite_calcmescd}. +%# If this function is called with four input arguments of type double scalar or column vector then return a normalized value for the minimum number of correct digits @var{scd} that is calculated from the solution at the end of an integration interval @var{solution} and a set of reference values @var{reference}. The input arguments @var{abstol} and @var{reltol} are unused but present because of compatibility to the function @command{odepkg_testsuite_calcmescd}. %# %# Run examples with the command %# @example @@ -38,8 +33,8 @@ vscd = -log10 (norm (vrel, inf)); %!demo -%! # Displays the value for the mimum number of correct digits in -%! # the vector sol = [1, 2, 2.9] compared to the reference vector +%! # Displays the value for the mimum number of correct digits in +%! # the vector sol = [1, 2, 2.9] compared to the reference vector %! # ref = [1, 2, 3]. %! %! odepkg_testsuite_calcscd ([1, 2, 2.9], [1, 2, 3], NaN, NaN)
--- a/main/odepkg/inst/odepkg_testsuite_chemakzo.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_chemakzo.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_chemakzo (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the chemical AKZO Nobel testsuite of -%# differential algebraic equations after solving (DAE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the chemical AKZO Nobel testsuite of differential algebraic equations after solving (DAE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_hires.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_hires.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_hires (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the HIRES testsuite of ordinary differential -%# equations after solving (ODE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the HIRES testsuite of ordinary differential equations after solving (ODE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_implakzo.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_implakzo.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_implakzo (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the chemical AKZO Nobel testsuite of implicit -%# differential algebraic equations after solving (IDE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the chemical AKZO Nobel testsuite of implicit differential algebraic equations after solving (IDE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_implrober.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_implrober.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_implrober (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the implicit form of the modified ROBERTSON -%# testsuite of implicit differential algebraic equations after solving (IDE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the implicit form of the modified ROBERTSON testsuite of implicit differential algebraic equations after solving (IDE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_impltrans.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_impltrans.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_impltrans (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return the cell array @var{solution} with -%# performance informations about the TRANSISTOR testsuite of implicit -%# differential algebraic equations after solving (IDE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return the cell array @var{solution} with performance informations about the TRANSISTOR testsuite of implicit differential algebraic equations after solving (IDE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_oregonator.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_oregonator.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_oregonator (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the OREGONATOR testsuite of ordinary -%# differential equations after solving (ODE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the OREGONATOR testsuite of ordinary differential equations after solving (ODE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_pollution.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_pollution.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_pollution (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return the cell array @var{solution} with -%# performance informations about the POLLUTION testsuite of ordinary -%# differential equations after solving (ODE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return the cell array @var{solution} with performance informations about the POLLUTION testsuite of ordinary differential equations after solving (ODE--test). %# %# Run examples with the command %# @example @@ -106,7 +101,7 @@ f(16,1) = + 0.350e-3 * y(4) - 0.100e9 * y(16) - 0.444e12 * y(16); f(17,1) = - 0.124e4 * y(6) * y(17); f(18,1) = + 0.124e4 * y(6) * y(17); - f(19,1) = - 0.210e1 * y(19) - 0.578e1 * y(19) + 0.474e-1 * y(1) * y(4) - ... + f(19,1) = - 0.210e1 * y(19) - 0.578e1 * y(19) + 0.474e-1 * y(1) * y(4) - ... 0.178e4 * y(1) * y(19) + 0.312e1 * y(20); f(20,1) = + 0.178e4 * y(1) * y(19) - 0.312e1 * y(20);
--- a/main/odepkg/inst/odepkg_testsuite_robertson.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_robertson.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_robertson (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return a cell array @var{solution} with -%# performance informations about the modified ROBERTSON testsuite of -%# differential algebraic equations after solving (DAE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return a cell array @var{solution} with performance informations about the modified ROBERTSON testsuite of differential algebraic equations after solving (DAE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odepkg_testsuite_transistor.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odepkg_testsuite_transistor.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2007-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2007-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,12 +17,7 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{solution}] =} odepkg_testsuite_transistor (@var{@@solver}, @var{reltol}) %# -%# If this function is called with two input arguments and the first input -%# argument @var{@@solver} is a function handle describing an OdePkg solver and -%# the second input argument @var{reltol} is a double scalar describing the -%# relative error tolerance then return the cell array @var{solution} with -%# performance informations about the TRANSISTOR testsuite of differential -%# algebraic equations after solving (DAE--test). +%# If this function is called with two input arguments and the first input argument @var{@@solver} is a function handle describing an OdePkg solver and the second input argument @var{reltol} is a double scalar describing the relative error tolerance then return the cell array @var{solution} with performance informations about the TRANSISTOR testsuite of differential algebraic equations after solving (DAE--test). %# %# Run examples with the command %# @example
--- a/main/odepkg/inst/odeplot.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odeplot.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,30 +17,19 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{ret}] =} odeplot (@var{t}, @var{y}, @var{flag}) %# -%# Open a new figure window and plot the results from the variable @var{y} of -%# type column vector over time while solving. The types and the values of the -%# input parameter @var{t} and the output parameter @var{ret} depend on the -%# input value @var{flag} that is of type string. If @var{flag} is +%# Open a new figure window and plot the results from the variable @var{y} of type column vector over time while solving. The types and the values of the input parameter @var{t} and the output parameter @var{ret} depend on the input value @var{flag} that is of type string. If @var{flag} is %# @table @option %# @item @code{"init"} -%# then @var{t} must be a double column vector of length 2 with the first and -%# the last time step and nothing is returned from this function, +%# then @var{t} must be a double column vector of length 2 with the first and the last time step and nothing is returned from this function, %# @item @code{""} -%# then @var{t} must be a double scalar specifying the actual time step and the -%# return value is false (resp. value 0) for 'not stop solving', +%# then @var{t} must be a double scalar specifying the actual time step and the return value is false (resp. value 0) for 'not stop solving', %# @item @code{"done"} -%# then @var{t} must be a double scalar specifying the last time step and -%# nothing is returned from this function. +%# then @var{t} must be a double scalar specifying the last time step and nothing is returned from this function. %# @end table %# -%# This function is called by a OdePkg solver function if it was specified in an -%# OdePkg options structure with the @command{odeset}. This function is an OdePkg -%# internal helper function therefore it should never be necessary that this -%# function is called directly by a user. There is only little error detection -%# implemented in this function file to achieve the highest performance. +%# This function is called by a OdePkg solver function if it was specified in an OdePkg options structure with the @command{odeset}. This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# -%# For example, solve an anonymous implementation of the "Van der Pol" equation -%# and display the results while solving +%# For example, solve an anonymous implementation of the "Van der Pol" equation and display the results while solving %# @example %# fvdb = @@(vt,vy) [vy(2); (1 - vy(1)^2) * vy(2) - vy(1)]; %# @@ -54,13 +43,13 @@ function [varargout] = odeplot (vt, vy, vflag, varargin) %# No input argument check is done for a higher processing speed - persistent vfigure; persistent vtold; + persistent vfigure; persistent vtold; persistent vyold; persistent vcounter; - if (strcmp (vflag, 'init')) + if (strcmp (vflag, 'init')) %# Nothing to return, vt is either the time slot [tstart tstop] %# or [t0, t1, ..., tn], vy is the inital value vector 'vinit' - vfigure = figure; vtold = vt(1,1); vyold = vy(:,1); + vfigure = figure; vtold = vt(1,1); vyold = vy(:,1); vcounter = 1; elseif (isempty (vflag)) @@ -72,7 +61,7 @@ plot (vtold, vyold, '-o', 'markersize', 1); drawnow; varargout{1} = false; - elseif (strcmp (vflag, 'done')) + elseif (strcmp (vflag, 'done')) %# Cleanup has to be done, clear the persistent variables because %# we don't need them anymore clear ('vfigure', 'vtold', 'vyold', 'vcounter'); @@ -81,4 +70,4 @@ %# Local Variables: *** %# mode: octave *** -%# End: *** +%# End: *** \ No newline at end of file
--- a/main/odepkg/inst/odeprint.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odeprint.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -17,33 +17,19 @@ %# -*- texinfo -*- %# @deftypefn {Function File} {[@var{ret}] =} odeprint (@var{t}, @var{y}, @var{flag}) %# -%# Display the results of the set of differential equations in the Octave window -%# while solving. The first column of the screen output shows the actual time -%# stamp that is given with the input arguemtn @var{t}, the following columns -%# show the results from the function evaluation that are given by the column -%# vector @var{y}. The types and the values of the input parameter @var{t} and -%# the output parameter @var{ret} depend on the input value @var{flag} that is -%# of type string. If @var{flag} is +%# Display the results of the set of differential equations in the Octave window while solving. The first column of the screen output shows the actual time stamp that is given with the input arguemtn @var{t}, the following columns show the results from the function evaluation that are given by the column vector @var{y}. The types and the values of the input parameter @var{t} and the output parameter @var{ret} depend on the input value @var{flag} that is of type string. If @var{flag} is %# @table @option %# @item @code{"init"} -%# then @var{t} must be a double column vector of length 2 with the first and -%# the last time step and nothing is returned from this function, +%# then @var{t} must be a double column vector of length 2 with the first and the last time step and nothing is returned from this function, %# @item @code{""} -%# then @var{t} must be a double scalar specifying the actual time step and the -%# return value is false (resp. value 0) for 'not stop solving', +%# then @var{t} must be a double scalar specifying the actual time step and the return value is false (resp. value 0) for 'not stop solving', %# @item @code{"done"} -%# then @var{t} must be a double scalar specifying the last time step and -%# nothing is returned from this function. +%# then @var{t} must be a double scalar specifying the last time step and nothing is returned from this function. %# @end table %# -%# This function is called by a OdePkg solver function if it was specified in an -%# OdePkg options structure with the @command{odeset}. This function is an OdePkg -%# internal helper function therefore it should never be necessary that this -%# function is called directly by a user. There is only little error detection -%# implemented in this function file to achieve the highest performance. +%# This function is called by a OdePkg solver function if it was specified in an OdePkg options structure with the @command{odeset}. This function is an OdePkg internal helper function therefore it should never be necessary that this function is called directly by a user. There is only little error detection implemented in this function file to achieve the highest performance. %# -%# For example, solve an anonymous implementation of the "Van der Pol" equation -%# and print the results while solving +%# For example, solve an anonymous implementation of the "Van der Pol" equation and print the results while solving %# @example %# fvdb = @@(vt,vy) [vy(2); (1 - vy(1)^2) * vy(2) - vy(1)]; %# @@ -67,13 +53,13 @@ elseif (isempty (vflag)) %# Return value varargout{1} needed fprintf (1, '%f%s\n', vt (1,1), sprintf (' %f', vy) ); - fflush (1); varargout{1} = false; + fflush (1); varargout{1} = false; - elseif (strcmp (vflag, 'done')) + elseif (strcmp (vflag, 'done')) %# Cleanup could be done, but nothing to do in this function end %# Local Variables: *** %# mode: octave *** -%# End: *** +%# End: *** \ No newline at end of file
--- a/main/odepkg/inst/odeset.m Fri Jan 27 17:10:52 2012 +0000 +++ b/main/odepkg/inst/odeset.m Sun Jan 29 11:42:54 2012 +0000 @@ -1,4 +1,4 @@ -%# Copyright (C) 2006-2011, Thomas Treichl <thomas.treichl@gmx.net> +%# Copyright (C) 2006-2011, Thomas Treichl <treichl@users.sourceforge.net> %# OdePkg - A package for solving ordinary differential equations and more %# %# This program is free software; you can redistribute it and/or modify @@ -20,31 +20,15 @@ %# @deftypefnx {Command} {[@var{odestruct}] =} odeset (@var{oldstruct}, @var{"field1"}, @var{value1}, @var{"field2"}, @var{value2}, @dots{}) %# @deftypefnx {Command} {[@var{odestruct}] =} odeset (@var{oldstruct}, @var{newstruct}) %# -%# If this function is called without an input argument then return a new OdePkg -%# options structure array that contains all the necessary fields and sets the -%# values of all fields to default values. +%# If this function is called without an input argument then return a new OdePkg options structure array that contains all the necessary fields and sets the values of all fields to default values. %# -%# If this function is called with string input arguments @var{"field1"}, -%# @var{"field2"}, @dots{} identifying valid OdePkg options then return a new -%# OdePkg options structure with all necessary fields and set the values of the -%# fields @var{"field1"}, @var{"field2"}, @dots{} to the values @var{value1}, -%# @var{value2}, @dots{} +%# If this function is called with string input arguments @var{"field1"}, @var{"field2"}, @dots{} identifying valid OdePkg options then return a new OdePkg options structure with all necessary fields and set the values of the fields @var{"field1"}, @var{"field2"}, @dots{} to the values @var{value1}, @var{value2}, @dots{} %# -%# If this function is called with a first input argument @var{oldstruct} of type -%# structure array then overwrite all values of the options @var{"field1"}, -%# @var{"field2"}, @dots{} of the structure @var{oldstruct} with new values -%# @var{value1}, @var{value2}, @dots{} and return the modified structure array. +%# If this function is called with a first input argument @var{oldstruct} of type structure array then overwrite all values of the options @var{"field1"}, @var{"field2"}, @dots{} of the structure @var{oldstruct} with new values @var{value1}, @var{value2}, @dots{} and return the modified structure array. %# -%# If this function is called with two input argumnets @var{oldstruct} and -%# @var{newstruct} of type structure array then overwrite all values in the -%# fields from the structure @var{oldstruct} with new values of the fields from -%# the structure @var{newstruct}. Empty values of @var{newstruct} will not -%# overwrite values in @var{oldstruct}. +%# If this function is called with two input argumnets @var{oldstruct} and @var{newstruct} of type structure array then overwrite all values in the fields from the structure @var{oldstruct} with new values of the fields from the structure @var{newstruct}. Empty values of @var{newstruct} will not overwrite values in @var{oldstruct}. %# -%# For a detailed explanation about valid fields and field values in an OdePkg -%# structure aaray have a look at the @file{odepkg.pdf}, Section -%# 'ODE/DAE/IDE/DDE options' or run the command @command{doc odepkg} to open the -%# tutorial. +%# For a detailed explanation about valid fields and field values in an OdePkg structure aaray have a look at the @file{odepkg.pdf}, Section 'ODE/DAE/IDE/DDE options' or run the command @command{doc odepkg} to open the tutorial. %# %# Run examples with the command %# @example @@ -185,7 +169,7 @@ %! odeoptA = odeset (); %! %!demo -%! # A new OdePkg options structure with manually set options +%! # A new OdePkg options structure with manually set options %! # "AbsTol" and "RelTol" is created. %! %! odeoptB = odeset ('AbsTol', 1e-2, 'RelTol', 1e-1);