[Avida-SVN] r1944 - branches/energy/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-08-16 08:22:44 -0400 (Thu, 16 Aug 2007)
New Revision: 1944

Modified:
   branches/energy/source/main/cPopulation.cc
Log:
Commented out excessive data files in PrintDemeStats.  PrintDemeStats needs to be broken up in to multiple print actions.

Modified: branches/energy/source/main/cPopulation.cc
===================================================================
--- branches/energy/source/main/cPopulation.cc	2007-08-16 00:01:20 UTC (rev 1943)
+++ branches/energy/source/main/cPopulation.cc	2007-08-16 12:22:44 UTC (rev 1944)
@@ -446,12 +446,8 @@
   }
   
   // Update the contents of the target cell.
-  std::cerr<<"cPop::ActivateOrg1: "<<in_organism->GetPhenotype().GetStoredEnergy()<<" "<<target_cell.GetDemeID()<<std::endl;
   KillOrganism(target_cell);
-  std::cerr<<"cPop::ActivateOrg2: "<<in_organism->GetPhenotype().GetStoredEnergy()<<" "<<target_cell.GetDemeID()<<std::endl;
   target_cell.InsertOrganism(*in_organism);
-  std::cerr<<"cPop::ActivateOrg3: "<<in_organism->GetPhenotype().GetStoredEnergy()<<" "<<target_cell.GetDemeID()<<std::endl;
-
   
   // Setup the inputs in the target cell.
   environment.SetupInputs(ctx, target_cell.input_array);
@@ -1613,8 +1609,8 @@
       const char * tmp = res.GetResName(j);
       df_resources.Write(res.Get(j), cStringUtil::Stringf("Deme %d Resource %s", deme_id, tmp)); //comment);
       
-      if ((res.GetResourcesGeometry())[j] != nGeometry::GLOBAL) {
-        PrintDemeSpatialResData(res, j, deme_id);
+      if((res.GetResourcesGeometry())[j] != nGeometry::GLOBAL) {
+        // PrintDemeSpatialResData(res, j, deme_id);
       }
     }
   } 
@@ -1623,7 +1619,7 @@
   
   if(m_world->GetConfig().ENERGY_ENABLED.Get() == 1) {
     PrintDemeSpatialEnergyData();
-    PrintDemeSpatialSleepData();
+    // PrintDemeSpatialSleepData();
   }
   
   df_fit.Endl();
@@ -1667,8 +1663,7 @@
   for(int i = 0; i < m_world->GetPopulation().GetNumDemes(); i++) {
     cString tmpfilename = cStringUtil::Stringf( "deme_spacial_energy_%i.m", i );
     cDataFile& df = m_world->GetDataFile(tmpfilename);
-    cString UpdateStr = cStringUtil::Stringf( "deme_energy_%07i_", i ) +
-                        cStringUtil::Stringf( "_%07i", m_world->GetStats().GetUpdate() ) + " = [ ...";
+    cString UpdateStr = cStringUtil::Stringf( "deme_energy_%07i_%07i = [ ...", i, m_world->GetStats().GetUpdate() );
 
     df.WriteRaw(UpdateStr);
 
@@ -1686,7 +1681,7 @@
       cellID++;
     }
     df.WriteRaw("];");
-    df.Endl();
+//    df.Endl();
   }
 }