From 3199376bbf9126aa46bbf92d2f55edc0d577a7ee Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 20 Jun 2025 13:03:29 +1000 Subject: [PATCH] simplify 'arma_isfinite(x) == false' to 'arma_isnonfinite(x)' --- include/armadillo_bits/BaseCube_meat.hpp | 4 ++-- include/armadillo_bits/Base_meat.hpp | 8 ++++---- include/armadillo_bits/SpBase_meat.hpp | 4 ++-- include/armadillo_bits/arma_ostream_meat.hpp | 4 ++-- include/armadillo_bits/arrayops_meat.hpp | 6 +++--- include/armadillo_bits/fn_find.hpp | 2 +- include/armadillo_bits/fn_misc.hpp | 2 +- include/armadillo_bits/glue_mvnrnd_meat.hpp | 4 ++-- include/armadillo_bits/gmm_diag_meat.hpp | 6 +++--- include/armadillo_bits/gmm_full_meat.hpp | 4 ++-- include/armadillo_bits/op_expmat_meat.hpp | 2 +- include/armadillo_bits/op_find_meat.hpp | 4 ++-- include/armadillo_bits/op_hist_meat.hpp | 4 ++-- include/armadillo_bits/op_norm2est_meat.hpp | 8 ++++---- include/armadillo_bits/running_stat_meat.hpp | 8 ++++---- include/armadillo_bits/running_stat_vec_meat.hpp | 4 ++-- include/armadillo_bits/sym_helper.hpp | 16 ++++++++-------- 17 files changed, 45 insertions(+), 45 deletions(-) diff --git a/include/armadillo_bits/BaseCube_meat.hpp b/include/armadillo_bits/BaseCube_meat.hpp index 7fbf7f67..a106f8e3 100644 --- a/include/armadillo_bits/BaseCube_meat.hpp +++ b/include/armadillo_bits/BaseCube_meat.hpp @@ -328,7 +328,7 @@ BaseCube::is_finite() const for(uword c=0; c::has_nonfinite() const for(uword c=0; c::is_finite() const for(uword i=0; i::is_finite() const for(uword col=0; col::has_nonfinite() const for(uword i=0; i::has_nonfinite() const for(uword col=0; col::is_finite() const while(it != it_end) { - if(arma_isfinite(*it) == false) { return false; } + if(arma_isnonfinite(*it)) { return false; } ++it; } } @@ -850,7 +850,7 @@ SpBase::has_nonfinite() const while(it != it_end) { - if(arma_isfinite(*it) == false) { return true; } + if(arma_isnonfinite(*it)) { return true; } ++it; } } diff --git a/include/armadillo_bits/arma_ostream_meat.hpp b/include/armadillo_bits/arma_ostream_meat.hpp index bf79a1b7..f6acf572 100644 --- a/include/armadillo_bits/arma_ostream_meat.hpp +++ b/include/armadillo_bits/arma_ostream_meat.hpp @@ -70,7 +70,7 @@ arma_ostream::modify_stream(std::ostream& o, const eT* data, const uword n_elem) { const eT val = data[i]; - if(arma_isfinite(val) == false) { continue; } + if(arma_isnonfinite(val)) { continue; } if( ( cond_rel< (sizeof(eT) > 4) && (is_same_type::yes || is_same_type::yes) >::geq(val, eT(+10000000000)) ) @@ -208,7 +208,7 @@ arma_ostream::modify_stream(std::ostream& o, typename SpMat::const_iterator { const eT val = (*it); - if(arma_isfinite(val) == false) { continue; } + if(arma_isnonfinite(val)) { continue; } if( val >= eT(+100) || diff --git a/include/armadillo_bits/arrayops_meat.hpp b/include/armadillo_bits/arrayops_meat.hpp index 825a292b..d20f958b 100644 --- a/include/armadillo_bits/arrayops_meat.hpp +++ b/include/armadillo_bits/arrayops_meat.hpp @@ -1050,13 +1050,13 @@ arrayops::is_finite(const eT* src, const uword n_elem) const eT val_i = (*src); src++; const eT val_j = (*src); src++; - if(arma_isfinite(val_i) == false) { return false; } - if(arma_isfinite(val_j) == false) { return false; } + if(arma_isnonfinite(val_i)) { return false; } + if(arma_isnonfinite(val_j)) { return false; } } if((j-1) < n_elem) { - if(arma_isfinite(*src) == false) { return false; } + if(arma_isnonfinite(*src)) { return false; } } return true; diff --git a/include/armadillo_bits/fn_find.hpp b/include/armadillo_bits/fn_find.hpp index 71bd9a5a..588389cd 100644 --- a/include/armadillo_bits/fn_find.hpp +++ b/include/armadillo_bits/fn_find.hpp @@ -437,7 +437,7 @@ find_nonfinite(const SpBase& X) for(uword i=0; i::log_min) || (arma_isfinite(negdelta) == false) ) + if( (negdelta < Datum::log_min) || arma_isnonfinite(negdelta) ) { return log_a; } diff --git a/include/armadillo_bits/glue_mvnrnd_meat.hpp b/include/armadillo_bits/glue_mvnrnd_meat.hpp index 4b61820b..62f15f6f 100644 --- a/include/armadillo_bits/glue_mvnrnd_meat.hpp +++ b/include/armadillo_bits/glue_mvnrnd_meat.hpp @@ -139,13 +139,13 @@ glue_mvnrnd::apply_noalias(Mat& out, const Mat& M, const Mat& C, con const eT tol = eT(-100) * Datum::eps * norm(C, "fro"); - if(arma_isfinite(tol) == false) { return false; } + if(arma_isnonfinite(tol)) { return false; } for(uword i=0; i::em_iterate(const Mat& X, const uword max_iter, const eT var_fl get_cout_stream().flush(); } - if(arma_isfinite(new_avg_log_p) == false) { return false; } + if(arma_isnonfinite(new_avg_log_p)) { return false; } if(std::abs(old_avg_log_p - new_avg_log_p) <= Datum::eps) { break; } @@ -2473,7 +2473,7 @@ gmm_diag::em_update_params { const eT acc_norm_lhood = (std::max)( final_acc_norm_lhoods[g], std::numeric_limits::min() ); - if(arma_isfinite(acc_norm_lhood) == false) { continue; } + if(arma_isnonfinite(acc_norm_lhood)) { continue; } eT* acc_mean_mem = final_acc_means.colptr(g); eT* acc_dcov_mem = final_acc_dcovs.colptr(g); @@ -2488,7 +2488,7 @@ gmm_diag::em_update_params acc_mean_mem[d] = tmp1; acc_dcov_mem[d] = tmp2; - if(arma_isfinite(tmp2) == false) { ok = false; } + if(arma_isnonfinite(tmp2)) { ok = false; } } diff --git a/include/armadillo_bits/gmm_full_meat.hpp b/include/armadillo_bits/gmm_full_meat.hpp index 7ce1a009..736d0bd3 100644 --- a/include/armadillo_bits/gmm_full_meat.hpp +++ b/include/armadillo_bits/gmm_full_meat.hpp @@ -2392,7 +2392,7 @@ gmm_full::em_iterate(const Mat& X, const uword max_iter, const eT var_fl get_cout_stream().flush(); } - if(arma_isfinite(new_avg_log_p) == false) { return false; } + if(arma_isnonfinite(new_avg_log_p)) { return false; } if(std::abs(old_avg_log_p - new_avg_log_p) <= Datum::eps) { break; } @@ -2516,7 +2516,7 @@ gmm_full::em_update_params { const eT acc_norm_lhood = (std::max)( final_acc_norm_lhoods[g], std::numeric_limits::min() ); - if(arma_isfinite(acc_norm_lhood) == false) { continue; } + if(arma_isnonfinite(acc_norm_lhood)) { continue; } eT* acc_mean_mem = final_acc_means.colptr(g); diff --git a/include/armadillo_bits/op_expmat_meat.hpp b/include/armadillo_bits/op_expmat_meat.hpp index 9377d8e1..578fc1ef 100644 --- a/include/armadillo_bits/op_expmat_meat.hpp +++ b/include/armadillo_bits/op_expmat_meat.hpp @@ -120,7 +120,7 @@ op_expmat::apply_direct(Mat& out, const Base& out, const mtOp& out, const mtOp& out, const Mat& A, const uword n_bins, co max_val += (n_bins/2); } - if(arma_isfinite(min_val) == false) { min_val = priv::most_neg(); } - if(arma_isfinite(max_val) == false) { max_val = priv::most_pos(); } + if(arma_isnonfinite(min_val)) { min_val = priv::most_neg(); } + if(arma_isnonfinite(max_val)) { max_val = priv::most_pos(); } Col c(n_bins, arma_nozeros_indicator()); eT* c_mem = c.memptr(); diff --git a/include/armadillo_bits/op_norm2est_meat.hpp b/include/armadillo_bits/op_norm2est_meat.hpp index bf7d4497..953cb168 100644 --- a/include/armadillo_bits/op_norm2est_meat.hpp +++ b/include/armadillo_bits/op_norm2est_meat.hpp @@ -138,7 +138,7 @@ op_norm2est::norm2est T x_norm = op_norm::vec_norm_2( Proxy< Col >(x) ); - if(x_norm == T(0) || (arma_isfinite(x_norm) == false) || (x.internal_has_nonfinite())) + if( (x_norm == T(0)) || arma_isnonfinite(x_norm) || x.internal_has_nonfinite() ) { randu_filler.fill(x.memptr(), x.n_elem); @@ -155,7 +155,7 @@ op_norm2est::norm2est arma_debug_print(arma_str::format("norm2est(): est_old: %e") % est_old); arma_debug_print(arma_str::format("norm2est(): est_cur: %e") % est_cur); - if(arma_isfinite(est_cur) == false) { return est_old; } + if(arma_isnonfinite(est_cur)) { return est_old; } if( ((std::abs)(est_cur - est_old)) <= (tol * (std::max)(est_cur,est_old)) ) { break; } } @@ -218,7 +218,7 @@ op_norm2est::norm2est T x_norm = op_norm::vec_norm_2( Proxy< Mat >(x) ); - if(x_norm == T(0) || (arma_isfinite(x_norm) == false) || (x.internal_has_nonfinite())) + if( (x_norm == T(0)) || arma_isnonfinite(x_norm) || x.internal_has_nonfinite() ) { randu_filler.fill(x.memptr(), x.n_elem); @@ -235,7 +235,7 @@ op_norm2est::norm2est arma_debug_print(arma_str::format("norm2est(): est_old: %e") % est_old); arma_debug_print(arma_str::format("norm2est(): est_cur: %e") % est_cur); - if(arma_isfinite(est_cur) == false) { return est_old; } + if(arma_isnonfinite(est_cur)) { return est_old; } if( ((std::abs)(est_cur - est_old)) <= (tol * (std::max)(est_cur,est_old)) ) { break; } } diff --git a/include/armadillo_bits/running_stat_meat.hpp b/include/armadillo_bits/running_stat_meat.hpp index 00f73deb..9c3997f9 100644 --- a/include/armadillo_bits/running_stat_meat.hpp +++ b/include/armadillo_bits/running_stat_meat.hpp @@ -162,9 +162,9 @@ running_stat::operator() (const typename running_stat::T sample) { arma_debug_sigprint(); - if( arma_isfinite(sample) == false ) + if(arma_isnonfinite(sample)) { - arma_warn(3, "running_stat: sample ignored as it is non-finite" ); + arma_warn(3, "running_stat: non-finite sample ignored" ); return; } @@ -181,9 +181,9 @@ running_stat::operator() (const std::complex< typename running_stat::T > { arma_debug_sigprint(); - if( arma_isfinite(sample) == false ) + if(arma_isnonfinite(sample)) { - arma_warn(3, "running_stat: sample ignored as it is non-finite" ); + arma_warn(3, "running_stat: non-finite sample ignored" ); return; } diff --git a/include/armadillo_bits/running_stat_vec_meat.hpp b/include/armadillo_bits/running_stat_vec_meat.hpp index d949ac81..b40272e7 100644 --- a/include/armadillo_bits/running_stat_vec_meat.hpp +++ b/include/armadillo_bits/running_stat_vec_meat.hpp @@ -100,7 +100,7 @@ running_stat_vec::operator() (const Base::operator() (const Base< std::complex& A) { const eT A_jj = A_col[j]; - if( A_jj <= eT(0)) { return false; } - if(arma_isfinite(A_jj) == false) { return false; } + if( A_jj <= eT(0)) { return false; } + if(arma_isnonfinite(A_jj)) { return false; } if(A_jj >= tol) { diag_below_tol = false; } @@ -147,8 +147,8 @@ guess_sympd_worker(const Mat& A) const T A_jj_rabs = std::abs(A_jj_r); const T A_jj_iabs = std::abs(A_jj_i); - if( A_jj_r <= T(0) ) { return false; } // real should be positive - if(arma_isfinite(A_jj_r) == false) { return false; } + if( A_jj_r <= T(0) ) { return false; } // real should be positive + if(arma_isnonfinite(A_jj_r)) { return false; } if(A_jj_iabs > tol ) { return false; } // imag should be approx zero if(A_jj_iabs > A_jj_rabs) { return false; } // corner case: real and imag are close to zero, and imag is dominant @@ -164,7 +164,7 @@ guess_sympd_worker(const Mat& A) const T square_max_diag = max_diag * max_diag; - if(arma_isfinite(square_max_diag) == false) { return false; } + if(arma_isnonfinite(square_max_diag)) { return false; } A_col = A_mem; @@ -188,7 +188,7 @@ guess_sympd_worker(const Mat& A) // avoid using std::abs(), as that is time consuming due to division and std::sqrt() const T square_A_ij_abs = (A_ij_real * A_ij_real) + (A_ij_imag * A_ij_imag); - if(arma_isfinite(square_A_ij_abs) == false) { return false; } + if(arma_isnonfinite(square_A_ij_abs)) { return false; } if(square_A_ij_abs >= square_max_diag) { return false; } @@ -285,7 +285,7 @@ is_approx_sym_worker(const Mat& A) { const eT A_jj = A_col[j]; - if(arma_isfinite(A_jj) == false) { return false; } + if(arma_isnonfinite(A_jj)) { return false; } if(std::abs(A_jj) >= tol) { diag_below_tol = false; } @@ -359,7 +359,7 @@ is_approx_sym_worker(const Mat& A) if(A_jj_iabs > tol ) { return false; } // imag should be approx zero if(A_jj_iabs > A_jj_rabs) { return false; } // corner case: real and imag are close to zero, and imag is dominant - if(arma_isfinite(A_jj_r) == false) { return false; } + if(arma_isnonfinite(A_jj_r)) { return false; } if(A_jj_rabs >= tol) { diag_below_tol = false; }