From 94d58294afa7ec78697299ceb778c47ddac3ca93 Mon Sep 17 00:00:00 2001 From: conrad Date: Tue, 8 Mar 2022 15:15:29 +1000 Subject: [PATCH] simplification --- include/armadillo_bits/newarp_SymEigsSolver_meat.hpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/include/armadillo_bits/newarp_SymEigsSolver_meat.hpp b/include/armadillo_bits/newarp_SymEigsSolver_meat.hpp index c6b9bb5c..e73eafbb 100644 --- a/include/armadillo_bits/newarp_SymEigsSolver_meat.hpp +++ b/include/armadillo_bits/newarp_SymEigsSolver_meat.hpp @@ -221,15 +221,13 @@ SymEigsSolver::nev_adjusted(uword nconv) // Adjust nev_new, according to dsaup2.f line 677~684 in ARPACK nev_new += (std::min)(nconv, (ncv - nev_new) / 2); + if(nev_new >= ncv) { nev_new = ncv - 1; } - if(nev_new == 1 && ncv >= 6) + + if(nev_new == 1) { - nev_new = ncv / 2; - } - else - if(nev_new == 1 && ncv > 2) - { - nev_new = 2; + if(ncv >= 6) { nev_new = ncv / 2; } + else if(ncv > 2) { nev_new = 2; } } return nev_new;