[Avida-SVN] r2896 - branches/collect/source/main

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2008-10-29 11:19:26 -0400 (Wed, 29 Oct 2008)
New Revision: 2896

Modified:
   branches/collect/source/main/cPhenotype.cc
Log:

Fixing initialization of some statistics to be more analyze-mode-friendly.


Modified: branches/collect/source/main/cPhenotype.cc
===================================================================
--- branches/collect/source/main/cPhenotype.cc	2008-10-29 03:08:13 UTC (rev 2895)
+++ branches/collect/source/main/cPhenotype.cc	2008-10-29 15:19:26 UTC (rev 2896)
@@ -48,8 +48,8 @@
   , cur_task_quality(m_world->GetEnvironment().GetNumTasks())  
   , cur_task_value(m_world->GetEnvironment().GetNumTasks())  
   , cur_internal_task_quality(m_world->GetEnvironment().GetNumTasks())
-  , cur_rbins_total(m_world->GetNumResources())
-  , cur_rbins_avail(m_world->GetNumResources())
+  , cur_rbins_total(m_world->GetEnvironment().GetResourceLib().GetSize())
+  , cur_rbins_avail(m_world->GetEnvironment().GetResourceLib().GetSize())
   , cur_reaction_count(m_world->GetEnvironment().GetReactionLib().GetSize())
   , cur_reaction_add_reward(m_world->GetEnvironment().GetReactionLib().GetSize())
   , cur_sense_count(m_world->GetStats().GetSenseSize())
@@ -60,8 +60,8 @@
   , last_task_quality(m_world->GetEnvironment().GetNumTasks())
   , last_task_value(m_world->GetEnvironment().GetNumTasks())
   , last_internal_task_quality(m_world->GetEnvironment().GetNumTasks())
-  , last_rbins_total(m_world->GetNumResources())
-  , last_rbins_avail(m_world->GetNumResources())
+  , last_rbins_total(m_world->GetEnvironment().GetResourceLib().GetSize())
+  , last_rbins_avail(m_world->GetEnvironment().GetResourceLib().GetSize())
   , last_reaction_count(m_world->GetEnvironment().GetReactionLib().GetSize())
   , last_reaction_add_reward(m_world->GetEnvironment().GetReactionLib().GetSize())  
   , last_sense_count(m_world->GetStats().GetSenseSize())