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

don't print warnings if status is returned

Browse Source
This commit is contained in:
conrad
2021-03-25 16:39:36 +10:00
parent 97eefbce85
commit 9c621161d5
28 changed files with 77 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_chol.hpp
+1 -1
View File
@@ -61,7 +61,7 @@ chol
if(status == false)
{
out.soft_reset();
arma_debug_warn("chol(): decomposition failed");
arma_extra_warn("chol(): decomposition failed");
}
return status;
include/armadillo_bits/fn_eig_gen.hpp
+3 -3
View File
@@ -83,7 +83,7 @@ eig_gen
if(status == false)
{
eigvals.soft_reset();
arma_debug_warn("eig_gen(): decomposition failed");
arma_extra_warn("eig_gen(): decomposition failed");
}
return status;
@@ -118,7 +118,7 @@ eig_gen
{
eigvals.soft_reset();
eigvecs.soft_reset();
arma_debug_warn("eig_gen(): decomposition failed");
arma_extra_warn("eig_gen(): decomposition failed");
}
return status;
@@ -157,7 +157,7 @@ eig_gen
eigvals.soft_reset();
leigvecs.soft_reset();
reigvecs.soft_reset();
arma_debug_warn("eig_gen(): decomposition failed");
arma_extra_warn("eig_gen(): decomposition failed");
}
return status;
include/armadillo_bits/fn_eig_pair.hpp
+3 -3
View File
@@ -69,7 +69,7 @@ eig_pair
if(status == false)
{
eigvals.soft_reset();
arma_debug_warn("eig_pair(): decomposition failed");
arma_extra_warn("eig_pair(): decomposition failed");
}
return status;
@@ -98,7 +98,7 @@ eig_pair
{
eigvals.soft_reset();
eigvecs.soft_reset();
arma_debug_warn("eig_pair(): decomposition failed");
arma_extra_warn("eig_pair(): decomposition failed");
}
return status;
@@ -131,7 +131,7 @@ eig_pair
eigvals.soft_reset();
leigvecs.soft_reset();
reigvecs.soft_reset();
arma_debug_warn("eig_pair(): decomposition failed");
arma_extra_warn("eig_pair(): decomposition failed");
}
return status;
include/armadillo_bits/fn_eig_sym.hpp
+2 -2
View File
@@ -38,7 +38,7 @@ eig_sym
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eig_sym(): decomposition failed");
arma_extra_warn("eig_sym(): decomposition failed");
}
return status;
@@ -145,7 +145,7 @@ eig_sym
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eig_sym(): decomposition failed");
arma_extra_warn("eig_sym(): decomposition failed");
}
else
{
include/armadillo_bits/fn_eigs_gen.hpp
+6 -6
View File
@@ -177,7 +177,7 @@ eigs_gen
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
@@ -243,7 +243,7 @@ eigs_gen
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
@@ -274,7 +274,7 @@ eigs_gen
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
@@ -310,7 +310,7 @@ eigs_gen
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
@@ -379,7 +379,7 @@ eigs_gen
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
@@ -412,7 +412,7 @@ eigs_gen
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eigs_gen(): decomposition failed");
arma_extra_warn("eigs_gen(): decomposition failed");
}
return status;
include/armadillo_bits/fn_eigs_sym.hpp
+4 -4
View File
@@ -130,7 +130,7 @@ eigs_sym
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eigs_sym(): decomposition failed");
arma_extra_warn("eigs_sym(): decomposition failed");
}
return status;
@@ -185,7 +185,7 @@ eigs_sym
if(status == false)
{
eigval.soft_reset();
arma_debug_warn("eigs_sym(): decomposition failed");
arma_extra_warn("eigs_sym(): decomposition failed");
}
return status;
@@ -219,7 +219,7 @@ eigs_sym
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eigs_sym(): decomposition failed");
arma_extra_warn("eigs_sym(): decomposition failed");
}
return status;
@@ -277,7 +277,7 @@ eigs_sym
{
eigval.soft_reset();
eigvec.soft_reset();
arma_debug_warn("eigs_sym(): decomposition failed");
arma_extra_warn("eigs_sym(): decomposition failed");
}
return status;
include/armadillo_bits/fn_expmat.hpp
+3 -4
View File
@@ -52,12 +52,11 @@ expmat(Mat<typename T1::elem_type>& B, const Base<typename T1::elem_type,T1>& A)
if(status == false)
{
arma_debug_warn("expmat(): given matrix appears ill-conditioned");
B.soft_reset();
return false;
arma_extra_warn("expmat(): given matrix appears ill-conditioned");
}
return true;
return status;
}
@@ -91,7 +90,7 @@ expmat_sym(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>
if(status == false)
{
Y.soft_reset();
arma_debug_warn("expmat_sym(): transformation failed");
arma_extra_warn("expmat_sym(): transformation failed");
}
return status;
include/armadillo_bits/fn_hess.hpp
+2 -2
View File
@@ -48,7 +48,7 @@ hess
if(status == false)
{
H.soft_reset();
arma_debug_warn("hess(): decomposition failed");
arma_extra_warn("hess(): decomposition failed");
}
return status;
@@ -161,7 +161,7 @@ hess
{
U.soft_reset();
H.soft_reset();
arma_debug_warn("hess(): decomposition failed");
arma_extra_warn("hess(): decomposition failed");
}
return status;
include/armadillo_bits/fn_logmat.hpp
+3 -3
View File
@@ -57,7 +57,7 @@ logmat(Mat< std::complex<typename T1::elem_type> >& Y, const Base<typename T1::e
if(status == false)
{
Y.soft_reset();
arma_debug_warn("logmat(): transformation failed");
arma_extra_warn("logmat(): transformation failed");
}
return status;
@@ -77,7 +77,7 @@ logmat(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>& X,
if(status == false)
{
Y.soft_reset();
arma_debug_warn("logmat(): transformation failed");
arma_extra_warn("logmat(): transformation failed");
}
return status;
@@ -114,7 +114,7 @@ logmat_sympd(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T
if(status == false)
{
Y.soft_reset();
arma_debug_warn("logmat_sympd(): transformation failed");
arma_extra_warn("logmat_sympd(): transformation failed");
}
return status;
include/armadillo_bits/fn_lu.hpp
+2 -2
View File
@@ -42,7 +42,7 @@ lu
{
L.soft_reset();
U.soft_reset();
arma_debug_warn("lu(): decomposition failed");
arma_extra_warn("lu(): decomposition failed");
}
return status;
@@ -75,7 +75,7 @@ lu
L.soft_reset();
U.soft_reset();
P.soft_reset();
arma_debug_warn("lu(): decomposition failed");
arma_extra_warn("lu(): decomposition failed");
}
return status;
include/armadillo_bits/fn_orth_null.hpp
+4 -2
View File
@@ -45,7 +45,8 @@ orth(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>& X
if(status == false)
{
arma_debug_warn("orth(): svd failed");
out.soft_reset();
arma_extra_warn("orth(): svd failed");
}
return status;
@@ -83,7 +84,8 @@ null(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>& X
if(status == false)
{
arma_debug_warn("null(): svd failed");
out.soft_reset();
arma_extra_warn("null(): svd failed");
}
return status;
include/armadillo_bits/fn_pinv.hpp
+2 -1
View File
@@ -80,7 +80,8 @@ pinv
if(status == false)
{
arma_debug_warn("pinv(): svd failed");
out.soft_reset();
arma_extra_warn("pinv(): svd failed");
}
return status;
include/armadillo_bits/fn_polyfit.hpp
+1 -1
View File
@@ -36,7 +36,7 @@ polyfit(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>
if(status == false)
{
out.soft_reset();
arma_debug_warn("polyfit(): failed");
arma_extra_warn("polyfit(): failed");
}
return status;
include/armadillo_bits/fn_princomp.hpp
+4 -4
View File
@@ -50,7 +50,7 @@ princomp
latent_out.soft_reset();
tsquared_out.soft_reset();
arma_debug_warn("princomp(): decomposition failed");
arma_extra_warn("princomp(): decomposition failed");
}
return status;
@@ -86,7 +86,7 @@ princomp
score_out.soft_reset();
latent_out.soft_reset();
arma_debug_warn("princomp(): decomposition failed");
arma_extra_warn("princomp(): decomposition failed");
}
return status;
@@ -119,7 +119,7 @@ princomp
coeff_out.soft_reset();
score_out.soft_reset();
arma_debug_warn("princomp(): decomposition failed");
arma_extra_warn("princomp(): decomposition failed");
}
return status;
@@ -149,7 +149,7 @@ princomp
{
coeff_out.soft_reset();
arma_debug_warn("princomp(): decomposition failed");
arma_extra_warn("princomp(): decomposition failed");
}
return status;
include/armadillo_bits/fn_qr.hpp
+3 -3
View File
@@ -42,7 +42,7 @@ qr
{
Q.soft_reset();
R.soft_reset();
arma_debug_warn("qr(): decomposition failed");
arma_extra_warn("qr(): decomposition failed");
}
return status;
@@ -73,7 +73,7 @@ qr_econ
{
Q.soft_reset();
R.soft_reset();
arma_debug_warn("qr_econ(): decomposition failed");
arma_extra_warn("qr_econ(): decomposition failed");
}
return status;
@@ -132,7 +132,7 @@ qr
Q.soft_reset();
R.soft_reset();
P.soft_reset();
arma_debug_warn("qr(): decomposition failed");
arma_extra_warn("qr(): decomposition failed");
}
return status;
include/armadillo_bits/fn_qz.hpp
+1 -1
View File
@@ -53,7 +53,7 @@ qz
BB.soft_reset();
Q.soft_reset();
Z.soft_reset();
arma_debug_warn("qz(): decomposition failed");
arma_extra_warn("qz(): decomposition failed");
}
return status;
include/armadillo_bits/fn_roots.hpp
+5 -1
View File
@@ -51,7 +51,11 @@ roots(Mat< std::complex<typename T1::pod_type> >& out, const Base<typename T1::e
const bool status = op_roots::apply_direct(out, X.get_ref());
if(status == false) { arma_debug_warn("roots(): eigen decomposition failed"); }
if(status == false)
{
out.soft_reset();
arma_extra_warn("roots(): eigen decomposition failed");
}
return status;
}
include/armadillo_bits/fn_schur.hpp
+2 -2
View File
@@ -40,7 +40,7 @@ schur
if(status == false)
{
S.soft_reset();
arma_debug_warn("schur(): decomposition failed");
arma_extra_warn("schur(): decomposition failed");
}
return status;
@@ -101,7 +101,7 @@ schur
{
U.soft_reset();
S.soft_reset();
arma_debug_warn("schur(): decomposition failed");
arma_extra_warn("schur(): decomposition failed");
}
return status;
include/armadillo_bits/fn_sqrtmat.hpp
+3 -3
View File
@@ -56,7 +56,7 @@ sqrtmat(Mat< std::complex<typename T1::elem_type> >& Y, const Base<typename T1::
if(status == false)
{
arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
}
return status;
@@ -75,7 +75,7 @@ sqrtmat(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>& X
if(status == false)
{
arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
}
return status;
@@ -112,7 +112,7 @@ sqrtmat_sympd(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,
if(status == false)
{
Y.soft_reset();
arma_debug_warn("sqrtmat_sympd(): transformation failed");
arma_extra_warn("sqrtmat_sympd(): transformation failed");
}
return status;
include/armadillo_bits/fn_svd.hpp
+3 -3
View File
@@ -41,7 +41,7 @@ svd
if(status == false)
{
S.soft_reset();
arma_debug_warn("svd(): decomposition failed");
arma_extra_warn("svd(): decomposition failed");
}
return status;
@@ -119,7 +119,7 @@ svd
U.soft_reset();
S.soft_reset();
V.soft_reset();
arma_debug_warn("svd(): decomposition failed");
arma_extra_warn("svd(): decomposition failed");
}
return status;
@@ -171,7 +171,7 @@ svd_econ
U.soft_reset();
S.soft_reset();
V.soft_reset();
arma_debug_warn("svd_econ(): decomposition failed");
arma_extra_warn("svd_econ(): decomposition failed");
}
return status;
include/armadillo_bits/fn_svds.hpp
+2 -2
View File
@@ -282,7 +282,7 @@ svds
const bool status = svds_helper(U, S, V, X.get_ref(), k, tol, true);
if(status == false) { arma_debug_warn("svds(): decomposition failed"); }
if(status == false) { arma_extra_warn("svds(): decomposition failed"); }
return status;
}
@@ -310,7 +310,7 @@ svds
const bool status = svds_helper(U, S, V, X.get_ref(), k, tol, false);
if(status == false) { arma_debug_warn("svds(): decomposition failed"); }
if(status == false) { arma_extra_warn("svds(): decomposition failed"); }
return status;
}
include/armadillo_bits/fn_sylvester.hpp
+1 -1
View File
@@ -49,7 +49,7 @@ syl
if(status == false)
{
out.soft_reset();
arma_debug_warn("syl(): solution not found");
arma_extra_warn("syl(): solution not found");
}
return status;
include/armadillo_bits/op_orth_null_meat.hpp
+4 -2
View File
@@ -35,6 +35,7 @@ op_orth::apply(Mat<typename T1::elem_type>& out, const Op<T1, op_orth>& expr)
if(status == false)
{
out.soft_reset();
arma_stop_runtime_error("orth(): svd failed");
}
}
@@ -63,7 +64,7 @@ op_orth::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
V.reset();
if(status == false) { out.soft_reset(); return false; }
if(status == false) { return false; }
if(s.is_empty()) { out.reset(); return true; }
@@ -110,6 +111,7 @@ op_null::apply(Mat<typename T1::elem_type>& out, const Op<T1, op_null>& expr)
if(status == false)
{
out.soft_reset();
arma_stop_runtime_error("null(): svd failed");
}
}
@@ -138,7 +140,7 @@ op_null::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
U.reset();
if(status == false) { out.soft_reset(); return false; }
if(status == false) { return false; }
if(s.is_empty()) { out.reset(); return true; }
include/armadillo_bits/op_pinv_meat.hpp
+2 -1
View File
@@ -36,6 +36,7 @@ op_pinv::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_pinv>& in)
if(status == false)
{
out.soft_reset();
arma_stop_runtime_error("pinv(): svd failed");
}
}
@@ -96,7 +97,7 @@ op_pinv::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
const bool status = (method_id == uword(2)) ? auxlib::svd_dc_econ(U, s, V, A) : auxlib::svd_econ(U, s, V, A, 'b');
if(status == false) { out.soft_reset(); return false; }
if(status == false) { return false; }
const uword s_n_elem = s.n_elem;
const T* s_mem = s.memptr();
include/armadillo_bits/op_roots_meat.hpp
+5 -3
View File
@@ -28,7 +28,11 @@ op_roots::apply(Mat< std::complex<typename T1::pod_type> >& out, const mtOp<std:
const bool status = op_roots::apply_direct(out, expr.m);
if(status == false) { arma_stop_runtime_error("roots(): eigen decomposition failed"); }
if(status == false)
{
out.soft_reset();
arma_stop_runtime_error("roots(): eigen decomposition failed");
}
}
@@ -59,8 +63,6 @@ op_roots::apply_direct(Mat< std::complex<typename T1::pod_type> >& out, const Ba
status = op_roots::apply_noalias(out, U.M);
}
if(status == false) { out.soft_reset(); }
return status;
}
include/armadillo_bits/op_sqrtmat_meat.hpp
+2 -2
View File
@@ -38,7 +38,7 @@ op_sqrtmat::apply(Mat< std::complex<typename T1::elem_type> >& out, const mtOp<s
if(status == false)
{
arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
}
}
@@ -225,7 +225,7 @@ op_sqrtmat_cx::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_sqrtmat_cx
if(status == false)
{
arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
}
}
include/armadillo_bits/running_stat_meat.hpp
+2 -2
View File
@@ -162,7 +162,7 @@ running_stat<eT>::operator() (const typename running_stat<eT>::T sample)
if( arma_isfinite(sample) == false )
{
arma_debug_warn("running_stat: sample ignored as it is non-finite" );
arma_extra_warn("running_stat: sample ignored as it is non-finite" );
return;
}
@@ -181,7 +181,7 @@ running_stat<eT>::operator() (const std::complex< typename running_stat<eT>::T >
if( arma_isfinite(sample) == false )
{
arma_debug_warn("running_stat: sample ignored as it is non-finite" );
arma_extra_warn("running_stat: sample ignored as it is non-finite" );
return;
}
include/armadillo_bits/running_stat_vec_meat.hpp
+2 -2
View File
@@ -99,7 +99,7 @@ running_stat_vec<obj_type>::operator() (const Base<typename running_stat_vec<obj
if( sample.is_finite() == false )
{
arma_debug_warn("running_stat_vec: sample ignored as it has non-finite elements");
arma_extra_warn("running_stat_vec: sample ignored as it has non-finite elements");
return;
}
@@ -128,7 +128,7 @@ running_stat_vec<obj_type>::operator() (const Base< std::complex<typename runnin
if( sample.is_finite() == false )
{
arma_debug_warn("running_stat_vec: sample ignored as it has non-finite elements");
arma_extra_warn("running_stat_vec: sample ignored as it has non-finite elements");
return;
}