Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/Beale.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)
• Beale.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs) (2 diffs)

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

@@ -32 +32 @@
   /// It is implemented as described in Moré, J.J., Garbow, B., and Hillstrom, K. 1981. Testing unconstrained optimization software. ACM Transactions on Mathematical Software 7, pp. 136-140, ACM.
   /// </summary>
-  [Item("BealeEvaluator", "Evaluates the Beale function on a given point. The optimum of this function is 0 at (3,0.5). It is implemented as described in Moré, J.J., Garbow, B., and Hillstrom, K. 1981. Testing unconstrained optimization software. ACM Transactions on Mathematical Software 7, pp. 136-140, ACM.")]
+  [Item("Beale", "Evaluates the Beale function on a given point. The optimum of this function is 0 at (3,0.5). It is implemented as described in Moré, J.J., Garbow, B., and Hillstrom, K. 1981. Testing unconstrained optimization software. ACM Transactions on Mathematical Software 7, pp. 136-140, ACM.")]
   [StorableClass]
-  public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
-    public override string FunctionName { get { return "Beale"; } }
+  public class Beale : SingleObjectiveTestFunction {
     /// <summary>
     /// Returns false as the Beale function is a minimization problem.
@@ -68 +67 @@
 
     [StorableConstructor]
-    protected BealeEvaluator(bool deserializing) : base(deserializing) { }
-    protected BealeEvaluator(BealeEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public BealeEvaluator() : base() { }
+    protected Beale(bool deserializing) : base(deserializing) { }
+    protected Beale(Beale original, Cloner cloner) : base(original, cloner) { }
+    public Beale() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new BealeEvaluator(this, cloner);
+      return new Beale(this, cloner);
     }