Changeset 13893 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/Layout/ConstrainedForceDirectedLayout.cs

Timestamp:

06/14/16 17:12:51 (8 years ago)

Author:

bburlacu

Message:

#2288: Simplify and optimize code for cluster identification in ConstrainedForceDirectedLayout.cs. Introduce a TrackBar for adjusting network threshold in the RunCollectionVariableInteractionNetworkView. Minor improvements to the DirectedGraphChart (work in progress).

File:

• branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/Layout/ConstrainedForceDirectedLayout.cs (modified) (3 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/Layout/ConstrainedForceDirectedLayout.cs

@@ -25 +25 @@
 using System.Linq;
 using Cola;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Random;
@@ -180 +179 @@
 
     private static IEnumerable<Cluster> IdentifyClusters(RectanglePtrs rectangles, ColaEdges edges) {
-      var vertices = rectangles.Select(x => new Vertex()).ToList();
+      // build a graph using the rectangles and the edges
+      var vertices = new List<IVertex>(rectangles.Select(x => new Vertex()));
       foreach (var e in edges) {
         var i = (int)e.first;
@@ -188 +188 @@
         vertices[j].AddArc(arc);
       }
-      while (vertices.Min(x => x.Weight).IsAlmost(0)) {
-        foreach (var v in vertices) {
-          if (v.Weight > 0) continue;
-          v.Weight = vertices.Max(x => x.Weight) + 1;
+      // group vertices into clusters
+      var clusters = new List<RectangularCluster>();
+      for (int i = 0; i < vertices.Count; ++i) {
+        var v = vertices[i];
+        if (v.Weight > 0) {
+          clusters[(int)Math.Round(v.Weight) - 1].addChildNode((uint)i);
+        } else {
+          var cluster = new RectangularCluster();
+          cluster.addChildNode((uint)i);
+          clusters.Add(cluster);
+          v.Weight = clusters.Count;
           ColourNeighbours(v);
         }
       }
-      var colors = vertices.Select(x => (int)Math.Round(x.Weight)).ToList();
-      foreach (var i in colors.Distinct()) {
-        var cluster = new RectangularCluster();
-        for (int j = 0; j < colors.Count; ++j) {
-          if (colors[j] == i) cluster.addChildNode((uint)j);
-        }
-        yield return cluster;
-      }
+      return clusters;
     }