Changeset 8248 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Timestamp:

07/06/12 11:24:34 (12 years ago)

Author:

bburlacu

Message:

#1772: Separated instance-specific attributes of graph node objects from the generic genealogy graph, into metadata objects kept by the specific graph class which corresponds to the specific problem instance (so for instance the SymbolicExpressionTreeGenealogyGraph will keep info about node ranks and qualities etc because that info is specific to symbolic data analysis problems).

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Files:

• GenealogyGraphChart.cs (modified) (9 diffs)
• GenealogyGraphView.cs (modified) (1 diff)
• VisualGenealogyGraphNode.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

@@ -69 +69 @@
 
       var genealogyGraphNodes = Graph.Values.ToList();
-      var layers = genealogyGraphNodes.GroupBy(n => n.Rank).OrderBy(g => g.Key).Select(g => Tuple.Create(g.Key, g.ToList())).ToList();
+      var layers = genealogyGraphNodes.GroupBy(n => Graph[n].Ranks[0]).OrderBy(g => g.Key).Select(g => new { Rank = g.Key, Nodes = g.ToList() }).ToList();
       List<GenealogyGraphNode> currentLayer = null;
       List<GenealogyGraphNode> previousLayer = null;
@@ -75 +75 @@
       for (int i = 0; i != layers.Count(); ++i) {
         var layer = layers[i];
-        double currentRank = layer.Item1;
+        double currentRank = layer.Rank;
         if (i > 0 && currentRank % 1 == 0) {
           previousLayer = currentLayer;
-          currentLayer = layer.Item2;
+          currentLayer = layer.Nodes;
           int d = previousLayer.Count - currentLayer.Count;
           if (d > 0)
             currentLayer.AddRange(previousLayer.Take(d));
         } else {
-          currentLayer = layer.Item2;
-        }
-        currentLayer.Sort(); // sort descending by quality (using comparison defined in GenealogyGraphNode class)
+          currentLayer = layer.Nodes;
+        }
+        currentLayer.Sort((b, a) => {
+          if (Graph[a].Quality.Equals(Graph[b].Quality)) {
+            if (Graph[a].IsElite) return 1;
+            if (Graph[b].IsElite) return -1;
+          }
+          return Graph[a].Quality.CompareTo(Graph[b].Quality);
+        }); // sort descending by quality (using comparison defined in GenealogyGraphNode class)
 
         x = 0; // reset horizontal coordinate
@@ -95 +101 @@
             Data = node,
             ToolTipText = "Id: " + node.Label + nl +
-                          "Rank: " + node.Rank + nl +
-                          "Quality: " + String.Format("{0:0.0000}", node.Quality) + nl +
-                          "IsElite: " + node.IsElite
+                          "Ranks: " + Graph[node].Ranks + nl +
+                          "Quality: " + String.Format("{0:0.0000}", Graph[node].Quality) + nl +
+                          "IsElite: " + Graph[node].IsElite
           };
           Chart.Group.Add(visualNode);
@@ -171 +177 @@
           }
           var gNode = _selectedGenealogyGraphNode.Data; // genealogy graph node (representing an individual in the population) 
-          double rank = gNode.Rank;
+          double rank = Graph[gNode].Ranks[0];
           // ancestors
-          var ancestors = gNode.Ancestors().Where(a => a.Rank < rank).ToList();
+          var ancestors = gNode.Ancestors().Where(n => Graph[n].Ranks.Last() < rank).ToList();
           ancestors.Add(gNode);
           // descendants
-          var descendants = gNode.Descendants().Where(a => a.Rank > rank).ToList();
+          var descendants = gNode.Descendants().Where(n => Graph[n].Ranks.Last() > rank).ToList();
           descendants.Add(gNode);
           // highlight ancestors
           foreach (var node in ancestors.Select(n => _visualNodeMap[n][0])) {
-            node.Brush = new SolidBrush(node.ToColor());
+            node.Brush = new SolidBrush(Graph[node.Data].GetColor());
             if (node.IncomingArcs != null)
               foreach (var arc in node.IncomingArcs) {
@@ -186 +192 @@
                 // (for purposes of display consistency)
                 bool isFirst = arc.Source == _visualNodeMap[arc.Source.Data][0];
-                if (arc.Source.Data != arc.Target.Data && isFirst) {
-                  var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
-                  var end = new Point((int)arc.End.X, (int)arc.End.Y);
-                  arc.Pen.Brush = new LinearGradientBrush(start, end, arc.Source.ToColor(), arc.Target.ToColor());
-                }
+                if (arc.Source.Data == arc.Target.Data || !isFirst) continue;
+                var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
+                var end = new Point((int)arc.End.X, (int)arc.End.Y);
+                arc.Pen.Brush = new LinearGradientBrush(start, end, Graph[arc.Source.Data].GetColor(), Graph[arc.Target.Data].GetColor());
               }
           }
           // highlight descendants
           foreach (var node in descendants.Select(n => _visualNodeMap[n][0])) {
-            node.Brush = new SolidBrush(node.ToColor());
+            node.Brush = new SolidBrush(Graph[node.Data].GetColor());
             if (node.OutgoingArcs != null)
               foreach (var arc in node.OutgoingArcs) {
@@ -201 +206 @@
                 // (for purposes of display consistency)
                 bool isFirst = arc.Target == _visualNodeMap[arc.Target.Data][0];
-                if (arc.Source.Data != arc.Target.Data && isFirst) {
-                  var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
-                  var end = new Point((int)arc.End.X, (int)arc.End.Y);
-                  arc.Pen.Brush = new LinearGradientBrush(start, end, arc.Source.ToColor(), arc.Target.ToColor());
-                }
+                if (arc.Source.Data == arc.Target.Data || !isFirst) continue;
+                var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
+                var end = new Point((int)arc.End.X, (int)arc.End.Y);
+                arc.Pen.Brush = new LinearGradientBrush(start, end, Graph[arc.Source.Data].GetColor(), Graph[arc.Target.Data].GetColor());
               }
           }
