[Avida-SVN] r3382 - branches/goings/source/main

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2009-08-24 16:35:56 -0400 (Mon, 24 Aug 2009)
New Revision: 3382

Modified:
   branches/goings/source/main/cPopulation.cc
   branches/goings/source/main/cStats.cc
   branches/goings/source/main/cStats.h
Log:
Added count of num times edit dist is being calculated to counts.dat file

Modified: branches/goings/source/main/cPopulation.cc
===================================================================
--- branches/goings/source/main/cPopulation.cc	2009-08-24 19:28:21 UTC (rev 3381)
+++ branches/goings/source/main/cPopulation.cc	2009-08-24 20:35:56 UTC (rev 3382)
@@ -941,7 +941,10 @@
 		if ( par_gen == gen->GetGenome() )
 			par_dist = 0;
 		else
+		{
 			par_dist = cGenomeUtil::FindEditDistance(par_gen, gen->GetGenome());
+			m_world->GetStats().IncNumDistCalcs();
+		}
 	}
 	for (int i=0; i<cell_array.GetSize(); i++)
 	{

Modified: branches/goings/source/main/cStats.cc
===================================================================
--- branches/goings/source/main/cStats.cc	2009-08-24 19:28:21 UTC (rev 3381)
+++ branches/goings/source/main/cStats.cc	2009-08-24 20:35:56 UTC (rev 3382)
@@ -139,6 +139,7 @@
   const cEnvironment& env = m_world->GetEnvironment();
   const int num_tasks = env.GetNumTasks();
     
+  num_dist_calcs = 0;
   task_cur_count.Resize(num_tasks);
   task_last_count.Resize(num_tasks);
   task_cur_quality.Resize(num_tasks);
@@ -846,7 +847,9 @@
   df.Write(num_single_thread_creatures, "number of single-threaded organisms");
   df.Write(num_multi_thread_creatures, "number of multi-threaded organisms");
   df.Write(num_modified, "number of modified organisms");
+  df.Write(num_dist_calcs, "number of edit dist calculations since last printed");
   df.Endl();
+  num_dist_calcs = 0;
 }
 
 void cStats::PrintMessageData(const cString& filename) {

Modified: branches/goings/source/main/cStats.h
===================================================================
--- branches/goings/source/main/cStats.h	2009-08-24 19:28:21 UTC (rev 3381)
+++ branches/goings/source/main/cStats.h	2009-08-24 20:35:56 UTC (rev 3382)
@@ -190,6 +190,8 @@
   cString dom_sequence;
   int coal_depth;
 
+  int num_dist_calcs;
+
   // Dominant Parasite
   cInjectGenotype * dom_inj_genotype;
   int dom_inj_size;
@@ -559,6 +561,8 @@
   
   void IncNumOrgsKilled() { num_orgs_killed++; }
 
+  void IncNumDistCalcs() { num_dist_calcs++; }
+
   void AddCurTask(int task_num) { task_cur_count[task_num]++; }
   void AddCurTaskQuality(int task_num, double quality) 
   {