Changeset 12005 for stable/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

Timestamp:

02/13/15 15:00:15 (10 years ago)

Author:

abeham

Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid (copied) (copied from trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs (modified) (5 diffs)

stable/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

@@ -20 +20 @@
  */
 #endregion
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Problems.Binary;
 using HeuristicLab.Random;
 
@@ -34 +33 @@
   public static class LinkageCrossover {
     // In the GECCO paper, Figure 3
-    public static double ImproveUsingTree(LinkageTree tree, IList<bool[]> donors, bool[] solution, double fitness, IBinaryVectorProblem problem, IRandom rand) {
+    public static double ImproveUsingTree(LinkageTree tree, IList<BinaryVector> donors, BinaryVector solution, double fitness, BinaryProblem problem, IRandom rand) {
       var options = Enumerable.Range(0, donors.Count).ToArray();
       foreach (var cluster in tree.Clusters) {
@@ -42 +41 @@
         foreach (var donorIndex in options.ShuffleList(rand)) {
           // Attempt the donation
-          fitness = Donate(solution, fitness, donors[donorIndex], cluster, problem, out donorFound);
+          fitness = Donate(solution, fitness, donors[donorIndex], cluster, problem, rand, out donorFound);
           if (donorFound) break;
         }
@@ -49 +48 @@
     }
 
-    private static double Donate(bool[] solution, double fitness, bool[] source, IEnumerable<int> cluster, IBinaryVectorProblem problem, out bool changed) {
+    private static double Donate(BinaryVector solution, double fitness, BinaryVector source, IEnumerable<int> cluster, BinaryProblem problem, IRandom rand, out bool changed) {
       // keep track of which bits flipped to make the donation
       List<int> flipped = new List<int>();
@@ -60 +59 @@
       changed = flipped.Count > 0;
       if (changed) {
-        double newFitness = problem.Evaluate(solution);
+        double newFitness = problem.Evaluate(solution, rand);
         // if the original is strictly better, revert the change
         if (problem.IsBetter(fitness, newFitness)) {