Changeset 13339 for branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

Timestamp:

11/23/15 16:14:57 (9 years ago)

Author:

mkommend

Message:

#2521: Rectored problems and encodings.

File:

• branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs (modified) (5 diffs)

branches/ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Binary;
 
 namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
@@ -34 +34 @@
   // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
   // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
-  internal sealed class EvaluationTracker : BinaryProblem {
-    private readonly BinaryProblem problem;
+  internal sealed class EvaluationTracker : SingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> {
+    private readonly ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem;
 
     private int maxEvaluations;
@@ -59 +59 @@
       private set;
     }
+
+    public new BinaryVectorEncoding Encoding {
+      get { return problem.Encoding; }
+    }
     #endregion
 
@@ -75 +79 @@
       return new EvaluationTracker(this, cloner);
     }
-    public EvaluationTracker(BinaryProblem problem, int maxEvaluations) {
+    public EvaluationTracker(ISingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> problem, int maxEvaluations) {
       this.problem = problem;
       this.maxEvaluations = maxEvaluations;
-      BestSolution = new BinaryVector(Length);
+      BestSolution = new BinaryVector(problem.Encoding.Length);
       BestQuality = double.NaN;
       Evaluations = 0;
@@ -99 +103 @@
     }
 
-    public override int Length {
-      get { return problem.Length; }
-      set { problem.Length = value; }
-    }
-
     public override bool Maximization {
       get {