[Avida-SVN] r3304 - development/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2009-06-09 16:43:52 -0400 (Tue, 09 Jun 2009)
New Revision: 3304

Modified:
   development/source/main/cTaskLib.cc
Log:
new fitness function for Task_FormSpatialGroup. 

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2009-06-09 20:40:38 UTC (rev 3303)
+++ development/source/main/cTaskLib.cc	2009-06-09 20:43:52 UTC (rev 3304)
@@ -3408,12 +3408,14 @@
 	}
 	int orgs_in_group = m_world->GetPopulation().NumberOfOrganismsInGroup(group_id);
 	
-	if (orgs_in_group < ideal_group_size) {
+	reward = (1 - ((ideal_group_size - orgs_in_group)*(ideal_group_size - orgs_in_group)))/(ideal_group_size * ideal_group_size);
+	if (reward < 0) reward = 0;
+	/*if (orgs_in_group < ideal_group_size) {
 		reward = orgs_in_group*orgs_in_group;
 	} else {
 		reward = ideal_group_size*ideal_group_size;
 	}
-	reward = reward / ideal_group_size;
+	reward = reward / ideal_group_size;*/
 	return reward;
 }