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

[avidaedward at myxo.css.msu.edu]

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

Modified:
   extras/
   extras/source/testsuites/nAnalyze.cpp
Log:
 r1264 at clearly:  kaben | 2007-01-28 00:36:08 -0500
 Aborted refactoring of test cAnalyze_Brainstorm_SynchronousVsContinuous;
 I had wanted to reduce some redundant computation in COMPETE command,
 but the redundant computation is unavoidable right now, because it also
 computes some information that isn't retained over time... I need two
 pieces of information : the fitness of an organism, and that organism's
 first offspring, if it has one. The latter piece of information isn't
 saved.



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

Modified: extras/source/testsuites/nAnalyze.cpp
===================================================================
--- extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:18:29 UTC (rev 1238)
+++ extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:18:32 UTC (rev 1239)
@@ -1010,8 +1010,8 @@
           s += "/default-classic.org";
         }
         a.Send(s);
-        a.Send("RECALCULATE");
-        a.Send("DETAIL archive_0/detail.dat id parent_id num_cpus fitness viable length sequence");
+        //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 = 100;
@@ -1042,19 +1042,24 @@
           }
           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("SET_BATCH $t");
           a.Send("PURGE_BATCH");
 
           a.Send("COMPETE $s $f $t");
 
-          a.Send("SET_BATCH $t");
-          a.Send("RECALCULATE");
-          a.Send("DETAIL archive_$t/detail.dat id parent_id num_cpus fitness viable length sequence");
-
           a.Send("SET_BATCH $f");
           a.Send("PURGE_BATCH");
         }
 
+        a.Send("SET_BATCH $t");
+        a.Send("RECALCULATE");
+        a.Send("DETAIL archive_$t/detail.dat id parent_id num_cpus fitness viable length sequence");
+
+
         delete driver; driver=0;
         // note: driver deletes world deletes config.