* Bug #12120 fixed - eigs was broken for complex sparse matrices.

Change-Id: Ia73e6edda16274f8b87ac2745e7f55f14648c6e2

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 5b53721..f3ba32a 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -206,6 +206,8 @@ Bug fixes
 
 * Bug #12119 fixed - bar and barh had wrong x/y bounds.
 
+* Bug #12120 fixed - eigs was broken for complex sparse matrices.
+
 * Bug #12140 fixed - csvRead fails when comma is used as decimal mark.
 
 * Bug #12166 fixed - There was a bad label with drawaxis.

diff --git a/scilab/modules/arnoldi/macros/eigs.sci b/scilab/modules/arnoldi/macros/eigs.sci
index 4f7957e..ec4f5ea 100644 (file)
--- a/scilab/modules/arnoldi/macros/eigs.sci
+++ b/scilab/modules/arnoldi/macros/eigs.sci
@@ -574,22 +574,7 @@ function [res_d, res_v] = speigs(A, %_B, nev, which, maxiter, tol, ncv, cholB, r
                 AMSB = A - sigma * %_B;
             end
         end
-        if(~isreal(AMSB))
-            Lup = umf_lufact(AMSB);
-            [L, U, p, q, R] = umf_luget(Lup);
-            R = diag(R);
-            P = zeros(nA, nA);
-            Q = zeros(nA, nA);
-            for i = 1:nA
-                P(i,p(i)) = 1;
-                Q(q(i),i) = 1;
-            end
-            umf_ludel(Lup);
-        else
-            [hand, rk] = lufact(AMSB);
-            [P, L, U, Q] = luget(hand);
-            ludel(hand);
-        end
+        Lup = umf_lufact(AMSB);
     end
 
     if(Areal)
@@ -653,15 +638,7 @@ function [res_d, res_v] = speigs(A, %_B, nev, which, maxiter, tol, ncv, cholB, r
                     if(ido == 2)
                         workd(ipntr(2):ipntr(2)+nA-1) = workd(ipntr(1):ipntr(1)+nA-1);
                     else
-                        if(Areal & Breal)
-                            workd(ipntr(2):ipntr(2)+nA-1) = inv(Q) * inv(U) * inv(L) * inv(P) *workd(ipntr(1):ipntr(1)+nA-1);
-                        else
-                            if(~isreal(L) | ~isreal(U))
-                                error(msprintf(gettext("%s: Impossible to invert complex sparse matrix.\n"), "eigs"));
-                            else
-                                workd(ipntr(2):ipntr(2)+nA-1) = Q * inv(U) * inv(L) * P * inv(R) * workd(ipntr(1):ipntr(1)+nA-1);
-                            end
-                        end
+                        workd(ipntr(2):ipntr(2)+nA-1) = umf_lusolve(Lup, workd(ipntr(1):ipntr(1)+nA-1));
                     end
                 else
                     if(ido == 2)
@@ -676,25 +653,9 @@ function [res_d, res_v] = speigs(A, %_B, nev, which, maxiter, tol, ncv, cholB, r
                         else
                             workd(ipntr(2):ipntr(2)+nA-1) = %_B * workd(ipntr(1):ipntr(1)+nA-1);
                         end
-                        if(Areal & Breal)
-                            workd(ipntr(2):ipntr(2)+nA-1) = inv(Q) * inv(U) * inv(L) * inv(P) *workd(ipntr(2):ipntr(2)+nA-1);
-                        else
-                            if(~isreal(L) | ~isreal(U))
-                                error(msprintf(gettext("%s: Impossible to invert complex sparse matrix.\n"), "eigs"));
-                            else
-                                workd(ipntr(2):ipntr(2)+nA-1) = Q * inv(U) * inv(L) * P * inv(R) * workd(ipntr(2):ipntr(2)+nA-1);
-                            end
-                        end
+                        workd(ipntr(2):ipntr(2)+nA-1) = umf_lusolve(Lup, workd(ipntr(2):ipntr(2)+nA-1));
                     else
-                        if(Areal & Breal)
-                            workd(ipntr(2):ipntr(2)+nA-1) = inv(Q) * inv(U) * inv(L) * inv(P) * workd(ipntr(3):ipntr(3)+nA-1);
-                        else
-                            if(~isreal(L) | ~isreal(U))
-                                error(msprintf(gettext("%s: Impossible to invert complex sparse matrix.\n"), "eigs"));
-                            else
-                                workd(ipntr(2):ipntr(2)+nA-1) = Q * inv(U) * inv(L) * P * inv(R) * workd(ipntr(3):ipntr(3)+nA-1);
-                            end
-                        end
+                        workd(ipntr(2):ipntr(2)+nA-1) = umf_lusolve(Lup, workd(ipntr(3):ipntr(3)+nA-1));
                     end
                 end
             else
@@ -710,6 +671,9 @@ function [res_d, res_v] = speigs(A, %_B, nev, which, maxiter, tol, ncv, cholB, r
             end
         end
     end
+    if(iparam(7)==3)
+        umf_ludel(Lup);
+    end
 
     if(Areal & Breal)
         if(Asym)

diff --git a/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.dia.ref b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.dia.ref
new file mode 100644 (file)
index 0000000..2c0980e
--- /dev/null
+++ b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.dia.ref
@@ -0,0 +1,18 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Sylvestre Ledru
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- CLI SHELL MODE -->
+// <-- Non-regression test for bug 12120 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=12120
+//
+// <-- Short Description -->
+//   eigs is broken for complex sparse matrices
+// =============================================================================
+A = %i * speye(10,10);
+a=eigs(A, [], 3, 'SM');
+assert_checkequal(size(a),[3, 1]);

diff --git a/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.tst b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.tst
new file mode 100644 (file)
index 0000000..b24163d
--- /dev/null
+++ b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12120.tst
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Sylvestre Ledru
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- CLI SHELL MODE -->
+
+// <-- Non-regression test for bug 12120 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=12120
+//
+// <-- Short Description -->
+//   eigs is broken for complex sparse matrices
+// =============================================================================
+
+A = %i * speye(10,10);
+a=eigs(A, [], 3, 'SM');
+assert_checkequal(size(a),[3, 1]);
+