mt19937 fix + update approx thresholds

JaroSant · Sep 10, 2024 · 771c7cf · 771c7cf
1 parent 199ef96
commit 771c7cf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/UserManual.pdf b/UserManual.pdf
diff --git a/src/EWF_pybind.cpp b/src/EWF_pybind.cpp
@@ -10,8 +10,8 @@
 
 namespace py = pybind11;
 
-double dt_default = 0.08;
-double bt_default = 0.025;
+double dt_default = 0.1;
+double bt_default = 0.04;
 
 PYBIND11_MODULE(EWF_pybind, m) {
   py::class_<WrightFisher>(m, "WrightFisher")

diff --git a/src/WrightFisher.cpp b/src/WrightFisher.cpp
@@ -10075,20 +10075,20 @@ void WrightFisher::DiffusionRunner(
   ofstream saveFile;
   saveFile.open(Filename);
 
-  boost::random::mt19937 gen;
   int nosamples = 1, loader = max(static_cast<int>(floor(0.1 * nSim)), 1),
       loader_count = 1;
   while (nosamples < nSim + 1) {
     if (non_neutral) {
-      saveFile
-          << NonNeutralDrawEndpoint(x, startT, endT, Absorption, o, gen).first
-          << "\n";
+      saveFile << NonNeutralDrawEndpoint(x, startT, endT, Absorption, o, WF_gen)
+                      .first
+               << "\n";
     } else {
       if (Absorption) {
-        saveFile << DrawUnconditionedDiffusion(x, endT - startT, o, gen).first
-                 << "\n";
+        saveFile
+            << DrawUnconditionedDiffusion(x, endT - startT, o, WF_gen).first
+            << "\n";
       } else {
-        saveFile << DrawEndpoint(x, startT, endT, o, gen).first << "\n";
+        saveFile << DrawEndpoint(x, startT, endT, o, WF_gen).first << "\n";
       }
     }
 
@@ -10156,24 +10156,25 @@ void WrightFisher::BridgeDiffusionRunner(
   ofstream saveFile;
   saveFile.open(Filename);
 
-  boost::random::mt19937 gen;
   int nosamples = 1, loader = max(static_cast<int>(floor(0.1 * nSim)), 1),
       loader_count = 1;
   while (nosamples < nSim + 1) {
     if (non_neutral) {
       saveFile << NonNeutralDrawBridgepoint(x, startT, endT, z, sampleT,
-                                            Absorption, o, gen)
+                                            Absorption, o, WF_gen)
                       .first
                << "\n";
     } else {
       if (Absorption) {
-        saveFile << DrawUnconditionedBridge(x, z, startT, endT, sampleT, o, gen)
+        saveFile << DrawUnconditionedBridge(x, z, startT, endT, sampleT, o,
+                                            WF_gen)
                         .first
                  << "\n";
       } else {
         ThetaResetter();
-        saveFile << DrawBridgepoint(x, z, startT, endT, sampleT, o, gen).first
-                 << "\n";
+        saveFile
+            << DrawBridgepoint(x, z, startT, endT, sampleT, o, WF_gen).first
+            << "\n";
       }
     }
 

diff --git a/src/WrightFisher.h b/src/WrightFisher.h
@@ -285,6 +285,7 @@ ooO--(_)--Ooo-ooO--(_)--Ooo
   Polynomial SelectionFunction, PhiFunction, AtildeFunction;
   int thetaIndex;
   vector<vector<double100>> akm;
+  boost::random::mt19937 WF_gen;
 
   /// HELPER FUNCTIONS