From: Dariusz Murakowski <murakdar@mit.edu>
Date: Tue, 23 Jun 2015 03:49:38 +0000 (-0400)
Subject: Implement write_mod and esc_all for non-epitope WF run.
X-Git-Url: http://src.murakowski.org/?a=commitdiff_plain;h=843677f77a3dac34e296cdefaec297513439e6f8;p=VirEvoDyn.git

Implement write_mod and esc_all for non-epitope WF run.

Conflicts:
	wf.cpp
---

843677f77a3dac34e296cdefaec297513439e6f8
diff --cc wf.cpp
index 5542cb6,cd30830..9eefcc6
--- a/wf.cpp
+++ b/wf.cpp
@@@ -174,33 -165,9 +174,36 @@@ void run(RunParameters &r, unsigned see
              
          }
          
 -    }
 +        
 +        // Run (w/out targeted epitope)
 +        
 +        else {
 +
 +            for (unsigned int n=0; n<r.num_runs; n++) {
 +            
 +                Hamiltonian H(r.couplingsInfile);
 +                H.set_temp(r.bh, r.bJ);
 +                Population P(H, r.n, r.mu, r.initPop, r.initFrac);
 +                
 +                unsigned int i;
 +                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;
  
 +                }
 +                
 +            }
 +            
 +        }
 +
 +    }
 +    
      gsl_rng_free(rnd);  //Free up memory from random number generator
  
      // close file handles