phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplifications

Browse Source
This commit is contained in:
conrad
2022-04-20 13:46:03 +10:00
parent feb77ffa97
commit 281cbf4a79
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_spsolve.hpp
+2 -2
View File
@@ -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<T>::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;
include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp
+1 -2
View File
@@ -74,8 +74,7 @@ SparseGenRealShiftSolve<eT>::SparseGenRealShiftSolve(const SpMat<eT>& mat_obj, c
if( (x_rcond < std::numeric_limits<eT>::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;
}
include/armadillo_bits/sp_auxlib_meat.hpp
+3 -3
View File
@@ -1424,13 +1424,13 @@ sp_auxlib::spsolve_refine(Mat<typename T1::elem_type>& 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<eT>::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;
}