Implement write_mod and esc_all for non-epitope WF run.
authorDariusz Murakowski <murakdar@mit.edu>
Wed, 17 Jun 2015 18:53:43 +0000 (14:53 -0400)
committerDariusz Murakowski <murakdar@mit.edu>
Wed, 17 Jun 2015 18:53:43 +0000 (14:53 -0400)
wf.cpp

diff --git a/wf.cpp b/wf.cpp
index 567bd56..cd30830 100644 (file)
--- a/wf.cpp
+++ b/wf.cpp
@@ -154,9 +154,12 @@ void run(RunParameters &r, unsigned seed) {
             for (i=0; i<r.g; ++i) {
             
                 P.next_generation(H, rnd, r.useRelative, r.useVerbose);
-                P.write_population(popout,i+1);
+                if ((i+1) % r.write_mod == 0) {
+                    P.write_population(popout,i+1);
+                }
 
                 if (r.runUntilEscape && P.escaped(H)) break;
+                if (r.runUntilEscape_all && P.escaped_all(H)) break;
 
             }