Mercurial > octave

changeset 22597:f812283c4367

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Carlo de Falco <carlo.defalco@polimi.it>
date Thu, 06 Oct 2016 07:56:59 +0200
parents acfb81e6992a (current diff) 8d3a2d1af389 (diff)
children a2ee7fe43834
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ode/private/integrate_adaptive.m	Thu Oct 06 07:36:59 2016 +0200
+++ b/scripts/ode/private/integrate_adaptive.m	Thu Oct 06 07:56:59 2016 +0200
@@ -76,7 +76,7 @@
   dt = odeget (options, "InitialStep", [], "fast");
   if (isempty (dt))
     dt = starting_stepsize (order, func, t, x, options.AbsTol, options.RelTol,
-                            strcmp (options.NormControl, "on"));
+                            strcmp (options.NormControl, "on"), options.funarguments);
   endif
 
   dir = odeget (options, "direction", [], "fast");
--- a/scripts/ode/private/starting_stepsize.m	Thu Oct 06 07:36:59 2016 +0200
+++ b/scripts/ode/private/starting_stepsize.m	Thu Oct 06 07:56:59 2016 +0200
@@ -36,13 +36,13 @@
 ## @seealso{odepkg}
 
 function h = starting_stepsize (order, func, t0, x0,
-                                AbsTol, RelTol, normcontrol)
+                                AbsTol, RelTol, normcontrol, args)
 
   ## compute norm of initial conditions
   d0 = AbsRel_Norm (x0, x0, AbsTol, RelTol, normcontrol);
 
   ## compute norm of the function evaluated at initial conditions
-  y = func (t0, x0);
+  y = func (t0, x0, args{:});
   if (iscell (y))
     y = y{1};
   endif
@@ -58,7 +58,7 @@
   x1 = x0 + h0 * y;
 
   ## approximate the derivative norm
-  yh = func (t0+h0, x1);
+  yh = func (t0+h0, x1, args{:});
   if (iscell (yh))
     yh = yh{1};
   endif