@@ -222 +226 @@
     public void ClearAllNodes() {
       foreach (var primitive in Chart.Group.Primitives) {
-        if (primitive.Brush != null)
-          primitive.Brush = null;
+        primitive.Brush = null;
         if (primitive is VisualGenealogyGraphArc) {
           var arc = primitive as VisualGenealogyGraphArc;
@@ -234 +237 @@
     public void HighlightLineage(IEnumerable<GenealogyGraphNode> nodes) {
       foreach (var node in nodes.SelectMany(n => _visualNodeMap[n])) {
-        node.Brush = new SolidBrush(node.ToColor());
-        if (node.IncomingArcs != null && node == _visualNodeMap[node.Data][0]) {
-          foreach (var arc in node.IncomingArcs) {
-            if (arc.Source.Data == node.Data) continue;
-            var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
-            var end = new Point((int)arc.End.X, (int)arc.End.Y);
-            arc.Pen.Brush = new LinearGradientBrush(start, end, arc.Source.ToColor(), arc.Target.ToColor());
-          }
+        node.Brush = new SolidBrush(Graph[node.Data].GetColor());
+        if (node.IncomingArcs == null || node != _visualNodeMap[node.Data][0]) continue;
+        foreach (var arc in node.IncomingArcs) {
+          if (arc.Source.Data == node.Data) continue;
+          var start = new Point((int)arc.Start.X, (int)arc.Start.Y);
+          var end = new Point((int)arc.End.X, (int)arc.End.Y);
+          arc.Pen.Brush = new LinearGradientBrush(start, end, Graph[arc.Source.Data].GetColor(), Graph[arc.Target.Data].GetColor());
         }
       }
@@ -284 +286 @@
     }
   }
+
+  internal static class Util {
+    public static Color GetColor(this NodeMetadata nm) {
+      var colorIndex = (int)(nm.Quality * ColorGradient.Colors.Count);
+      if (colorIndex >= ColorGradient.Colors.Count) --colorIndex;
+      return ColorGradient.Colors[colorIndex];
+    }
+  }
 }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs

@@ -71 +71 @@
       else {
         genealogyGraphChart.Graph = Content;
-        var best = Content.Values.OrderByDescending(x => x.Quality).First();
+        var best = Content.Values.OrderByDescending(x => genealogyGraphChart.Graph[x].Quality).First();
         symbolicExpressionTreeChart.Tree = (ISymbolicExpressionTree)best.Data;
       }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphNode.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using HeuristicLab.Common;
 using HeuristicLab.Visualization;
 
@@ -75 +74 @@
       get { return new PointD((LowerLeft.X + UpperRight.X) / 2, (LowerLeft.Y + UpperRight.Y) / 2); }
     }
-
-    public Color ToColor() {
-      //      return Color.FromArgb((int)((1 - Data.Quality) * 255), (int)(Data.Quality * 255), 0);
-      int i = (int)(Data.Quality * ColorGradient.Colors.Count);
-      if (i == ColorGradient.Colors.Count) --i;
-      return ColorGradient.Colors[i];
-    }
-
-    public override void Draw(Graphics graphics) {
-      if (Data.IsElite) {
-        Point p = Chart.TransformWorldToPixel(new PointD(LowerLeft.X, LowerLeft.Y + Size.Height));
-        Size s = Chart.TransformWorldToPixel(Size);
-        if (Brush != null)
-          graphics.FillEllipse(Brush, p.X, p.Y, s.Width, s.Height);
-        graphics.DrawEllipse(Pen, p.X, p.Y, s.Width, s.Height);
-        graphics.DrawEllipse(Pen, p.X + 2, p.Y + 2, s.Width - 4, s.Height - 4);
-      } else {
-        base.Draw(graphics);
-      }
-    }
   }
 }