fix bugs

NOAA-FIMS · Jun 1, 2024 · 64ecf39 · 64ecf39
1 parent 083ca6e
commit 64ecf39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/inst/include/distributions/functors/density_components_base.hpp b/inst/include/distributions/functors/density_components_base.hpp
@@ -18,6 +18,7 @@
 #include "../../common/model_object.hpp"
 #include "../../interface/interface.hpp"
 #include "../../common/fims_vector.hpp"
+#include "../../common/fims_math.hpp"
 
 namespace fims_distributions {
 

diff --git a/inst/include/distributions/functors/lognormal_lpdf.hpp b/inst/include/distributions/functors/lognormal_lpdf.hpp
@@ -17,6 +17,9 @@ namespace fims_distributions
         fims::Vector<Type> mu;
         fims::Vector<Type> sd;
         std::vector<bool> is_na;
+        #ifdef TMB_MODEL
+        ::objective_function<Type> *of;
+        #endif
         Type nll = 0.0;
         // data_indicator<tmbutils::vector<Type> , Type> keep;
 
@@ -44,11 +47,11 @@ namespace fims_distributions
 
                 if (log_sd.size() == 1)
                 {
-                    sd[i] = exp(log_sd[0]);
+                    sd[i] = fims_math::exp(log_sd[0]);
                 }
                 else
                 {
-                    sd[i] = exp(log_sd[i]);
+                    sd[i] = fims_math::exp(log_sd[i]);
                 }
             }
             this->nll_vec.resize(this->observed_values.size());
@@ -65,7 +68,7 @@ namespace fims_distributions
                     FIMS_SIMULATE_F(this->of)
                     { // preprocessor definition in interface.hpp
                         // this simulates data that is mean biased
-                        this->observed_values[i] = exp(rnorm(mu[i], sd[i]));
+                        this->observed_values[i] = fims_math::exp(rnorm(mu[i], sd[i]));
                     }
                 }
                 #endif

diff --git a/inst/include/distributions/functors/normal_lpdf.hpp b/inst/include/distributions/functors/normal_lpdf.hpp
@@ -37,9 +37,9 @@ struct NormalLPDF : public DensityComponentBase<Type> {
                 this->mu[i] = this->expected_values[i];
             }
             if(log_sd.size() == 1){
-                sd[i] = exp(log_sd[0]);
+                sd[i] = fims_math::exp(log_sd[0]);
             } else {
-                sd[i] = exp(log_sd[i]);
+                sd[i] = fims_math::exp(log_sd[i]);
             }
         }
         this->nll_vec.resize(this->observed_values.size());