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

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2007-07-11 11:16:00 -0400 (Wed, 11 Jul 2007)
New Revision: 1787

Modified:
   development/source/main/cTaskLib.cc
Log:
Added new problem using many variables for optimize



Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-07-11 01:17:13 UTC (rev 1786)
+++ development/source/main/cTaskLib.cc	2007-07-11 15:16:00 UTC (rev 1787)
@@ -2248,6 +2248,24 @@
       Fx = sqrt(4.0 - vars[0]) + vars[1];
       break;
 
+    case 9:
+    {
+      double sum = 0;
+      for (int i=1; i<5; i++)
+	sum += vars[i]/4.0;
+      Fx = (1.0 + 9*sum) * (1.0 - sqrt(vars[0] / (1.0 + 9*sum)));
+      break;
+    }
+
+    case 10:
+    {
+      double sum = 0;
+      for (int i=1; i<5; i++)
+	sum += vars[i]/4.0;
+      Fx = (1.0 + sum) * (1.0 - pow(vars[0] / (1.0 + sum), 2.0));
+      break;
+    }
+
     default:
       quality = .001;
   }