Changeset 3318 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

Timestamp:

04/13/10 09:47:06 (14 years ago)

Author:

abeham

Message:

Updated test functions, added reference for Zakharov
Did not find a reference for SumSquares, just described it
Added wiring for rastrigin and sphere
#934

File:

• trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.TestFunctions {
   /// <summary>
-  /// Zakharov Function<br/>
-  /// Domain:  [-5.0 , 10.0]^n<br/>
-  /// Optimum: 0.0 at (0.0, 0.0, ..., 0.0)
+  /// The Zakharov function is implemented as described in Hedar, A. & Fukushima, M. 2004. Heuristic pattern search and its hybridization with simulated annealing for nonlinear global optimization. Optimization Methods and Software 19, pp. 291-308, Taylor & Francis.
   /// </summary>
-  [Item("ZakharovEvaluator", "Evaluates the Zakharov function on a given point. The optimum of this function is 0 at the origin.")]
+  [Item("ZakharovEvaluator", "Evaluates the Zakharov function on a given point. The optimum of this function is 0 at the origin. It is implemented as described in Hedar, A. & Fukushima, M. 2004. Heuristic pattern search and its hybridization with simulated annealing for nonlinear global optimization. Optimization Methods and Software 19, pp. 291-308, Taylor & Francis.")]
   [StorableClass]
   public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     /// <summary>
-    /// Returns false as the Ackley function is a minimization problem.
+    /// Returns false as the Zakharov function is a minimization problem.
     /// </summary>
     public override bool Maximization {
@@ -77 +75 @@
 
       for (int i = 0; i < length; i++) {
-        s1 = s1 + point[i] * point[i];
-        s2 = s2 + 0.5 * i * point[i];
+        s1 += point[i] * point[i];
+        s2 += 0.5 * i * point[i];
       }
-      return s1 + s2 * s2 + s2 * s2 * s2 * s2;
+      return s1 + (s2 * s2) + (s2 * s2 * s2 * s2);
     }