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

[grabow38 at myxo.css.msu.edu]

Author: grabow38
Date: 2009-02-02 09:02:41 -0500 (Mon, 02 Feb 2009)
New Revision: 3139

Modified:
   development/source/main/cTaskLib.cc
Log:
Revised task quality for sg_path_traversal.

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2009-01-30 16:01:06 UTC (rev 3138)
+++ development/source/main/cTaskLib.cc	2009-02-02 14:02:41 UTC (rev 3139)
@@ -3166,7 +3166,8 @@
   schema.AddEntry("poison", 1, cArgSchema::SCHEMA_STRING);
   
   // Double Arguments
-  schema.AddEntry("halflife", 0, cArgSchema::SCHEMA_DOUBLE);
+//  schema.AddEntry("halflife", 0, cArgSchema::SCHEMA_DOUBLE);
+//  schema.AddEntry("base", 1, 2.0);
   
   cArgContainer* args = cArgContainer::Load(argstr, schema, errors);
   if (args) NewTask(name, "State Grid Path Traversal", &cTaskLib::Task_SGPathTraversal, 0, args);
@@ -3204,8 +3205,9 @@
   
   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);
+//  double halflife = -1.0 * fabs(args.GetDouble(0));
+//  quality = pow(args.GetDouble(1), (double)(args.GetInt(0) - ((traversed >= 0) ? traversed : 0)) / halflife);
+  quality = (double)((traversed >= 0) ? traversed : 0) / (double)args.GetInt(0);
   
   return quality;
 }