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

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2007-08-02 13:35:40 -0400 (Thu, 02 Aug 2007)
New Revision: 1889

Modified:
   development/source/main/cTaskLib.cc
Log:
Even more complex functions in optimize

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-08-02 17:31:08 UTC (rev 1888)
+++ development/source/main/cTaskLib.cc	2007-08-02 17:35:40 UTC (rev 1889)
@@ -2260,8 +2260,8 @@
     {
       double sum = 0;
       //      cout << "9x: " << vars[0] << " ";
-      for (int i=1; i<5; i++)
-	sum += vars[i]/4.0;
+      for (int i=1; i<args.GetInt(3); i++)
+		  sum += vars[i]/double(args.GetInt(3)-1);
       double Gx = 1+9*sum;
       Fx = Gx * (1.0 - sqrt(vars[0]/Gx));
       break;
@@ -2270,8 +2270,8 @@
     case 10:
     {
       double sum = 0;
-      for (int i=1; i<5; i++)
-	sum += vars[i]/4.0;
+      for (int i=1; i<args.GetInt(3); i++)
+		  sum += vars[i]/double(args.GetInt(3)-1);
       double Gx = 1+9*sum;
       Fx = Gx * (1.0 - pow(vars[0]/Gx, 2.0));
       break;
@@ -2280,8 +2280,8 @@
     case 11:
     {
       double sum = 0;
-      for (int i=1; i<5; i++)
-	sum += vars[i]/4.0;
+      for (int i=1; i<args.GetInt(3); i++)
+		  sum += vars[i]/double(args.GetInt(3)-1);
       double Gx = 1+9*sum;
       Fx = Gx * (1 - sqrt(vars[0]/Gx) - (vars[0]/Gx)*(sin(3.14159*vars[0]*10)));
       break;