From 47f332a66c948b8bdd069065e266be2fad643920 Mon Sep 17 00:00:00 2001 From: Cory Date: Wed, 20 Sep 2023 20:03:00 +0200 Subject: [PATCH] Cleanup --- src/jacobi.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/jacobi.cpp b/src/jacobi.cpp index 0542c18..d597793 100644 --- a/src/jacobi.cpp +++ b/src/jacobi.cpp @@ -77,18 +77,19 @@ void jacobi_eigensolver(const arma::mat& A, } while (max_offdiag >= eps && ++iterations < maxiter); - + // Get the diagonal of A arma::vec res = arma::diagvec(A_m); + // Get the indeces of res in sorted order arma::uvec sorted_indeces = arma::sort_index(res); + eigenvalues.resize(res.n_elem); eigenvectors.resize(res.n_elem, res.n_elem); - // The diagonal elements of A_m are the eigenvalues + + // Set the eigenvalues and their corresponding vectors in order for (int i=0; i < res.n_elem; i++) { eigenvalues[i] = res[sorted_indeces[i]]; eigenvectors.insert_cols(i, R.col(sorted_indeces[i])); } converged = max_offdiag < eps; - A_m.print(); - R.print(); }