[Avida-cvs] [Avida2-svn] r281 - in branches/developers/matt-hcopy-hack/source: cpu main

[matt@myxo.css.msu.edu]

Author: matt
Date: 2005-08-10 14:18:26 -0400 (Wed, 10 Aug 2005)
New Revision: 281

Modified:
   branches/developers/matt-hcopy-hack/source/cpu/hardware_cpu.cc
   branches/developers/matt-hcopy-hack/source/main/analyze.cc
Log:
Changed the Meta value of default copy command to reflect
actual reduction rather than test 0xff value.


Modified: branches/developers/matt-hcopy-hack/source/cpu/hardware_cpu.cc
===================================================================
--- branches/developers/matt-hcopy-hack/source/cpu/hardware_cpu.cc	2005-08-09 20:38:35 UTC (rev 280)
+++ branches/developers/matt-hcopy-hack/source/cpu/hardware_cpu.cc	2005-08-10 18:18:26 UTC (rev 281)
@@ -3326,7 +3326,7 @@
   }
 
   cpu_stats.mut_stats.copies_exec++;
-  read_inst.SetMeta(0xff); 
+  read_inst.SetMeta(1); 
   write_head.SetInst(read_inst);
   write_head.FlagCopied() = true;  // Set the copied flag...
 

Modified: branches/developers/matt-hcopy-hack/source/main/analyze.cc
===================================================================
--- branches/developers/matt-hcopy-hack/source/main/analyze.cc	2005-08-09 20:38:35 UTC (rev 280)
+++ branches/developers/matt-hcopy-hack/source/main/analyze.cc	2005-08-10 18:18:26 UTC (rev 281)
@@ -2328,7 +2328,7 @@
       fp << "<table border=1 cellpadding=2>" << endl;
       
       // The headings...///
-      fp << "<tr><td colspan=3> ";
+      fp << "<tr><td colspan=4> ";
       output_it.Reset();
       while (output_it.Next() != NULL) {
         fp << "<th>" << output_it.Get()->GetDesc() << " ";
@@ -2336,7 +2336,7 @@
       fp << "</tr>" << endl;
       
       // The base creature...
-      fp << "<tr><th colspan=3>Base Creature";
+      fp << "<tr><th colspan=4>Base Creature";
       tDataEntryCommand<cAnalyzeGenotype> * data_command = NULL;
       cAnalyzeGenotype null_genotype("a", inst_set);
       while ((data_command = output_it.Next()) != NULL) {
@@ -2408,11 +2408,7 @@
       
       //mrr
       if (file_type == FILE_TYPE_HTML) fp << "<td align=center>";
-      fp << genotype->GetFinalGenome()[line_num].GetMeta();
-      fp << " " << genotype->GetChildGenome()[line_num].GetMeta();
-      fp << " ";
-      fp << map_inst_set.GetName(
-		      genotype->GetChildGenome()[line_num].GetOp()) << " ";
+      fp << genotype->GetChildGenome()[line_num].GetMeta() << " ";
       
       
       // Print the individual columns...