More informative message en error in loglike (rules)

USCbiostats · Jul 28, 2023 · 7657250 · 7657250
1 parent 2d66932
commit 7657250
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/inst/include/barry/counters/phylo.hpp b/inst/include/barry/counters/phylo.hpp
@@ -2211,7 +2211,13 @@ inline void rule_dyn_limit_changes(
         PhyloRuleDynData(
             support->get_current_stats(),
             pos, lb, ub, duplication
-            )
+            ),
+        std::string("Limiting changes in term ") + 
+            std::to_string(pos) + " to [" + std::to_string(lb) + ", " +
+            std::to_string(ub) + "]",        
+        std::string("When the support is ennumerated, the number of changes in term ") + 
+            std::to_string(pos) + " is limited to [" + std::to_string(lb) + ", " +
+            std::to_string(ub) + "]"
     );
 
     return;

diff --git a/inst/include/barry/model-meat.hpp b/inst/include/barry/model-meat.hpp
@@ -689,7 +689,15 @@ MODEL_TEMPLATE(double, likelihood)(
     // Checking if passes the rules
     if (!support_fun.eval_rules_dyn(target_, 0u, 0u))
     {
-        throw std::range_error("The array is not in the support set.");
+
+        // Concatenating the elements of target_ into aa single string
+        std::string target_str = "";
+        for (uint i = 0u; i < target_.size(); ++i)
+            target_str += std::to_string(target_[i]) + " ";
+
+        throw std::range_error(
+            "The array is not in the support set. The array's statistics are: " + target_str + std::string(".")
+            );
     }
 
 
@@ -749,7 +757,14 @@ MODEL_TEMPLATE(double, likelihood)(
 
         if (!support_fun.eval_rules_dyn(tmp_target, 0u, 0u))
         {
-            throw std::range_error("The array is not in the support set.");
+            // Concatenating the elements of target_ into aa single string
+            std::string target_str = "";
+            for (uint i = 0u; i < params.size(); ++i)
+                target_str += std::to_string((*target_ + i)) + " ";
+
+            throw std::range_error(
+                "The array is not in the support set. The array's statistics are: " + target_str + std::string(".")
+                );
             // return as_log ? -std::numeric_limits<double>::infinity() : 0.0;
         }
 

diff --git a/inst/include/barry/models/geese/geese-meat-likelihood.hpp b/inst/include/barry/models/geese/geese-meat-likelihood.hpp
@@ -142,6 +142,7 @@ inline double Geese::likelihood(
 
                 nstate++;
 
+                // Computing the likelihood of the event.
                 off_mult *= model->likelihood(
                     par0,
                     temp_stats,