Changeset 12018 for branches/ALPS/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

Timestamp:

02/16/15 20:14:52 (10 years ago)

Author:

pfleck

Message:

#2269

• merged trunk after 3.3.11 release
• updated copyright and plugin version in ALPS plugin
• removed old ALPS samples based on an userdefined alg

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (8 diffs)

branches/ALPS/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  * and the BEACON Center for the Study of Evolution in Action.
  * 
@@ -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);