Changeset 11663 for branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageTree.cs

Timestamp:

12/05/14 12:25:32 (9 years ago)

Author:

bgoldman

Message:

#2282 Reworked Linkage Tree to provide interface for clusters, moved crossover into static class.

File:

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

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

@@ -65 +65 @@
     private readonly int[][][] occurances;
     private readonly List<int>[] clusters;
-    private readonly List<int> clusterOrdering;
+    private List<int> clusterOrdering;
     private readonly int length;
-
-    public LinkageTree(int length) {
+    private readonly IRandom rand;
+    private bool rebuildRequired = false;
+
+    public LinkageTree(int length, IRandom rand) {
       this.length = length;
+      this.rand = rand;
       occurances = new int[length][][];
 
+      // Create a lower triangular matrix without the diagonal
       for (int i = 1; i < length; i++) {
         occurances[i] = new int[i][];
@@ -99 +103 @@
         }
       }
+      rebuildRequired = true;
     }
 
@@ -109 +114 @@
         var p = value / total;
         sum += (p * Math.Log(p));
-
       }
       return sum;
@@ -115 +119 @@
 
     private double EntropyDistance(int i, int j) {
+      // This ensures you are using the lower triangular part of "occurances"
       if (i < j) {
         int temp = i;
@@ -139 +144 @@
     }
 
-    public void Rebuild(IRandom rand) {
+    private void Rebuild() {
       // Keep track of which clusters have not been merged
       var topLevel = Enumerable.Range(0, length).ToList();
@@ -236 +241 @@
         if (useful[i]) clusterOrdering.Add(i);
       }
-      // TODO Shuffle cluster ordering
+
+      // Shuffle before sort to ensure ties are broken randomly
       clusterOrdering.ShuffleInPlace(rand);
-      clusterOrdering.Sort((i, j) => clusters[i].Count.CompareTo(clusters[j].Count));
-    }
-
-    public double ImproveUsingTree(bool[] solution, double fitness, BinaryVectorProblem problem) {
-      return fitness;
+      clusterOrdering = clusterOrdering.OrderBy(i => clusters[i].Count).ToList();
+    }
+
+    public IEnumerable<List<int>> Clusters {
+      get {
+        // Just in time rebuilding
+        if (rebuildRequired) Rebuild();
+        foreach (var index in clusterOrdering) {
+          // Send out the clusters in the desired order
+          yield return clusters[index];
+        }
+      }
     }
   }