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

[grabow38 at myxo.css.msu.edu]

Author: grabow38
Date: 2008-12-05 15:47:59 -0500 (Fri, 05 Dec 2008)
New Revision: 2999

Modified:
   development/source/main/cTaskLib.cc
Log:
Change to cTaskLib::Task_SGPathTraversal for state grid.

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2008-12-05 20:06:25 UTC (rev 2998)
+++ development/source/main/cTaskLib.cc	2008-12-05 20:47:59 UTC (rev 2999)
@@ -3074,6 +3074,9 @@
   schema.AddEntry("sgname", 0, cArgSchema::SCHEMA_STRING);
   schema.AddEntry("poison", 1, cArgSchema::SCHEMA_STRING);
   
+  // Double Arguments
+  schema.AddEntry("halflife", 0, cArgSchema::SCHEMA_DOUBLE);
+  
   cArgContainer* args = cArgContainer::Load(argstr, schema, errors);
   if (args) NewTask(name, "State Grid Path Traversal", &cTaskLib::Task_SGPathTraversal, 0, args);
 }
@@ -3106,6 +3109,12 @@
   }
   
   traversed -= ext_mem[3 + state];
+
   
-  return ((double)((traversed >= 0) ? traversed : 0) / (double)args.GetInt(0));
+  double quality = 0.0;
+  
+  double halflife = -1.0 * fabs(args.GetDouble(0));
+  quality = pow(2.0, (double)(args.GetInt(0) - ((traversed >= 0) ? traversed : 0)) / halflife);
+  
+  return quality;
 }