[Avida-SVN] r2699 - in branches/uml-merge/tests/_orchid-avida-mde: config expected/data

hjg at myxo.css.msu.edu hjg at myxo.css.msu.edu
Wed Jul 2 07:31:32 PDT 2008 

Author: hjg
Date: 2008-07-02 10:31:32 -0400 (Wed, 02 Jul 2008)
New Revision: 2699

Modified:
   branches/uml-merge/tests/_orchid-avida-mde/config/avida.cfg
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/average.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/count.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/dominant.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/resource.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/stats.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/tasks.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/time.dat
   branches/uml-merge/tests/_orchid-avida-mde/expected/data/uml.dat
Log:
fixed bug in orchid test suite

Modified: branches/uml-merge/tests/_orchid-avida-mde/config/avida.cfg
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/config/avida.cfg	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/config/avida.cfg	2008-07-02 14:31:32 UTC (rev 2699)
@@ -21,7 +21,7 @@
 WORLD_GEOMETRY 2  # 1 = Bounded Grid
                   # 2 = Torus
                   # 3 = Clique
-RANDOM_SEED 0     # Random number seed (0 for based on time)
+RANDOM_SEED 83123671     # Random number seed (0 for based on time)
 HARDWARE_TYPE 0   # 0 = Original CPUs
                   # 1 = New SMT CPUs
                   # 2 = Transitional SMT

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/average.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/average.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/average.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida Average Data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: Update
 #  2: Merit
 #  3: Gestation Time
@@ -17,4 +17,4 @@
 # 15: Lineage Label
 # 16: True Replication Rate (based on births/update, time-averaged)
 
-0 61440.000000 29.000000 2118.620690 0.000000 30.000000 30.000000 30.000000 1.000000 2.000000 2.000000 0.000000 1.000000 -0.099160 0.000000 0.000000 
+0 61440.000000 29.000000 2118.620690 0.000000 30.000000 30.000000 30.000000 1.000000 2.000000 2.000000 0.000000 1.000000 0.702118 0.000000 0.000000 

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/count.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/count.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/count.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida count data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: update
 #  2: number of insts executed this update
 #  3: number of organisms

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/dominant.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/dominant.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/dominant.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida Dominant Data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: Update
 #  2: Average Merit of the Dominant Genotype
 #  3: Average Gestation Time of the Dominant Genotype

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/resource.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/resource.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/resource.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida resource data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 # First column gives the current update, all further columns give the quantity
 # of the particular resource at that update.
 #  1: Update

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/stats.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/stats.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/stats.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Generic Statistics Data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: update
 #  2: average inferiority (energy)
 #  3: ave probability of any mutations in genome

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/tasks.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/tasks.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/tasks.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida tasks data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 # First column gives the current update, next columns give the number
 # of organisms that have the particular task as a component of their merit
 #  1: Update

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/time.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/time.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/time.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,5 +1,5 @@
 # Avida time data
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: update
 #  2: avida time
 #  3: average generation

Modified: branches/uml-merge/tests/_orchid-avida-mde/expected/data/uml.dat
===================================================================
--- branches/uml-merge/tests/_orchid-avida-mde/expected/data/uml.dat	2008-07-01 20:13:56 UTC (rev 2698)
+++ branches/uml-merge/tests/_orchid-avida-mde/expected/data/uml.dat	2008-07-02 14:31:32 UTC (rev 2699)
@@ -1,7 +1,7 @@
 # Avida uml data
 
 # the average number of transitions and states per organism
-# Tue Jul  1 10:16:22 2008
+# Wed Jul  2 10:32:52 2008
 #  1: update
 #  2: av num states
 #  3: av num trans

More information about the Avida-cvs mailing list