Eigenvalues module: Implement setMaxIterations() methods.

4 files changed, 14 insertions, 10 deletions

diff --git a/test/eigensolver_complex.cpp b/test/eigensolver_complex.cpp
index a569d8507..aef125739 100644
--- a/test/eigensolver_complex.cpp
+++ b/test/eigensolver_complex.cpp
@@ -60,13 +60,14 @@ template<typename MatrixType> void eigensolver(const MatrixType& m)
   verify_is_approx_upto_permutation(a.eigenvalues(), ei1.eigenvalues());
 
   ComplexEigenSolver<MatrixType> ei2;
-  ei2.compute(a, true, ComplexSchur<MatrixType>::m_maxIterations * rows);
+  ei2.setMaxIterations(ComplexSchur<MatrixType>::m_maxIterationsPerRow * rows).compute(a);
   VERIFY_IS_EQUAL(ei2.info(), Success);
   VERIFY_IS_EQUAL(ei2.eigenvectors(), ei1.eigenvectors());
   VERIFY_IS_EQUAL(ei2.eigenvalues(), ei1.eigenvalues());
   if (rows > 2) {
-    ei2.compute(a, true, 1);
+    ei2.setMaxIterations(1).compute(a);
     VERIFY_IS_EQUAL(ei2.info(), NoConvergence);
+    VERIFY_IS_EQUAL(ei2.getMaxIterations(), 1);
   }
 
   ComplexEigenSolver<MatrixType> eiNoEivecs(a, false);
diff --git a/test/eigensolver_generic.cpp b/test/eigensolver_generic.cpp
index 1b83afbc4..ef499a989 100644
--- a/test/eigensolver_generic.cpp
+++ b/test/eigensolver_generic.cpp
@@ -46,13 +46,14 @@ template<typename MatrixType> void eigensolver(const MatrixType& m)
   VERIFY_IS_APPROX(a.eigenvalues(), ei1.eigenvalues());
 
   EigenSolver<MatrixType> ei2;
-  ei2.compute(a, true, RealSchur<MatrixType>::m_maxIterations * rows);
+  ei2.setMaxIterations(RealSchur<MatrixType>::m_maxIterationsPerRow * rows).compute(a);
   VERIFY_IS_EQUAL(ei2.info(), Success);
   VERIFY_IS_EQUAL(ei2.eigenvectors(), ei1.eigenvectors());
   VERIFY_IS_EQUAL(ei2.eigenvalues(), ei1.eigenvalues());
   if (rows > 2) {
-    ei2.compute(a, true, 1);
+    ei2.setMaxIterations(1).compute(a);
     VERIFY_IS_EQUAL(ei2.info(), NoConvergence);
+    VERIFY_IS_EQUAL(ei2.getMaxIterations(), 1);
   }
 
   EigenSolver<MatrixType> eiNoEivecs(a, false);
diff --git a/test/schur_complex.cpp b/test/schur_complex.cpp
index 4d5cbbfdf..5e869790f 100644
--- a/test/schur_complex.cpp
+++ b/test/schur_complex.cpp
@@ -49,16 +49,17 @@ template<typename MatrixType> void schur(int size = MatrixType::ColsAtCompileTim
 
   // Test maximum number of iterations
   ComplexSchur<MatrixType> cs3;
-  cs3.compute(A, true, ComplexSchur<MatrixType>::m_maxIterations * size);
+  cs3.setMaxIterations(ComplexSchur<MatrixType>::m_maxIterationsPerRow * size).compute(A);
   VERIFY_IS_EQUAL(cs3.info(), Success);
   VERIFY_IS_EQUAL(cs3.matrixT(), cs1.matrixT());
   VERIFY_IS_EQUAL(cs3.matrixU(), cs1.matrixU());
-  cs3.compute(A, true, 1);
+  cs3.setMaxIterations(1).compute(A);
   VERIFY_IS_EQUAL(cs3.info(), size > 1 ? NoConvergence : Success);
+  VERIFY_IS_EQUAL(cs3.getMaxIterations(), 1);
 
   MatrixType Atriangular = A;
   Atriangular.template triangularView<StrictlyLower>().setZero(); 
-  cs3.compute(Atriangular, true, 1); // triangular matrices do not need any iterations
+  cs3.setMaxIterations(1).compute(Atriangular); // triangular matrices do not need any iterations
   VERIFY_IS_EQUAL(cs3.info(), Success);
   VERIFY_IS_EQUAL(cs3.matrixT(), Atriangular.template cast<ComplexScalar>());
   VERIFY_IS_EQUAL(cs3.matrixU(), ComplexMatrixType::Identity(size, size));
diff --git a/test/schur_real.cpp b/test/schur_real.cpp
index e81a28d7d..36b9c24d1 100644
--- a/test/schur_real.cpp
+++ b/test/schur_real.cpp
@@ -68,18 +68,19 @@ template<typename MatrixType> void schur(int size = MatrixType::ColsAtCompileTim
 
   // Test maximum number of iterations
   RealSchur<MatrixType> rs3;
-  rs3.compute(A, true, RealSchur<MatrixType>::m_maxIterations * size);
+  rs3.setMaxIterations(RealSchur<MatrixType>::m_maxIterationsPerRow * size).compute(A);
   VERIFY_IS_EQUAL(rs3.info(), Success);
   VERIFY_IS_EQUAL(rs3.matrixT(), rs1.matrixT());
   VERIFY_IS_EQUAL(rs3.matrixU(), rs1.matrixU());
   if (size > 2) {
-    rs3.compute(A, true, 1);
+    rs3.setMaxIterations(1).compute(A);
     VERIFY_IS_EQUAL(rs3.info(), NoConvergence);
+    VERIFY_IS_EQUAL(rs3.getMaxIterations(), 1);
   }
 
   MatrixType Atriangular = A;
   Atriangular.template triangularView<StrictlyLower>().setZero(); 
-  rs3.compute(Atriangular, true, 1); // triangular matrices do not need any iterations
+  rs3.setMaxIterations(1).compute(Atriangular); // triangular matrices do not need any iterations
   VERIFY_IS_EQUAL(rs3.info(), Success);
   VERIFY_IS_EQUAL(rs3.matrixT(), Atriangular);
   VERIFY_IS_EQUAL(rs3.matrixU(), MatrixType::Identity(size, size));