[Avida-SVN] r2220 - in branches/energy/source: classification main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-12-03 15:25:45 -0500 (Mon, 03 Dec 2007)
New Revision: 2220

Modified:
   branches/energy/source/classification/cClassificationManager.cc
   branches/energy/source/main/cOrganism.cc
   branches/energy/source/main/cPhenotype.cc
   branches/energy/source/main/cPopulation.cc
Log:
remove print

Modified: branches/energy/source/classification/cClassificationManager.cc
===================================================================
--- branches/energy/source/classification/cClassificationManager.cc	2007-12-03 19:57:42 UTC (rev 2219)
+++ branches/energy/source/classification/cClassificationManager.cc	2007-12-03 20:25:45 UTC (rev 2220)
@@ -172,9 +172,7 @@
     found_genotype->SetParent(NULL, NULL);
     found_genotype->SetLineageLabel(lineage_label);
     AddGenotype(found_genotype, list_num);
-    cerr<<"here\n";
   }
-    cerr<<"here1\n";  
   return found_genotype;
 }
 

Modified: branches/energy/source/main/cOrganism.cc
===================================================================
--- branches/energy/source/main/cOrganism.cc	2007-12-03 19:57:42 UTC (rev 2219)
+++ branches/energy/source/main/cOrganism.cc	2007-12-03 20:25:45 UTC (rev 2220)
@@ -258,11 +258,8 @@
 
     /******** tmp*******/
     newMerit += m_phenotype.GetCurBonus();
-
-//  set in germ line
-  
+//  set in germ line  
     m_world->GetPopulation().GetDeme(this->GetOrgInterface().GetDemeID()).GetGermline().GetLatest().SetEnergy(GetPhenotype().GetStoredEnergy());
-    cerr<<m_world->GetPopulation().GetDeme(this->GetOrgInterface().GetDemeID()).GetGermline().GetLatest().GetEnergy()<<endl;
     
 //    m_phenotype.SetCurBonus(0.0);
     if(newMerit != -1) {

Modified: branches/energy/source/main/cPhenotype.cc
===================================================================
--- branches/energy/source/main/cPhenotype.cc	2007-12-03 19:57:42 UTC (rev 2219)
+++ branches/energy/source/main/cPhenotype.cc	2007-12-03 20:25:45 UTC (rev 2220)
@@ -404,9 +404,7 @@
   merit           = genome_length;
   copied_size     = genome_length;
   executed_size   = genome_length;
-  
-  cerr<<"cPhenotype::SetupInject "<<_genome.GetEnergy()<<endl;
-  
+    
   energy_store    = min(m_world->GetConfig().ENERGY_GIVEN_ON_INJECT.Get() + (int)(_genome.GetEnergy() * (1-m_world->GetConfig().FRAC_ENERGY_DECAY_AT_BIRTH.Get())), m_world->GetConfig().ENERGY_CAP.Get());
   energy_tobe_applied = 0.0;
   executionRatio = 1.0;

Modified: branches/energy/source/main/cPopulation.cc
===================================================================
--- branches/energy/source/main/cPopulation.cc	2007-12-03 19:57:42 UTC (rev 2219)
+++ branches/energy/source/main/cPopulation.cc	2007-12-03 20:25:45 UTC (rev 2220)
@@ -1186,10 +1186,6 @@
       // Now create the next germ by manually mutating the source.
       // @refactor (strategy pattern)
       cGenome next_germ(source_germ);
-
-      cerr<<source_germ.GetEnergy()<<" - "<<next_germ.GetEnergy()<<endl;
-
-      
       if(m_world->GetConfig().GERMLINE_COPY_MUT.Get() > 0) {
         const cInstSet& instset = m_world->GetHardwareManager().GetInstSet();
         cAvidaContext ctx(m_world->GetRandom());        
@@ -1218,8 +1214,6 @@
         }
       }
 
-      cerr<<source_germline.GetLatest().GetEnergy()<<" - "<<target_germline.GetLatest().GetEnergy()<<endl;
-      
       // Kill all the organisms in the source deme.
       for (int i=0; i<source_deme.GetSize(); i++) {
         KillOrganism(cell_array[source_deme.GetCellID(i)]);