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

goingssh at myxo.css.msu.edu goingssh at myxo.css.msu.edu
Thu Aug 27 20:53:03 PDT 2009


Author: goingssh
Date: 2009-08-27 23:53:03 -0400 (Thu, 27 Aug 2009)
New Revision: 3388

Modified:
   branches/goings/source/main/cPopulation.cc
Log:
fixed counting of times edit distance calculated

Modified: branches/goings/source/main/cPopulation.cc
===================================================================
--- branches/goings/source/main/cPopulation.cc	2009-08-28 03:49:43 UTC (rev 3387)
+++ branches/goings/source/main/cPopulation.cc	2009-08-28 03:53:03 UTC (rev 3388)
@@ -941,10 +941,7 @@
 		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++)
 	{
@@ -954,7 +951,10 @@
 			if ( par_dist != -1 && (par_dist==0 || hdists[i][par_id]-par_dist >= dist) )
 				dist = hdists[i][par_id]-par_dist;
 			else
+			{
 				dist = cGenomeUtil::FindEditDistance(cell_array[i].GetOrganism()->GetGenome(), gen->GetGenome());
+				m_world->GetStats().IncNumDistCalcs();
+			}
 		}
 		hdists[i][cell_id] = dist;
 		hdists[cell_id][i] = dist;




More information about the Avida-cvs mailing list