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

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2008-10-27 23:12:35 -0400 (Mon, 27 Oct 2008)
New Revision: 2890

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

Fixing some places in cPhenotype where hoarding-specific variables were not updated while their non-hoarding-specific variable twins were.


Modified: branches/collect/source/main/cPhenotype.cc
===================================================================
--- branches/collect/source/main/cPhenotype.cc	2008-10-28 02:20:52 UTC (rev 2889)
+++ branches/collect/source/main/cPhenotype.cc	2008-10-28 03:12:35 UTC (rev 2890)
@@ -112,9 +112,13 @@
   cur_num_errors           = in_phen.cur_num_errors;                         
   cur_num_donates          = in_phen.cur_num_donates;                       
   cur_task_count           = in_phen.cur_task_count;                
-  eff_task_count           = in_phen.eff_task_count;                 
-  cur_task_quality         = in_phen.cur_task_quality;           
-  cur_task_value           = in_phen.cur_task_value;			 
+  eff_task_count           = in_phen.eff_task_count;
+  cur_internal_task_count  = in_phen.cur_internal_task_count;
+  cur_task_quality         = in_phen.cur_task_quality;    
+  cur_internal_task_quality= in_phen.cur_internal_task_quality;       
+  cur_task_value           = in_phen.cur_task_value;			
+  cur_rbins_total          = in_phen.cur_rbins_total;
+  cur_rbins_avail          = in_phen.cur_rbins_avail;
   cur_reaction_count       = in_phen.cur_reaction_count;            
   cur_reaction_add_reward  = in_phen.cur_reaction_add_reward;     
   cur_inst_count           = in_phen.cur_inst_count;                 
@@ -142,8 +146,12 @@
   last_num_errors          = in_phen.last_num_errors; 
   last_num_donates         = in_phen.last_num_donates;
   last_task_count          = in_phen.last_task_count;
+  last_internal_task_count = in_phen.last_internal_task_count;
   last_task_quality        = in_phen.last_task_quality;
+  last_internal_task_quality=in_phen.last_internal_task_quality;
   last_task_value          = in_phen.last_task_value;
+  last_rbins_total         = in_phen.last_rbins_total;
+  last_rbins_avail         = in_phen.last_rbins_avail;
   last_reaction_count      = in_phen.last_reaction_count;
   last_reaction_add_reward = in_phen.last_reaction_add_reward; 
   last_inst_count          = in_phen.last_inst_count;	  
@@ -901,6 +909,8 @@
   cur_task_count.SetAll(0);
   cur_internal_task_count.SetAll(0);
   eff_task_count.SetAll(0);
+  cur_rbins_total.SetAll(0);
+  cur_rbins_avail.SetAll(0);
   cur_reaction_count.SetAll(0);
   cur_reaction_add_reward.SetAll(0);
   cur_inst_count.SetAll(0);
@@ -923,6 +933,8 @@
   last_num_donates         = clone_phenotype.last_num_donates;
   last_task_count          = clone_phenotype.last_task_count;
   last_internal_task_count = clone_phenotype.last_internal_task_count;
+  last_rbins_total         = clone_phenotype.last_rbins_total;
+  last_rbins_avail         = clone_phenotype.last_rbins_avail;
   last_reaction_count      = clone_phenotype.last_reaction_count;
   last_reaction_add_reward = clone_phenotype.last_reaction_add_reward;
   last_inst_count          = clone_phenotype.last_inst_count;
@@ -1399,8 +1411,12 @@
   last_num_errors           = cur_num_errors;
   last_num_donates          = cur_num_donates;
   last_task_count           = cur_task_count;
+  last_internal_task_count  = cur_internal_task_count;
   last_task_quality         = cur_task_quality;
-  last_task_value			= cur_task_value;
+  last_internal_task_quality= cur_internal_task_quality;
+  last_task_value			      = cur_task_value;
+  last_rbins_total          = cur_rbins_total;
+  last_rbins_avail          = cur_rbins_avail;
   last_reaction_count       = cur_reaction_count;
   last_reaction_add_reward  = cur_reaction_add_reward;
   last_inst_count           = cur_inst_count;
@@ -1413,9 +1429,13 @@
   cur_num_errors  = 0;
   cur_num_donates  = 0;
   cur_task_count.SetAll(0);
+  cur_internal_task_count.SetAll(0);
   eff_task_count.SetAll(0);
   cur_task_quality.SetAll(0);
+  cur_internal_task_quality.SetAll(0);
   cur_task_value.SetAll(0);
+  cur_rbins_total.SetAll(0);
+  cur_rbins_avail.SetAll(0);
   cur_reaction_count.SetAll(0);
   cur_reaction_add_reward.SetAll(0);
   cur_inst_count.SetAll(0);