Add seed to lfmcmc run function (#30)

* Add seed param to lfmcmc run function * Remove default param in lfmcmc-meat.hpp * Bumping version number * Make single header
UofUEpiBio · Nov 4, 2024 · 3ebd187 · 3ebd187
1 parent 884f49c
commit 3ebd187
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/epiworld.hpp b/epiworld.hpp
@@ -19,7 +19,7 @@
 /* Versioning */
 #define EPIWORLD_VERSION_MAJOR 0
 #define EPIWORLD_VERSION_MINOR 4
-#define EPIWORLD_VERSION_PATCH 1
+#define EPIWORLD_VERSION_PATCH 2
 
 static const int epiworld_version_major = EPIWORLD_VERSION_MAJOR;
 static const int epiworld_version_minor = EPIWORLD_VERSION_MINOR;
@@ -1249,7 +1249,8 @@ class LFMCMC {
     void run(
         std::vector< epiworld_double > param_init,
         size_t n_samples_,
-        epiworld_double epsilon_
+        epiworld_double epsilon_,
+        int seed = -1
         );
 
     LFMCMC() {};
@@ -1526,7 +1527,8 @@ class LFMCMC {
     void run(
         std::vector< epiworld_double > param_init,
         size_t n_samples_,
-        epiworld_double epsilon_
+        epiworld_double epsilon_,
+        int seed = -1
         );
 
     LFMCMC() {};
@@ -1796,7 +1798,8 @@ template<typename TData>
 inline void LFMCMC<TData>::run(
     std::vector< epiworld_double > params_init_,
     size_t n_samples_,
-    epiworld_double epsilon_
+    epiworld_double epsilon_,
+    int seed
     )
 {
 
@@ -1809,6 +1812,9 @@ inline void LFMCMC<TData>::run(
     params_init  = params_init_;
     n_parameters = params_init_.size();
 
+    if (seed >= 0)
+        this->seed(seed);
+
     params_now.resize(n_parameters);
     params_prev.resize(n_parameters);
 

diff --git a/include/epiworld/epiworld.hpp b/include/epiworld/epiworld.hpp
@@ -19,7 +19,7 @@
 /* Versioning */
 #define EPIWORLD_VERSION_MAJOR 0
 #define EPIWORLD_VERSION_MINOR 4
-#define EPIWORLD_VERSION_PATCH 1
+#define EPIWORLD_VERSION_PATCH 2
 
 static const int epiworld_version_major = EPIWORLD_VERSION_MAJOR;
 static const int epiworld_version_minor = EPIWORLD_VERSION_MINOR;

diff --git a/include/epiworld/math/lfmcmc/lfmcmc-bones.hpp b/include/epiworld/math/lfmcmc/lfmcmc-bones.hpp
@@ -187,7 +187,8 @@ class LFMCMC {
     void run(
         std::vector< epiworld_double > param_init,
         size_t n_samples_,
-        epiworld_double epsilon_
+        epiworld_double epsilon_,
+        int seed = -1
         );
 
     LFMCMC() {};

diff --git a/include/epiworld/math/lfmcmc/lfmcmc-meat.hpp b/include/epiworld/math/lfmcmc/lfmcmc-meat.hpp
@@ -205,7 +205,8 @@ template<typename TData>
 inline void LFMCMC<TData>::run(
     std::vector< epiworld_double > params_init_,
     size_t n_samples_,
-    epiworld_double epsilon_
+    epiworld_double epsilon_,
+    int seed
     )
 {
 
@@ -218,6 +219,9 @@ inline void LFMCMC<TData>::run(
     params_init  = params_init_;
     n_parameters = params_init_.size();
 
+    if (seed >= 0)
+        this->seed(seed);
+
     params_now.resize(n_parameters);
     params_prev.resize(n_parameters);