Changeset 11666 for branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

Timestamp:

12/05/14 18:25:03 (9 years ago)

Author:

bgoldman

Message:

#2282 Evaluation counting, results and graphing, HIFF problem.

File:

• branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs (modified) (3 diffs)

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

@@ -30 +30 @@
   public static class LinkageCrossover {
 
-    public static double ImproveUsingTree(LinkageTree tree, IList<bool[]> donors, bool[] solution, double fitness, BinaryVectorProblem problem, IRandom rand) {
+    public static double ImproveUsingTree(LinkageTree tree, IList<bool[]> donors, bool[] solution, double fitness, IBinaryVectorProblem problem, IRandom rand) {
       var options = Enumerable.Range(0, donors.Count).ToArray();
       foreach (var cluster in tree.Clusters) {
@@ -36 +36 @@
         // from the current solution for this cluster of genes
         bool donorFound = false;
-        foreach (var donorIndex in options.Shuffle(rand)) {
+        foreach (var donorIndex in options.ShuffleList(rand)) {
           // Attempt the donation
           fitness = Donate(solution, fitness, donors[donorIndex], cluster, problem, out donorFound);
@@ -45 +45 @@
     }
 
-    private static double Donate(bool[] solution, double fitness, bool[] source, IEnumerable<int> cluster, BinaryVectorProblem problem, out bool changed) {
+    private static double Donate(bool[] solution, double fitness, bool[] source, IEnumerable<int> cluster, IBinaryVectorProblem problem, out bool changed) {
       // keep track of which bits flipped to make the donation
       List<int> flipped = new List<int>();