Changeset 11987 for trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

Timestamp:

02/12/15 15:39:28 (9 years ago)

Author:

abeham

Message:

#2282:

• Renamed BinaryVectorProblem to BinaryProblem
• Removed IBinaryVectorProblem interface
• Derived BinaryProblem from SingleObjectiveBasicProblem
• Changed bool[] datatype to BinaryVector

File:

• trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -32 +32 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.BinaryVector;
+using HeuristicLab.Problems.Binary;
 using HeuristicLab.Random;
 
@@ -44 +44 @@
   public class ParameterlessPopulationPyramid : BasicAlgorithm {
     public override Type ProblemType {
-      get { return typeof(BinaryVectorProblem); }
-    }
-    public new BinaryVectorProblem Problem {
-      get { return (BinaryVectorProblem)base.Problem; }
+      get { return typeof(BinaryProblem); }
+    }
+    public new BinaryProblem Problem {
+      get { return (BinaryProblem)base.Problem; }
       set { base.Problem = value; }
     }
@@ -56 +56 @@
 
     // Tracks all solutions in Pyramid for quick membership checks
-    private HashSet<bool[]> seen = new HashSet<bool[]>(new EnumerableBoolEqualityComparer());
+    private HashSet<BinaryVector> seen = new HashSet<BinaryVector>(new EnumerableBoolEqualityComparer());
 
     #region ParameterNames
@@ -179 +179 @@
     }
 
-    private void AddIfUnique(bool[] solution, int level) {
+    private void AddIfUnique(BinaryVector solution, int level) {
       // Don't add things you have seen
       if (seen.Contains(solution)) return;
@@ -185 +185 @@
         pyramid.Add(new Population(tracker.Length, random));
       }
-      var copied = (bool[])solution.Clone();
+      var copied = (BinaryVector)solution.Clone();
       pyramid[level].Add(copied);
       seen.Add(copied);
@@ -193 +193 @@
     private double iterate() {
       // Create a random solution
-      bool[] solution = new bool[tracker.Length];
+      BinaryVector solution = new BinaryVector(tracker.Length);
       for (int i = 0; i < solution.Length; i++) {
         solution[i] = random.Next(2) == 1;
       }
-      double fitness = tracker.Evaluate(solution);
+      double fitness = tracker.Evaluate(solution, random);
       fitness = HillClimber.ImproveToLocalOptimum(tracker, solution, fitness, random);
       AddIfUnique(solution, 0);
@@ -249 +249 @@
           fitness = iterate();
           cancellationToken.ThrowIfCancellationRequested();
-        }
-        finally {
+        } finally {
           ResultsEvaluations = tracker.Evaluations;
           ResultsBestSolution = new BinaryVector(tracker.BestSolution);