test both GPR and GJD

felipeZ · Jan 16, 2020 · 2d0ac57 · 2d0ac57
1 parent fd34571
commit 2d0ac57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/algorithms/davidson.rs b/src/algorithms/davidson.rs
@@ -302,7 +302,7 @@ fn is_sorted(xs: &DVector<f64>) -> bool {
 #[cfg(test)]
 mod test {
     extern crate nalgebra as na;
-    use na::{DMatrix, DVector};
+    use na::DMatrix;
 
     #[test]
     fn test_update_subspace() {

diff --git a/tests/tests_davidson.rs b/tests/tests_davidson.rs
@@ -11,16 +11,23 @@ use eigenvalues::utils::sort_eigenpairs;
 fn davidson_eigenvalues() {
     let arr = generate_diagonal_dominant(10, 0.005);
     let eig = sort_eigenpairs(na::linalg::SymmetricEigen::new(arr.clone()));
-    let dav_eig = EigenDavidson::new(arr, 2).unwrap();
-    for i in 0..2 {
+
+    let dav_eig = EigenDavidson::new(arr.clone(), 2, "DPR").unwrap();
+    test_eigenpairs(&eig, dav_eig, 2);
+    let dav_eig = EigenDavidson::new(arr.clone(), 2, "GJD").unwrap();
+    test_eigenpairs(&eig, dav_eig, 2);
+}
+
+fn test_eigenpairs(reference: &na::linalg::SymmetricEigen<f64, na::Dynamic>, dav_eig: EigenDavidson, number: usize) {
+    for i in 0..number {
         // Test Eigenvalues
         assert!(relative_eq!(
-            eig.eigenvalues[i],
+            reference.eigenvalues[i],
             dav_eig.eigenvalues[i],
             epsilon = 1e-8
         ));
         // Test Eigenvectors
-        let x = eig.eigenvectors.column(i);
+        let x = reference.eigenvectors.column(i);
         let y = dav_eig.eigenvectors.column(i);
         // The autovectors may different in their sign
         // They should be either parallel or antiparallel