FYS3150/Project-2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'coryab/create-code-structure' into janitaws/check-eigen-bug

Browse Source 
Add new implementations in jacobi
This commit is contained in:
Janita Willumsen 2023-09-22 08:42:08 +02:00
commit a9d2c9dfb7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jacobi.cpp
View File

@ -6,7 +6,9 @@
* @bug The eigenvalues fail the test. When comparing them to arma::eigsym * @bug The eigenvalues fail the test. When comparing them to arma::eigsym
* there is one value that is way off when testing with a 6x6 matrix. * there is one value that is way off when testing with a 6x6 matrix.
*/ */
#include <algorithm>
#include <cmath> #include <cmath>
#include <utility>
#include "utils.hpp" #include "utils.hpp"
#include "jacobi.hpp" #include "jacobi.hpp"
@ -75,11 +77,19 @@ void jacobi_eigensolver(const arma::mat& A,
} while (max_offdiag >= eps && ++iterations < maxiter); } while (max_offdiag >= eps && ++iterations < maxiter);
// The diagonal elements of A_m are the eigenvalues // Get the diagonal of A
eigenvalues = arma::diagvec(A_m); arma::vec res = arma::diagvec(A_m);
eigenvectors = R; // 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);
// 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; converged = max_offdiag < eps;
A_m.print();
R.print();
} }