[Avida-SVN] r3011 - development/source/classification

[ruppmatt at myxo.css.msu.edu]

Author: ruppmatt
Date: 2008-12-08 12:57:55 -0500 (Mon, 08 Dec 2008)
New Revision: 3011

Modified:
   development/source/classification/cClassificationManager.cc
   development/source/classification/cGenotypeControl.cc
Log:
Fixed previous submission.

Modified: development/source/classification/cClassificationManager.cc
===================================================================
--- development/source/classification/cClassificationManager.cc	2008-12-08 17:28:30 UTC (rev 3010)
+++ development/source/classification/cClassificationManager.cc	2008-12-08 17:57:55 UTC (rev 3011)
@@ -575,8 +575,8 @@
   if (print_depth == true) fp << "depth ";
   if (print_lineage == true) fp << "lineage ";
   if (print_sequence == true) fp << "sequence ";  
-  if (print_exec_time_born == true) fp << "exec_time_born";
-  if (print_generation_born == true) fp << "generation_born";
+  if (print_exec_time_born == true) fp << "exec_time_born ";
+  if (print_generation_born == true) fp << "generation_born ";
   fp << endl;
   
   // Print extra information about what data is in this file...
@@ -603,10 +603,12 @@
   if (print_depth) fp << "# " << cur_col++ << ": depth in phylogentic tree" << endl;
   if (print_lineage) fp << "# " << cur_col++ << ": lineage label of genotype" << endl;
   if (print_sequence) fp << "# " << cur_col++ << ": genome of genotype" << endl;
-  if (print_exec_time_born) fp << "#" << cur_col++ << ": number of instructions executed at birth since ancestor injection" << endl;
-  if (print_generation_born) fp << "#" << cur_col++ << ": first generation number of genotype" << endl;
+  if (print_exec_time_born)  fp << "# "  << cur_col++ << ": number of instructions executed at birth since ancestor injection" << endl;
+  if (print_generation_born) fp << "# " << cur_col++ << ": first generation number of genotype" << endl;
   fp << endl;
   
+  cerr << m_genotype_ctl->GetSize() << " " << print_id << " " << print_generation_born << endl;
+  
   // Print the current population....
   m_genotype_ctl->Reset(0);
   for (int i = 0; i < m_genotype_ctl->GetSize(); i++) {

Modified: development/source/classification/cGenotypeControl.cc
===================================================================
--- development/source/classification/cGenotypeControl.cc	2008-12-08 17:28:30 UTC (rev 3010)
+++ development/source/classification/cGenotypeControl.cc	2008-12-08 17:57:55 UTC (rev 3011)
@@ -80,8 +80,8 @@
     in_genotype.GetNext()->SetPrev(&in_genotype);
   }
 
-  if (!CheckPos(in_genotype))
-    /*cerr << "Genotype insertion fail! @MRR -- \n"
+  /*if (!CheckPos(in_genotype))
+    cerr << "Genotype insertion fail! @MRR -- \n"
       << "Best Genotype:    " << best << " " << best->GetNumOrganisms() << " prev: " << best->GetPrev() << "  next: " << best->GetNext() << endl
       << "In Genotype:      " << &in_genotype << " " << in_genotype.GetNumOrganisms() << " prev: " << in_genotype.GetPrev() << "  next: " << in_genotype.GetNext() << endl
       << "Prev Genotype:    " << prev_genotype << " " << prev_genotype->GetNumOrganisms() << " prev: " << prev_genotype->GetPrev() << "  next: " << prev_genotype->GetNext() << endl;