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

Timestamp:

11/25/15 23:24:01 (9 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)
• Schwefel.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs) (2 diffs)

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

@@ -31 +31 @@
   /// The Schwefel function (sine root) is implemented as described in Affenzeller, M. and Wagner, S. 2005. Offspring Selection: A New Self-Adaptive Selection Scheme for Genetic Algorithms.  Ribeiro, B., Albrecht, R. F., Dobnikar, A., Pearson, D. W., and Steele, N. C. (eds.). Adaptive and Natural Computing Algorithms, pp. 218-221, Springer.
   /// </summary>
-  [Item("SchwefelEvaluator", "Evaluates the Schwefel function (sine root) on a given point. In the given bounds [-500;500] the optimum of this function is close to 0 at (420.968746453712,420.968746453712,...,420.968746453712). It is implemented as described in Affenzeller, M. and Wagner, S. 2005. Offspring Selection: A New Self-Adaptive Selection Scheme for Genetic Algorithms.  Ribeiro, B., Albrecht, R. F., Dobnikar, A., Pearson, D. W., and Steele, N. C. (eds.). Adaptive and Natural Computing Algorithms, pp. 218-221, Springer.")]
+  [Item("Schwefel", "Evaluates the Schwefel function (sine root) on a given point. In the given bounds [-500;500] the optimum of this function is close to 0 at (420.968746453712,420.968746453712,...,420.968746453712). It is implemented as described in Affenzeller, M. and Wagner, S. 2005. Offspring Selection: A New Self-Adaptive Selection Scheme for Genetic Algorithms.  Ribeiro, B., Albrecht, R. F., Dobnikar, A., Pearson, D. W., and Steele, N. C. (eds.). Adaptive and Natural Computing Algorithms, pp. 218-221, Springer.")]
   [StorableClass]
-  public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
-    public override string FunctionName { get { return "Schwefel"; } }
+  public class Schwefel : SingleObjectiveTestFunction {
     /// <summary>
     /// Returns false as the Schwefel (sine root) function is a minimization problem.
@@ -67 +66 @@
 
     [StorableConstructor]
-    protected SchwefelEvaluator(bool deserializing) : base(deserializing) { }
-    protected SchwefelEvaluator(SchwefelEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public SchwefelEvaluator() : base() { }
+    protected Schwefel(bool deserializing) : base(deserializing) { }
+    protected Schwefel(Schwefel original, Cloner cloner) : base(original, cloner) { }
+    public Schwefel() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SchwefelEvaluator(this, cloner);
+      return new Schwefel(this, cloner);
     }