[Avida-cvs] [Avida2-svn] r268 - in branches/brysonda/source: cpu python/default.workspace python/default.workspace/freezer

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-07-27 11:35:34 -0400 (Wed, 27 Jul 2005)
New Revision: 268

Modified:
   branches/brysonda/source/cpu/test_cpu.cc
   branches/brysonda/source/python/default.workspace/events.default
   branches/brysonda/source/python/default.workspace/freezer/default.organism
Log:
Merged in r267 from trunk.

Modified: branches/brysonda/source/cpu/test_cpu.cc
===================================================================
--- branches/brysonda/source/cpu/test_cpu.cc	2005-07-27 15:33:45 UTC (rev 267)
+++ branches/brysonda/source/cpu/test_cpu.cc	2005-07-27 15:35:34 UTC (rev 268)
@@ -162,15 +162,15 @@
   // Print out some final info in trace...
   if (trace_fp != NULL) {
     if (time_used == time_allocated) {
-      *trace_fp << endl << "TIMEOUT: No offspring produced." << endl;
+      *trace_fp << endl << "# TIMEOUT: No offspring produced." << endl;
     }
     else if (organism.GetHardware().GetMemory().GetSize() == 0) {
-      *trace_fp << endl << "ORGANISM DEATH: No offspring produced." << endl;
+      *trace_fp << endl << "# ORGANISM DEATH: No offspring produced." << endl;
     }
     else {
-      *trace_fp << endl << "Final Memory: "
+      *trace_fp << endl << "# Final Memory: "
 		<< organism.GetHardware().GetMemory().AsString() << endl
-		<< "Child Memory: " << organism.ChildGenome().AsString()
+		<< "# Child Memory: " << organism.ChildGenome().AsString()
 		<< endl;
     }
   }

Modified: branches/brysonda/source/python/default.workspace/events.default
===================================================================
--- branches/brysonda/source/python/default.workspace/events.default	2005-07-27 15:33:45 UTC (rev 267)
+++ branches/brysonda/source/python/default.workspace/events.default	2005-07-27 15:35:34 UTC (rev 268)
@@ -16,14 +16,14 @@
 ##############################################################################
 
 # Print all of the standard data files...
-u 0:100 print_dom                 # Save the most abundant genotypes
-u 0:1:end print_average_data    # Save info about they average genotypes
-u 0:100:end print_dominant_data   # Save info about most abundant genotypes
-u 0:100:end print_stats_data      # Collect satistics about entire pop.
-u 0:1:end print_count_data      # Count organisms, genotypes, species, etc.
-u 0:100:end print_tasks_data      # Save organisms counts for each task.
-u 0:100:end print_time_data       # Track time conversion (generations, etc.)
-u 0:100:end print_resource_data   # Track resource abundance.
+# u 0:100 print_dom                 # Save the most abundant genotypes
+# u 0:1:end print_average_data    # Save info about they average genotypes
+# u 0:100:end print_dominant_data   # Save info about most abundant genotypes
+# u 0:100:end print_stats_data      # Collect satistics about entire pop.
+# u 0:1:end print_count_data      # Count organisms, genotypes, species, etc.
+# u 0:100:end print_tasks_data      # Save organisms counts for each task.
+# u 0:100:end print_time_data       # Track time conversion (generations, etc.)
+# u 0:100:end print_resource_data   # Track resource abundance.
 
 # A few data files not printed by default
 # u 100:100:end print_error_data      # Std. Error on averages.

Modified: branches/brysonda/source/python/default.workspace/freezer/default.organism
===================================================================
--- branches/brysonda/source/python/default.workspace/freezer/default.organism	2005-07-27 15:33:45 UTC (rev 267)
+++ branches/brysonda/source/python/default.workspace/freezer/default.organism	2005-07-27 15:35:34 UTC (rev 268)
@@ -1,131 +1 @@
-# Filename........: /Users/jclune/Desktop/ajeff/avida/code-apps/Avida-Ed 2b6DMG/avida-work/organism.notter
-# Update Output...: N/A
-# Is Viable.......: 1
-# Repro Cycle Size: 0
-# Depth to Viable.: 0
-
-# Generation: 0
-# Merit...........:           200
-# Gestation Time..:           380
-# Fitness.........:     0.244898
-# Errors..........:            0
-# Genome Size.....:           100
-# Copied Size.....:           100
-# Executed Size...:           97
-# Offspring.......:         SELF
-
-# not	0
-# nand	0
-# and	0
-# orn	0
-# or	0
-# andn	0
-# nor	0
-# xor	0
-# equ	0
-
-h-alloc
-h-search
-nop-C
-nop-A
-mov-head
-nop-C
-
-
-IO
-push
-pop
-nop-C
-IO
-nop-A
-nand
-IO
-
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-nop-C
-
-
-h-search
-h-copy
-if-label
-nop-C
-nop-A
-h-divide
-mov-head
-nop-A
-nop-B
+rucavcqgfcqapqcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccutycasvab