[Octave-cvsupdate] SF.net SVN: octave: [4706] trunk/octave-forge/main/odepkg/inst/ode23.m

[<tr...@us...>]

Revision: 4706
          http://octave.svn.sourceforge.net/octave/?rev=4706&view=rev
Author:   treichl
Date:     2008-03-09 14:28:33 -0700 (Sun, 09 Mar 2008)

Log Message:
-----------
Minor changes.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/inst/ode23.m

Modified: trunk/octave-forge/main/odepkg/inst/ode23.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode23.m	2008-03-09 13:25:50 UTC (rev 4705)
+++ trunk/octave-forge/main/odepkg/inst/ode23.m	2008-03-09 21:28:33 UTC (rev 4706)
@@ -66,7 +66,7 @@
     error ('OdePkg:InvalidArgument', ...
       'Second input argument must be a valid vector');
 
-  elseif (~isnumeric (vinit))
+  elseif (~isvector (vinit) || ~isnumeric (vinit))
     error ('OdePkg:InvalidArgument', ...
       'Third input argument must be a valid numerical value');
 
@@ -430,11 +430,12 @@
         ' vminstepsize. Try to reduce the value of "InitialStep" and/or', ...
         ' "MaxStep" with the command "odeset".\n'], vtimestamp, vtimestop);
     else
-      warning (['Solver has been stopped by a call of "break" in', ...
-        ' the main iteration loop at time t = %f before endpoint at', ...
-        ' tend = %f was reached. This may happen because the @odeplot', ...
-        ' function returned "true" or the @event function returned "true".'], ...
-        vtimestamp, vtimestop);
+      warning ('OdePkg:HideWarning', ...
+	['Solver has been stopped by a call of "break" in', ...
+         ' the main iteration loop at time t = %f before endpoint at', ...
+         ' tend = %f was reached. This may happen because the @odeplot', ...
+         ' function returned "true" or the @event function returned "true".'], ...
+         vtimestamp, vtimestop);
     end
   end
 
@@ -611,6 +612,7 @@
 %!  assert (isfield (vsol, 'xe'));
 %!  assert (isfield (vsol, 'ye'));
 %!test %# Events option, now stop integration
+%!  warning ('off', 'OdePkg:HideWarning');
 %!  vopt = odeset ('Events', @fevn, 'NormControl', 'on');
 %!  vsol = ode23 (@fpol, [0 10], [2 0], vopt);
 %!  assert ([vsol.ie, vsol.xe, vsol.ye], ...
@@ -620,6 +622,7 @@
 %!  [vt, vy, vxe, vye, vie] = ode23 (@fpol, [0 10], [2 0], vopt);
 %!  assert ([vie, vxe, vye], ...
 %!    [2.0, 2.496110, -0.830550, -2.677589], 1e-3);
+%!  warning ('on', 'OdePkg:HideWarning');
 %!test %# Jacobian option
 %!  vopt = odeset ('Jacobian', @fjac);
 %!  vsol = ode23 (@fpol, [0 2], [2 0], vopt);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.