diff --git a/doc/html/bug.html b/doc/html/bug.html index ed8264e..7701fb4 100644 --- a/doc/html/bug.html +++ b/doc/html/bug.html @@ -76,17 +76,19 @@ $(function() {
File jacobi.cpp
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.
File jacobi.hpp
-
No known bugs
-
File matrix.cpp
-
No known bugs
-
File matrix.hpp
No known bugs
-
File test_suite.cpp
+
File main.cpp
+
No known bugs
+
File matrix.cpp
No known bugs
-
File utils.cpp
+
File matrix.hpp
+
No known bugs
+
File test_suite.cpp
No known bugs
+
File utils.cpp
+
No known bugs
File utils.hpp
-
No known bugs
+
No known bugs
diff --git a/doc/html/files.html b/doc/html/files.html index e4cdc2b..dd75b52 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -79,9 +79,10 @@ $(function() {  matrix.hppFunction prototypes for creating tridiagonal matrices  utils.hppFunction prototypes and macros that are useful  jacobi.cppImplementation of the jacobi rotation method - matrix.cppFunction prototypes for creating tridiagonal matrices - test_suite.cppTest suite for project 2 - utils.cppImplementation of the utils + main.cppMain program for Project 2 + matrix.cppFunction prototypes for creating tridiagonal matrices + test_suite.cppTest suite for project 2 + utils.cppImplementation of the utils diff --git a/doc/html/jacobi_8cpp.html b/doc/html/jacobi_8cpp.html index 60c9b48..b2b3817 100644 --- a/doc/html/jacobi_8cpp.html +++ b/doc/html/jacobi_8cpp.html @@ -77,7 +77,9 @@ $(function() {

Implementation of the jacobi rotation method. More...

-
#include <cmath>
+
#include <algorithm>
+#include <cmath>
+#include <utility>
#include "utils.hpp"
#include "jacobi.hpp"
#include "matrix.hpp"
diff --git a/doc/html/jacobi_8hpp.html b/doc/html/jacobi_8hpp.html index 6952681..475ce9a 100644 --- a/doc/html/jacobi_8hpp.html +++ b/doc/html/jacobi_8hpp.html @@ -99,7 +99,7 @@ Functions
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs

Function Documentation

◆ jacobi_eigensolver()

diff --git a/doc/html/jacobi_8hpp_source.html b/doc/html/jacobi_8hpp_source.html index 98710d5..844b3c8 100644 --- a/doc/html/jacobi_8hpp_source.html +++ b/doc/html/jacobi_8hpp_source.html @@ -93,8 +93,8 @@ $(function() {
46 bool& converged);
47
48#endif
-
jacobi_rotate
void jacobi_rotate(arma::mat &A, arma::mat &R, int k, int l)
Computes a single rotation.
Definition: jacobi.cpp:15
-
jacobi_eigensolver
void jacobi_eigensolver(const arma::mat &A, double eps, arma::vec &eigenvalues, arma::mat &eigenvectors, const int maxiter, int &iterations, bool &converged)
Solves the eigenvalue problem using the jacobi rotation method.
Definition: jacobi.cpp:54
+
jacobi_rotate
void jacobi_rotate(arma::mat &A, arma::mat &R, int k, int l)
Computes a single rotation.
Definition: jacobi.cpp:17
+
jacobi_eigensolver
void jacobi_eigensolver(const arma::mat &A, double eps, arma::vec &eigenvalues, arma::mat &eigenvectors, const int maxiter, int &iterations, bool &converged)
Solves the eigenvalue problem using the jacobi rotation method.
Definition: jacobi.cpp:56
diff --git a/doc/html/main_8cpp.html b/doc/html/main_8cpp.html new file mode 100644 index 0000000..9e64142 --- /dev/null +++ b/doc/html/main_8cpp.html @@ -0,0 +1,115 @@ + + + + + + + +FYS3150: Project 2: main.cpp File Reference + + + + + + + + + +
+
+ + + + + + +
+
FYS3150: Project 2 +
+
+
+ + + + + + + + +
+
+ + +
+
+
+
+
+
Loading...
+
Searching...
+
No Matches
+
+
+
+
+ +
+
+
+Functions
+
main.cpp File Reference
+
+
+ +

Main program for Project 2. +More...

+
#include <cassert>
+#include <cmath>
+#include <iostream>
+#include "utils.hpp"
+#include "matrix.hpp"
+#include "jacobi.hpp"
+
+ + + + + + + + + +

+Functions

+void write_transformation_dense (int N)
 
+void write_transformation_tridiag (int N)
 
+void write_eigenvec (int N)
 
+int main ()
 
+

Detailed Description

+

Main program for Project 2.

+

The program performs the Jacobi rotation method. The size of the matrix, and number of transformations performed are written to file. Eigenvector correstonding to the 3 smallest eigenvalues for matrices of size 6x6 and 100x100 are written to file.

+
Author
Cory Alexander Balaton (coryab)
+
+Janita Ovidie Sandtrøen Willumsen (janitaws)
+
Bug:
No known bugs
+
+ +
+Generated by doxygen 1.9.6 +
+ + diff --git a/doc/html/matrix_8cpp.html b/doc/html/matrix_8cpp.html index 1b45470..19d878d 100644 --- a/doc/html/matrix_8cpp.html +++ b/doc/html/matrix_8cpp.html @@ -99,7 +99,7 @@ Functions
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs

Function Documentation

◆ create_symmetric_tridiagonal()

diff --git a/doc/html/matrix_8hpp.html b/doc/html/matrix_8hpp.html index e57a5cb..58f65a1 100644 --- a/doc/html/matrix_8hpp.html +++ b/doc/html/matrix_8hpp.html @@ -105,7 +105,7 @@ Functions
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs

Function Documentation

◆ create_symmetric_tridiagonal()

diff --git a/doc/html/search/all_4.js b/doc/html/search/all_4.js index e308661..6257d64 100644 --- a/doc/html/search/all_4.js +++ b/doc/html/search/all_4.js @@ -1,6 +1,7 @@ var searchData= [ - ['matrix_2ecpp_0',['matrix.cpp',['../matrix_8cpp.html',1,'']]], - ['matrix_2ehpp_1',['matrix.hpp',['../matrix_8hpp.html',1,'']]], - ['max_5foffdiag_5fsymmetric_2',['max_offdiag_symmetric',['../matrix_8cpp.html#af42e501cbf71bec9c77ececc22723df9',1,'max_offdiag_symmetric(arma::mat &A, int &k, int &l): matrix.cpp'],['../matrix_8hpp.html#af42e501cbf71bec9c77ececc22723df9',1,'max_offdiag_symmetric(arma::mat &A, int &k, int &l): matrix.cpp']]] + ['main_2ecpp_0',['main.cpp',['../main_8cpp.html',1,'']]], + ['matrix_2ecpp_1',['matrix.cpp',['../matrix_8cpp.html',1,'']]], + ['matrix_2ehpp_2',['matrix.hpp',['../matrix_8hpp.html',1,'']]], + ['max_5foffdiag_5fsymmetric_3',['max_offdiag_symmetric',['../matrix_8cpp.html#af42e501cbf71bec9c77ececc22723df9',1,'max_offdiag_symmetric(arma::mat &A, int &k, int &l): matrix.cpp'],['../matrix_8hpp.html#af42e501cbf71bec9c77ececc22723df9',1,'max_offdiag_symmetric(arma::mat &A, int &k, int &l): matrix.cpp']]] ]; diff --git a/doc/html/search/files_1.js b/doc/html/search/files_1.js index 24f90aa..8b81443 100644 --- a/doc/html/search/files_1.js +++ b/doc/html/search/files_1.js @@ -1,5 +1,6 @@ var searchData= [ - ['matrix_2ecpp_0',['matrix.cpp',['../matrix_8cpp.html',1,'']]], - ['matrix_2ehpp_1',['matrix.hpp',['../matrix_8hpp.html',1,'']]] + ['main_2ecpp_0',['main.cpp',['../main_8cpp.html',1,'']]], + ['matrix_2ecpp_1',['matrix.cpp',['../matrix_8cpp.html',1,'']]], + ['matrix_2ehpp_2',['matrix.hpp',['../matrix_8hpp.html',1,'']]] ]; diff --git a/doc/html/test__suite_8cpp.html b/doc/html/test__suite_8cpp.html index 4a1e225..a29c51b 100644 --- a/doc/html/test__suite_8cpp.html +++ b/doc/html/test__suite_8cpp.html @@ -105,7 +105,7 @@ int main ()
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs
diff --git a/doc/html/utils_8cpp.html b/doc/html/utils_8cpp.html index f75b887..7e918bc 100644 --- a/doc/html/utils_8cpp.html +++ b/doc/html/utils_8cpp.html @@ -93,7 +93,7 @@ Functions
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs

Function Documentation

◆ scientific_format() [1/2]

diff --git a/doc/html/utils_8hpp.html b/doc/html/utils_8hpp.html index 56d13d9..efdcc16 100644 --- a/doc/html/utils_8hpp.html +++ b/doc/html/utils_8hpp.html @@ -85,6 +85,7 @@ $(function() {
#include <string>
#include <vector>
#include <iomanip>
+#include <sstream>

Go to the source code of this file.

@@ -109,7 +110,7 @@ Functions
Author
Cory Alexander Balaton (coryab)
Janita Ovidie Sandtrøen Willumsen (janitaws)
-
Bug:
No known bugs
+
Bug:
No known bugs

Macro Definition Documentation

◆ DEBUG

diff --git a/doc/html/utils_8hpp_source.html b/doc/html/utils_8hpp_source.html index d4a1a11..e4a907e 100644 --- a/doc/html/utils_8hpp_source.html +++ b/doc/html/utils_8hpp_source.html @@ -83,21 +83,22 @@ $(function() {
14#include <string>
15#include <vector>
16#include <iomanip>
-
17
-
26#ifdef DBG
-
27 #define DEBUG(msg) std::cout << __FILE__ << " " << __LINE__ << ": " \
-
28 << msg << std::endl
-
29#else
-
30 #define DEBUG(msg)
-
31#endif
-
32
-
46std::string scientific_format(double d, int width=20, int prec=10);
-
47
-
56std::string scientific_format(const std::vector<double>& v,
-
57 int width=20,
-
58 int prec=10);
-
59
-
60#endif
+
17#include <sstream>
+
18
+
27#ifdef DBG
+
28 #define DEBUG(msg) std::cout << __FILE__ << " " << __LINE__ << ": " \
+
29 << msg << std::endl
+
30#else
+
31 #define DEBUG(msg)
+
32#endif
+
33
+
47std::string scientific_format(double d, int width=20, int prec=10);
+
48
+
57std::string scientific_format(const std::vector<double>& v,
+
58 int width=20,
+
59 int prec=10);
+
60
+
61#endif
scientific_format
std::string scientific_format(double d, int width=20, int prec=10)
Turns a double into a string written in scientific format.
Definition: utils.cpp:10