Reverted changes to matrix class. This will come back later in

DMD gradients.  It is too soon for this now.

Author: ptranq

lib/linalg/Matrix.cpp

@@ -2103,122 +2103,6 @@ ComplexEigenPair NonSymmetricRightEigenSolve(const Matrix & A)
     return eigenpair;
 }
 
-std::vector<ComplexEigenPair> NonSymmetricEigenSolve(const Matrix & A)
-{
-    char jobvl = 'V', jobrl = 'V';
-
-    int info;
-    int k = A.numColumns();
-    int lwork = std::max(k*k, 10*k);
-    double* work = new double [lwork];
-    double* e_real = new double [k];
-    double* e_imaginary = new double [k];
-    Matrix* ev_l = new Matrix(k, k, false);
-    Matrix* ev_r = new Matrix(k, k, false);
-    Matrix* A_copy = new Matrix(A);
-
-    // A now in a row major representation.  Put it
-    // into column major order.
-    for (int row = 0; row < k; ++row) {
-        for (int col = row+1; col < k; ++col) {
-            double tmp = A_copy->item(row, col);
-            A_copy->item(row, col) = A_copy->item(col, row);
-            A_copy->item(col, row) = tmp;
-        }
-    }
-
-    // Now call lapack to do the eigensolve.
-    dgeev(&jobvl, &jobrl, &k, A_copy->getData(), &k, e_real, e_imaginary, ev_l->getData(),
-          &k, ev_r->getData(), &k, work, &lwork, &info);
-
-    // Eigenvectors now in a column major representation.  Put it
-    // into row major order.
-    for (int row = 0; row < k; ++row) {
-        for (int col = row+1; col < k; ++col) {
-            double tmp = ev_r->item(row, col);
-            ev_r->item(row, col) = ev_r->item(col, row);
-            ev_r->item(col, row) = tmp;
-
-            tmp = ev_l->item(row, col);
-            ev_l->item(row, col) = ev_l->item(col,row);
-            ev_l->item(col,row) = tmp;
-        }
-    }
-
-    std::vector<ComplexEigenPair> eigenpairs;
-    
-    ComplexEigenPair eigenpair_right;
-    eigenpair_right.ev_real = new Matrix(k, k, false);
-    eigenpair_right.ev_imaginary = new Matrix(k, k, false);
-
-    // Separate lapack eigenvector into real and imaginary parts
-    for (int i = 0; i < k; ++i)
-    {
-        for (int row = 0; row < k; ++row) {
-            eigenpair_right.ev_real->item(row, i) = ev_r->item(row, i);
-        }
-        if (e_imaginary[i] != 0)
-        {
-            for (int row = 0; row < k; ++row) {
-                eigenpair_right.ev_real->item(row, i + 1) = ev_r->item(row, i);
-                eigenpair_right.ev_imaginary->item(row, i) = ev_r->item(row, i + 1);
-                eigenpair_right.ev_imaginary->item(row, i + 1) = -ev_r->item(row, i + 1);
-            }
-
-            // Skip the next eigenvalue since it'll be part of the complex
-            // conjugate pair.
-            ++i;
-        }
-    }
-
-    for (int i = 0; i < k; i++)
-    {
-        eigenpair_right.eigs.push_back(std::complex<double>(e_real[i], e_imaginary[i]));
-    }
-
-    eigenpairs.push_back(eigenpair_right);
-
-    ComplexEigenPair eigenpair_left;
-    eigenpair_left.ev_real = new Matrix(k, k, false);
-    eigenpair_left.ev_imaginary = new Matrix(k, k, false);
-
-    // Separate lapack eigenvector into real and imaginary parts
-    for (int i = 0; i < k; ++i)
-    {
-        for (int row = 0; row < k; ++row) {
-            eigenpair_left.ev_real->item(row, i) = ev_l->item(row, i);
-        }
-        if (e_imaginary[i] != 0)
-        {
-            for (int row = 0; row < k; ++row) {
-                eigenpair_left.ev_real->item(row, i + 1) = ev_l->item(row, i);
-                eigenpair_left.ev_imaginary->item(row, i) = ev_l->item(row, i + 1);
-                eigenpair_left.ev_imaginary->item(row, i + 1) = -ev_l->item(row, i + 1);
-            }
-
-            // Skip the next eigenvalue since it'll be part of the complex
-            // conjugate pair.
-            ++i;
-        }
-    }
-
-    for (int i = 0; i < k; i++)
-    {
-        eigenpair_left.eigs.push_back(std::complex<double>(e_real[i], e_imaginary[i]));
-    }
-
-    eigenpairs.push_back(eigenpair_left);
-
-    delete [] work;
-    delete [] e_real;
-    delete [] e_imaginary;
-    delete ev_r;
-    delete ev_l;
-    delete A_copy;
-
-    return eigenpairs;
-}
-
 void SerialSVD(Matrix* A,
                Matrix* U,
                Vector* S,

lib/linalg/Matrix.h

@@ -1205,19 +1205,6 @@ EigenPair SymmetricRightEigenSolve(const Matrix & A);
  */
 ComplexEigenPair NonSymmetricRightEigenSolve(const Matrix & A);
 
-/**
- * @brief Computes the left and right eigenvectors/eigenvalues of an NxN 
- *        real nonsymmetric matrix.
- *
- * @param[in] A The NxN real nonsymmetric matrix to be eigendecomposed.
- *
- * @return A standard vector of ComplexEigenPairs containing the 
- *         right, then left, eigenvectors and eigenvalues of the eigensolve. 
- *         The eigenvector matrices contained within the returning struct 
- *         must be destroyed by the user.
- */
-std::vector<ComplexEigenPair> NonSymmetricEigenSolve(const Matrix & A);
-
 std::unique_ptr<Matrix> SpaceTimeProduct(const CAROM::Matrix & As,
         const CAROM::Matrix & At, const CAROM::Matrix & Bs,
         const CAROM::Matrix & Bt,