diff --git a/include/armadillo_bits/fn_spsolve.hpp b/include/armadillo_bits/fn_spsolve.hpp index 7b71347d..31f9951b 100644 --- a/include/armadillo_bits/fn_spsolve.hpp +++ b/include/armadillo_bits/fn_spsolve.hpp @@ -111,12 +111,12 @@ spsolve_helper if( (status == false) && (rcond > T(0)) ) { - arma_debug_warn_level(2, "spsolve(): system is singular (rcond: ", rcond, ")"); + arma_debug_warn_level(2, "spsolve(): system is singular; rcond: ", rcond); } if( (status == true) && (rcond > T(0)) && (rcond < std::numeric_limits::epsilon()) ) { - arma_debug_warn_level(2, "solve(): solution computed, but system is singular to working precision (rcond: ", rcond, ")"); + arma_debug_warn_level(2, "solve(): solution computed, but system is singular to working precision; rcond: ", rcond); } return status; diff --git a/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp b/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp index 5d85517b..1317bf91 100644 --- a/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp +++ b/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp @@ -74,8 +74,7 @@ SparseGenRealShiftSolve::SparseGenRealShiftSolve(const SpMat& mat_obj, c if( (x_rcond < std::numeric_limits::epsilon()) || arma_isnan(x_rcond) ) { - if(x_rcond > eT(0)) { arma_debug_warn_level(2, "matrix is singular to working precision (rcond: ", x_rcond, ")"); } - else { arma_debug_warn_level(2, "matrix is singular to working precision"); } + arma_debug_warn_level(2, "matrix is singular to working precision; rcond: ", x_rcond); return; } diff --git a/include/armadillo_bits/sp_auxlib_meat.hpp b/include/armadillo_bits/sp_auxlib_meat.hpp index 4ee8efaf..4ad92a42 100644 --- a/include/armadillo_bits/sp_auxlib_meat.hpp +++ b/include/armadillo_bits/sp_auxlib_meat.hpp @@ -1424,13 +1424,13 @@ sp_auxlib::spsolve_refine(Mat& X, typename T1::pod_type& else if( (info == int(A.n_cols+1)) && (user_opts.allow_ugly) ) { - arma_debug_warn_level(2, "spsolve(): system is singular to working precision (rcond: ", rcond, ")"); + arma_debug_warn_level(2, "spsolve(): system is singular to working precision; rcond: ", rcond); status = true; } else if(info > int(A.n_cols+1)) { - arma_debug_warn_level(1, "spsolve(): memory allocation failure: could not allocate ", (info - int(A.n_cols)), " bytes"); + arma_debug_warn_level(1, "spsolve(): memory allocation failure"); } else if(info < 0) @@ -2293,7 +2293,7 @@ sp_auxlib::run_aupd_shiftinvert if( (x_rcond < std::numeric_limits::epsilon()) || arma_isnan(x_rcond) ) { - arma_debug_warn_level(2, "matrix is singular to working precision (rcond: ", x_rcond, ")"); + arma_debug_warn_level(2, "matrix is singular to working precision; rcond: ", x_rcond); info = blas_int(-1); return; }