Mercurial > jwe > octave

changeset 22670:305706823a2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 26 Oct 2016 10:19:51 -0700
parents c159d5850f61 (current diff) bcfcbb5653e6 (diff)
children 7c45d565d1b7
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ode/private/integrate_adaptive.m	Tue Oct 25 21:53:20 2016 -0700
+++ b/scripts/ode/private/integrate_adaptive.m	Wed Oct 26 10:19:51 2016 -0700
@@ -193,7 +193,7 @@
             approxvals = interp1 ([t_old, t(t_caught), t_new],
                                   [x_old, x(:, t_caught), x_new] .',
                                   approxtime, "linear") .';
-            if (isvector (approxvals))
+            if (isvector (approxvals) && ! isscalar (approxtime))
               approxvals = approxvals.';
             endif
             if (! isempty (options.OutputSel))
@@ -244,7 +244,7 @@
           approxvals = interp1 ([t_old, t_new],
                                 [x_old, x_new] .',
                                 approxtime, "linear") .';
-          if (isvector (approxvals))
+          if (isvector (approxvals) && ! isscalar (approxtime))
             approxvals = approxvals.';
           endif
           if (! isempty (options.OutputSel))