Sets random seeds by default in singlePopMcmc and multiPopMcmc

Maintains the ability to specify a seed from the command line
argiopetech · Sep 3, 2014 · b0c4c53 · b0c4c53
1 parent 55db4c1
commit b0c4c53
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/base9/Settings.cpp b/base9/Settings.cpp
@@ -141,7 +141,6 @@ void Settings::fromYaml (const string yamlFile)
         scatterCluster.exposures = tNode.as<map<string, double>>();
     }
 
-    seed = getOrDie<uint32_t>(generalNode, "seed");
     verbose = getOrDie<int>(generalNode, "verbose");
 
     // When we switch to C++11, we can change these to std::string and remove most of the cruft

diff --git a/base9/Settings.hpp b/base9/Settings.hpp
@@ -16,7 +16,7 @@ class Settings
 
     bool noBinaries;
 
-    uint32_t seed;
+    uint32_t seed = std::numeric_limits<uint32_t>::max();
     unsigned int threads = std::numeric_limits<int>::max();
 
     int verbose;

diff --git a/multiPopMcmc/MpiMcmcApplication.cpp b/multiPopMcmc/MpiMcmcApplication.cpp
@@ -279,6 +279,7 @@ int MpiMcmcApplication::run()
     }
     // end initChain
 
+    cout << "Seed:   " << settings.seed << endl;
     cout << "FSlike: " << fsLike << endl;
 
     // Assuming fsLike doesn't change, this is the "global" logPost function

diff --git a/multiPopMcmc/mpiMcmc.cpp b/multiPopMcmc/mpiMcmc.cpp
@@ -23,6 +23,12 @@ int main (int argc, char *argv[])
 
     settings.fromCLI (argc, argv);
 
+    if (settings.seed == std::numeric_limits<uint32_t>::max())
+    {
+        srand(std::time(0));
+        settings.seed = rand();
+    }
+
     MpiMcmcApplication master(settings);
 
     try

diff --git a/singlePopMcmc/MpiMcmcApplication.cpp b/singlePopMcmc/MpiMcmcApplication.cpp
@@ -285,6 +285,7 @@ int MpiMcmcApplication::run()
     }
     // end initChain
 
+    cout << "Seed:   " << settings.seed << endl;
     cout << "FSlike: " << fsLike << endl;
 
     // Assuming fsLike doesn't change, this is the "global" logPost function

diff --git a/singlePopMcmc/mpiMcmc.cpp b/singlePopMcmc/mpiMcmc.cpp
@@ -1,3 +1,5 @@
+#include <cstdlib>
+#include <ctime>
 #include <stdexcept>
 
 #include "MpiMcmcApplication.hpp"
@@ -23,6 +25,12 @@ int main (int argc, char *argv[])
 
     settings.fromCLI (argc, argv);
 
+    if (settings.seed == std::numeric_limits<uint32_t>::max())
+    {
+        srand(std::time(0));
+        settings.seed = rand();
+    }
+
     MpiMcmcApplication master(settings);
 
     try