[Avida-SVN] r3173 - branches/interrupt/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2009-03-04 16:45:55 -0500 (Wed, 04 Mar 2009)
New Revision: 3173

Modified:
   branches/interrupt/source/main/cPopulation.cc
Log:
Fixing print action PrintWithinDemeGeneticDistance

Modified: branches/interrupt/source/main/cPopulation.cc
===================================================================
--- branches/interrupt/source/main/cPopulation.cc	2009-03-01 04:37:46 UTC (rev 3172)
+++ branches/interrupt/source/main/cPopulation.cc	2009-03-04 21:45:55 UTC (rev 3173)
@@ -2602,6 +2602,7 @@
   PrintDemeMutationRate();
   PrintDemeResource();
   PrintDemeInstructions();
+	PrintWithinDemeGeneticDistance();
   
   if(m_world->GetConfig().ENERGY_ENABLED.Get() == 1) {
     PrintDemeSpatialEnergyData();
@@ -3055,7 +3056,7 @@
 			for (int j = i; j < cur_deme.GetSize(); ++j) {
 				int cell_j = cur_deme.GetCellID(j);
 				if (cell_array[cell_j].IsOccupied() == false)
-					break;
+					continue;
 				inCurrentDemeHammingDistances.Add(cGenomeUtil::FindHammingDistance(cell_array[cell_i].GetOrganism()->GetGenome(), cell_array[cell_j].GetOrganism()->GetGenome()));
 				inCurrentDemeLevenshteinDistances.Add(cGenomeUtil::FindEditDistance(cell_array[cell_i].GetOrganism()->GetGenome(), cell_array[cell_j].GetOrganism()->GetGenome()));
 			}
@@ -3066,6 +3067,7 @@
 	// print average
 	df.Write(allDemeHammingDistances.Average(), "Average genetic Hamming distance between all orgnaisms in deme averaged over all demes ");
 	df.Write(allDemeLevenshteinDistances.Average(), "Average genetic Levenshtein distance between all orgnaisms in deme averaged over all demes ");
+	df.Endl();
 }
 
 void cPopulation::DumpDemeFounders(ofstream& fp) {
@@ -3438,7 +3440,7 @@
     
     //if the -unadjusted- id is above the excluded id, bump it up one
     //insures uniform prob of landing in any deme but the parent's
-    if(rnd_deme_id >= deme_id) rnd_deme_id++;
+    if(rnd_deme_id >= deme_id) ++rnd_deme_id;
     
     //set the new deme_id
     deme_id = rnd_deme_id;