print also in case of negative return code

helske · Dec 27, 2024 · 40310dc · 40310dc
1 parent 77f98a1
commit 40310dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/fanhmm_EM.cpp b/src/fanhmm_EM.cpp
@@ -120,7 +120,7 @@ void fanhmm_sc::mstep_A(const double ftol_abs, const double ftol_rel,
         return_code = 7;
       }
     }
-    if (print_level > 2 && return_code > 0) {
+    if (print_level > 2) {
       Rcpp::Rcout<<"M-step of transition probabilities of state "<<s + 1<<
         " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
           " iterations."<<std::endl;
@@ -265,7 +265,7 @@ void fanhmm_sc::mstep_B(const double ftol_abs, const double ftol_rel,
         return_code = 7;
       }
     }
-    if (print_level > 2 && return_code > 0) {
+    if (print_level > 2) {
       Rcpp::Rcout<<"M-step of emission probabilities of state "<<s + 1<<
         " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
           " iterations."<<std::endl;

diff --git a/src/mnhmm_EM.cpp b/src/mnhmm_EM.cpp
@@ -80,7 +80,7 @@ void mnhmm_base::mstep_omega(const double xtol_abs, const double ftol_abs,
       return_code = 7;
     }
   }
-  if (print_level > 2 && return_code > 0) {
+  if (print_level > 2) {
     Rcpp::Rcout<<"M-step of cluster probabilities ended with return code "<<
       return_code<<" after "<<mstep_iter + 1<<" iterations."<<std::endl;
   }
@@ -167,7 +167,7 @@ void mnhmm_base::mstep_pi(const double xtol_abs, const double ftol_abs,
         return_code = 7;
       }
     }
-    if (print_level > 2 && return_code > 0) {
+    if (print_level > 2) {
       Rcpp::Rcout<<"M-step of initial probabilities ended with return code "<<
         return_code<<" after "<<mstep_iter + 1<<" iterations."<<std::endl;
     }
@@ -279,7 +279,7 @@ void mnhmm_base::mstep_A(const double ftol_abs, const double ftol_rel,
           return_code = 7;
         }
       }
-      if (print_level > 2 && return_code > 0) {
+      if (print_level > 2) {
         Rcpp::Rcout<<"M-step of transition probabilities of state "<<s + 1<<
           " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
             " iterations."<<std::endl;
@@ -399,7 +399,7 @@ void mnhmm_sc::mstep_B(const double ftol_abs, const double ftol_rel,
           return_code = 7;
         }
       }
-      if (print_level > 2 && return_code > 0) {
+      if (print_level > 2) {
         Rcpp::Rcout<<"M-step of emission probabilities of state "<<s + 1<<
           " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
             " iterations."<<std::endl;
@@ -525,7 +525,7 @@ void mnhmm_mc::mstep_B(const double ftol_abs, const double ftol_rel,
             return_code = 7;
           }
         }
-        if (print_level > 2 && return_code > 0) {
+        if (print_level > 2) {
           Rcpp::Rcout<<"M-step of emission probabilities of state "<<s + 1<<
             " and channel "<<c<<" ended with return code "<<
               return_code<<" after "<<mstep_iter + 1<<

diff --git a/src/nhmm_EM.cpp b/src/nhmm_EM.cpp
@@ -79,7 +79,7 @@ void nhmm_base::mstep_pi(const double xtol_abs, const double ftol_abs,
       return_code = 7;
     }
   }
-  if (print_level > 2 && return_code > 0) {
+  if (print_level > 2) {
     Rcpp::Rcout<<"M-step of initial probabilities ended with return code "<<
       return_code<<" after "<<mstep_iter + 1<<" iterations."<<std::endl;
   }
@@ -183,7 +183,7 @@ void nhmm_base::mstep_A(const double ftol_abs, const double ftol_rel,
         return_code = 7;
       }
     }
-    if (print_level > 2 && return_code > 0) {
+    if (print_level > 2) {
       Rcpp::Rcout<<"M-step of transition probabilities of state "<<s + 1<<
         " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
           " iterations."<<std::endl;
@@ -294,7 +294,7 @@ void nhmm_sc::mstep_B(const double ftol_abs, const double ftol_rel,
         return_code = 7;
       }
     }
-    if (print_level > 2 && return_code > 0) {
+    if (print_level > 2) {
       Rcpp::Rcout<<"M-step of emission probabilities of state "<<s + 1<<
         " ended with return code "<<return_code<<" after "<<mstep_iter + 1<<
           " iterations."<<std::endl;
@@ -411,7 +411,7 @@ void nhmm_mc::mstep_B(const double ftol_abs, const double ftol_rel,
           return_code = 7;
         }
       }
-      if (print_level > 2 && return_code > 0) {
+      if (print_level > 2) {
         Rcpp::Rcout<<"M-step of emission probabilities of state "<<s + 1<<
           " and channel "<<c<<" ended with return code "<<return_code<<
             " after "<<mstep_iter + 1<<" iterations."<<std::endl;