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

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

@@ -31 +31 @@
   /// The Booth function is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page816.htm, last accessed April 12th, 2010.
   /// </summary>
-  [Item("BoothEvaluator", "Evaluates the Booth function on a given point. The optimum of this function is 0 at (1,3). It is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page816.htm, last accessed April 12th, 2010.")]
+  [Item("Booth", "Evaluates the Booth function on a given point. The optimum of this function is 0 at (1,3). It is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page816.htm, last accessed April 12th, 2010.")]
   [StorableClass]
-  public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
-    public override string FunctionName { get { return "Booth"; } }
+  public class Booth : SingleObjectiveTestFunction {
     /// <summary>
     /// Returns false as the Booth function is a minimization problem.
@@ -67 +66 @@
 
     [StorableConstructor]
-    protected BoothEvaluator(bool deserializing) : base(deserializing) { }
-    protected BoothEvaluator(BoothEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public BoothEvaluator() : base() { }
+    protected Booth(bool deserializing) : base(deserializing) { }
+    protected Booth(Booth original, Cloner cloner) : base(original, cloner) { }
+    public Booth() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new BoothEvaluator(this, cloner);
+      return new Booth(this, cloner);
     }