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

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2007-05-15 10:13:14 -0400 (Tue, 15 May 2007)
New Revision: 1555

Modified:
   development/source/main/cTaskLib.cc
Log:
Added a couple more problems to optimize function


Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-05-14 23:42:45 UTC (rev 1554)
+++ development/source/main/cTaskLib.cc	2007-05-15 14:13:14 UTC (rev 1555)
@@ -2207,6 +2207,26 @@
 		 quality = 1 - (( (1+y)*(1 - sqrt(x/(1+y)) - (x/(1+y))*sin(3.14159*x*10) ) +.76) / 2.76);
 		 break;
 
+	 case 5:
+	   x = x*-2.0;
+	   quality = 1 - (x*x+y*y)/5.0;
+	   break;
+
+	 case 6:
+	   x = x*-2.0;
+	   quality = 1 - ((x+2)*(x+2) + y*y)/5.0;
+	   break;
+
+	 case 7:
+	   x = x*4.0;
+	   quality = 1 - (sqrt(x)+y)/3.0;
+	   break;
+
+	 case 8:
+	   x = x*4.0;
+	   quality = 1 - (sqrt(4-x) + y)/3.0;
+	   break;
+
 	 default:
 		 quality = .001;
 	 }