[Avida-SVN] r1233 - in extras: . source/testsuites

[avidaedward at myxo.css.msu.edu]

Author: avidaedward
Date: 2007-01-28 01:18:07 -0500 (Sun, 28 Jan 2007)
New Revision: 1233

Modified:
   extras/
   extras/source/testsuites/nAnalyze.cpp
Log:
 r1257 at clearly:  kaben | 2007-01-27 22:35:16 -0500
 Small change : reduced number of times a detail file is written while
 building-up COMPETE analyze command.



Property changes on: extras
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1256
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1257

Modified: extras/source/testsuites/nAnalyze.cpp
===================================================================
--- extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:18:04 UTC (rev 1232)
+++ extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:18:07 UTC (rev 1233)
@@ -1011,9 +1011,11 @@
         }
         a.Send(s);
         a.Send("RECALCULATE");
+        a.Send("RECALCULATE");
+        a.Send("DETAIL archive_0/detail.dat id parent_id num_cpus fitness viable length sequence");
 
         /* 'num_gens' synchronous generations. {{{4 */
-        int num_gens = 3;
+        int num_gens = MAX_BATCHES;
         for(int g=0; g<num_gens; g++){
           /* Mock-up of arguments to COMPETE command. {{{5 */
           int world_x = world->GetConfig().WORLD_X.Get();
@@ -1030,8 +1032,6 @@
           a.Send(s);
 
           a.Send("SET_BATCH $f");
-          a.Send("RECALCULATE");
-          a.Send("DETAIL archive_$f/detail.dat id parent_id num_cpus fitness viable length sequence");
           //a.Send("RECALCULATE");
           //a.Send("DETAIL archive_$f/detail.dat fitness merit gest_time length viable sequence");
           //a.Send("TRACE archive_$f");