Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/Griewank.cs

Timestamp:

11/25/15 23:24:01 (8 years ago)

Author:

abeham

Message:

#2521:

• Adapted single-objective test function problem to new problem infrastructure
• Added additional interfaces to RealVectorEncoding
• Fixed IParticleUpdater interface (must implement IStochasticOperator if it contains a Random parameter)

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions

Files:

• . (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators)
• Griewank.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/Griewank.cs

@@ -33 +33 @@
   /// Here it is implemented as described (without the modifications) in Locatelli, M. 2003. A note on the Griewank test function. Journal of Global Optimization 25, pp. 169-174, Springer.
   /// </summary>
-  [Item("GriewankEvaluator", "Evaluates the Griewank function on a given point. The optimum of this function is 0 at the origin. It is introduced by Griewank A.O. 1981 and implemented as described (without the modifications) in Locatelli, M. 2003. A note on the Griewank test function. Journal of Global Optimization 25, pp. 169-174, Springer.")]
+  [Item("Griewank", "Evaluates the Griewank function on a given point. The optimum of this function is 0 at the origin. It is introduced by Griewank A.O. 1981 and implemented as described (without the modifications) in Locatelli, M. 2003. A note on the Griewank test function. Journal of Global Optimization 25, pp. 169-174, Springer.")]
   [StorableClass]
-  public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
-    public override string FunctionName { get { return "Griewank"; } }
+  public class Griewank : SingleObjectiveTestFunction {
     /// <summary>
     /// Returns false as the Griewank function is a minimization problem.
@@ -69 +68 @@
 
     [StorableConstructor]
-    protected GriewankEvaluator(bool deserializing) : base(deserializing) { }
-    protected GriewankEvaluator(GriewankEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public GriewankEvaluator() : base() { }
+    protected Griewank(bool deserializing) : base(deserializing) { }
+    protected Griewank(Griewank original, Cloner cloner) : base(original, cloner) { }
+    public Griewank() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new GriewankEvaluator(this, cloner);
+      return new Griewank(this, cloner);
     }