Mercurial > octave

changeset 23561:66dc0ce97f2b

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 Thu, 08 Jun 2017 13:09:22 -0700
parents c9852320f004 (current diff) 286d85b43bdc (diff)
children 35ee7e8fb33b
files liboctave/array/CMatrix.cc liboctave/array/fCMatrix.cc scripts/polynomial/residue.m
diffstat 3 files changed, 21 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/CMatrix.cc	Thu Mar 23 18:11:24 2017 +0100
+++ b/liboctave/array/CMatrix.cc	Thu Jun 08 13:09:22 2017 -0700
@@ -883,7 +883,8 @@
         info = -1;
     }
 
-  if ((info == -1 && ! force) || octave::math::isinf (anorm))
+  if ((info == -1 && ! force)
+      || octave::math::isnan (anorm) || octave::math::isinf (anorm))
     retval = *this;  // Restore contents.
   else
     {
--- a/liboctave/array/fCMatrix.cc	Thu Mar 23 18:11:24 2017 +0100
+++ b/liboctave/array/fCMatrix.cc	Thu Jun 08 13:09:22 2017 -0700
@@ -885,7 +885,8 @@
         info = -1;
     }
 
-  if ((info == -1 && ! force) || octave::math::isinf (anorm))
+  if ((info == -1 && ! force)
+      || octave::math::isnan (anorm) || octave::math::isinf (anorm))
     retval = *this;  // Restore contents.
   else
     {
--- a/scripts/polynomial/residue.m	Thu Mar 23 18:11:24 2017 +0100
+++ b/scripts/polynomial/residue.m	Thu Jun 08 13:09:22 2017 -0700
@@ -296,7 +296,6 @@
   endif
 
   indx = 1:numel (p);
-
   for n = indx
     pn = [1, -p(n)];
     if (n == 1)
@@ -320,14 +319,16 @@
   pnum = zeros (1, N+1);
   for n = indx(abs (r) > 0)
     p1 = [1, -p(n)];
-    for m = 1:e(n)
-      if (m == 1)
-        pm = p1;
-      else
-        pm = conv (pm, p1);
-      endif
-    endfor
-    pn = deconv (pden, pm);
+    pn = 1;
+    for j = 1:n - 1
+      pn = conv (pn, [1, -p(j)]);
+    end
+    for j = n + 1:numel (p)
+      pn = conv (pn, [1, -p(j)]);
+    end
+    for j = 1:e(n) - 1
+      pn = deconv (pn, p1);
+    end
     pn = r(n) * pn;
     pnum += prepad (pn, N+1, 0, 2);
   endfor
@@ -430,3 +431,10 @@
 %! assert (numel (num), 4);
 %! assert (numel (den), 5);
 %! assert (den(1), 1);
+
+%!test <51148>
+%! r = [1.0000e+18, 3.5714e+12, 2.2222e+11, 2.1739e+10];
+%! pin = [-1.9231e+15, -1.6234e+09, -4.1152e+07, -1.8116e+06];
+%! k = 0;
+%! [p, q] = residue (r, pin, k);
+%! assert (p(4), 4.6828e+42, -1e-5);