Changeset 8213 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views

Timestamp:

07/04/12 16:12:15 (12 years ago)

Author:

bburlacu

Message:

#1772: Performance improvements for the GenealogyGraph. Minor refactoring to VisualGenealogyGraphArc and VisualGenealogyGraphNode classes. Added new functionality to the SymbolicExpressionTreeFragmentsAnalyzer, minor refactoring in the other two analyzers. Refactored View code. Updated project references and plugin dependencies and added HeuristicLab.Problems.DataAnalysis.Symbolic to the branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (1 prop)
• HeuristicLab.EvolutionaryTracking.Views (modified) (1 prop)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.Designer.cs (modified) (1 diff)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs (modified) (7 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.Designer.cs (modified) (11 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs (modified) (6 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/HeuristicLab.EvolutionaryTracking.Views-3.4.csproj (modified) (5 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/Plugin.cs (modified) (2 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/Properties (modified) (1 prop)
• HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphArc.cs (modified) (1 diff)
• HeuristicLab.EvolutionaryTracking.Views/3.4/VisualGenealogyGraphNode.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionaryTracking

@@ +1 @@
+*.suo
 _ReSharper.HeuristicLab.Tracking
 bin

@@ +1 @@
+*.suo
 _ReSharper.HeuristicLab.Tracking
 bin

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

@@ -59 +59 @@
 
     #endregion
-
-    //private System.Windows.Forms.ToolTip toolTip;
   }
 }

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

@@ -26 +26 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Visualization;
@@ -33 +34 @@
     private Dictionary<GenealogyGraphNode, List<VisualGenealogyGraphNode>> _visualNodeMap;
     private Dictionary<Tuple<VisualGenealogyGraphNode, VisualGenealogyGraphNode>, VisualGenealogyGraphArc> _visualArcMap;
-    private const int Diameter = 20;
-    private int x, y;
-    private const int Cx = 30, Cy = 30;
-
+    private const int Diameter = 20; // node diameter
+    private int x, y; // coordinates for positioning each node
+    private const int Cx = 30, Cy = 30; // position increments
     private VisualGenealogyGraphNode _selectedGenealogyGraphNode;
     public VisualGenealogyGraphNode SelectedGenealogyGraphNode { get { return _selectedGenealogyGraphNode; } }
@@ -74 +74 @@
       for (int i = 0; i != count; ++i) {
         // propagate elites from successive layers
-        if (currRank == (int)currRank) prevLayer = currLayer;
+        bool f = currRank % 1 == 0;
+        if (f) // if the rank is an integer, then we need to propagate elites 
+          prevLayer = currLayer;
         currRank = layers.ElementAt(i).Key;
         currLayer = layers.ElementAt(i).ToList();
-        if (i > 0 && currRank == (int)currRank) {
-          // this code injects elites that propagate from the previous generation into the current graph layer, so that they can be represented as visual nodes
-          int prevCount = prevLayer.Count(node => node.IsElite);
-          int currCount = currLayer.Count(node => node.IsElite);
-          for (int j = currCount; j < prevCount; ++j) currLayer.Add(prevLayer.ElementAt(j));
+        if (i > 0 && f) {
+          // this following code injects elites that propagate from the previous generation into the current graph layer, 
+          // so that they can be represented as visual nodes
+          int prevEliteCount = prevLayer.Count(node => node.IsElite);
+          int currEliteCount = currLayer.Count(node => node.IsElite);
+          for (int j = currEliteCount; j < prevEliteCount; ++j)
+            currLayer.Add(prevLayer.ElementAt(j));
         }
         currLayer.Sort(); // uses the CompareTo() method inside the GenealogyGraphNode class
-
         foreach (var node in currLayer) {
           var pen = new Pen(Color.LightGray);
           var nl = Environment.NewLine;
           var visualNode = new VisualGenealogyGraphNode(Chart, x, y, x + Diameter, y + Diameter, pen, null) {
-            Data = node, ToolTipText = "Id: " + node.Label + nl + "Rank: " + node.Rank + nl + "Quality: " + String.Format("{0:0.0000}", node.Quality) + nl + "IsElite: " + node.IsElite
+            Data = node,
+            ToolTipText = "Id: " + node.Label + nl +
+                          "Rank: " + node.Rank + nl +
+                          "Quality: " + String.Format("{0:0.0000}", node.Quality) + nl +
+                          "IsElite: " + node.IsElite
           };
           Chart.Group.Add(visualNode);
-          if (!_visualNodeMap.ContainsKey(node)) _visualNodeMap[node] = new List<VisualGenealogyGraphNode>();
+          if (!_visualNodeMap.ContainsKey(node))
+            _visualNodeMap[node] = new List<VisualGenealogyGraphNode>();
           _visualNodeMap[node].Add(visualNode);
-          // connect visual nodes that actually represent the same individual in the genealogy graph (this applies for elites) with a dashed line
+          // connect visual nodes that actually represent the same individual 
+          // in the genealogy graph (this applies for elites) with a dashed line
           if (_visualNodeMap[node].Count > 1) {
             for (int c = _visualNodeMap[node].Count; c >= 2; --c) {
@@ -104 +113 @@
           }
           x += Cx; // increment horizontal coordinate
-          if (node.InEdges == null) continue;
+          if (node.InEdges == null && _visualNodeMap.ContainsKey(node)) continue;
           // add visual edges
           foreach (var arc in node.InEdges) {
             var parent = arc.Target;
             // find the visual parent node that is closest to the current node in terms of vertical distance
-            var visualParent = _visualNodeMap[parent].Where(p => p.Center.Y > visualNode.Center.Y).OrderByDescending(p => p.Center.Y).Last();
+            var visualParent = _visualNodeMap[parent].Where(p => p.Center.Y >= visualNode.Center.Y).OrderByDescending(p => p.Center.Y).Last();
             DashStyle style;
-            if (visualParent.Data == visualNode.Data) {
+            if (visualParent.Data == visualNode.Data) { // if the graph nodes represent the same elite individual
               style = DashStyle.Dash;
             } else {
@@ -143 +152 @@
         base.pictureBox_MouseUp(sender, e);
       else { // select mode
-        Chart.UpdateEnabled = false;
-        // clear colors
-        foreach (var primitive in Chart.Group.Primitives) {
-          if (primitive is VisualGenealogyGraphNode) {
-            var visualNode = primitive as VisualGenealogyGraphNode;
-            visualNode.Brush = null;
-          } else if (primitive is VisualGenealogyGraphArc) {
-            var visualArc = primitive as VisualGenealogyGraphArc;
-            if (visualArc.Source.Data != visualArc.Target.Data) visualArc.Pen.Brush = new SolidBrush(Color.Transparent);
-          }
-        }
         // get selected node
         var visualNodes = Chart.GetAllPrimitives(e.Location).Where(p => p is VisualGenealogyGraphNode).ToList();
         if (visualNodes.Count > 0) {
+          if (_selectedGenealogyGraphNode == visualNodes[0]) return;
           _selectedGenealogyGraphNode = visualNodes[0] as VisualGenealogyGraphNode;
-          // color selected node and its genealogy
           if (_selectedGenealogyGraphNode == null) return;
-          // use special highlighting for the currently selected genealogy graph node
+          // new node has been selected, clean up
+          Chart.UpdateEnabled = false;
+          // clear colors
+          ClearAllNodes();
+          // use a rectangle to highlight the currently selected genealogy graph node
           var center = _selectedGenealogyGraphNode.Center;
           var size = _selectedGenealogyGraphNode.Size;
-          double x1 = center.X - size.Width / 2, x2 = x1 + size.Width;
-          double y1 = center.Y - size.Height / 2, y2 = y1 + size.Height;
-          if (_targetRectangle != null) _targetRectangle.SetPosition(x1, y1, x2, y2);
-          else {
+          double x1 = center.X - size.Width / 2;
+          double x2 = x1 + size.Width;
+          double y1 = center.Y - size.Height / 2;
+          double y2 = y1 + size.Height;
+          if (_targetRectangle == null) {
             _targetRectangle = new Visualization.Rectangle(Chart, x1, y1, x2, y2, new Pen(Color.Black), null);
             Chart.Group.Add(_targetRectangle);
+          } else {
+            _targetRectangle.SetPosition(x1, y1, x2, y2);
           }
           var gNode = _selectedGenealogyGraphNode.Data; // genealogy graph node (representing an individual in the population) 
           double rank = gNode.Rank;
+          // ancestors
           var ancestors = gNode.Ancestors().Where(a => a.Rank < rank).ToList();
           ancestors.Add(gNode);
-          // highlight selected node and its ancestry
-          foreach (var node in ancestors.SelectMany(n => _visualNodeMap[n])) {
-            node.Brush = new SolidBrush(node.ToColor());
-            if (node.IncomingArcs != null && node == _visualNodeMap[node.Data].First()) {
-              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());
-              }
-            }
-          }
-          // highlight the descendants
+          // descendants
           var descendants = gNode.Descendants().Where(a => a.Rank > rank).ToList();
           descendants.Add(gNode);
-          foreach (var node in descendants.SelectMany(n => _visualNodeMap[n])) {
+          // highlight ancestors
+          foreach (var node in ancestors.Select(n => _visualNodeMap[n][0])) {
             node.Brush = new SolidBrush(node.ToColor());
-            foreach (var arc in node.IncomingArcs.Where(a => descendants.Contains(a.Source.Data))) {
-              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());
-            }
+            if (node.IncomingArcs != null)
+              foreach (var arc in node.IncomingArcs)
+                if (arc.Source.Data != arc.Target.Data && arc.Source == _visualNodeMap[arc.Source.Data][0]) {
+                  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());
+                }
+          }
+          // highlight descendants
+          foreach (var node in descendants.Select(n => _visualNodeMap[n][0])) {
+            node.Brush = new SolidBrush(node.ToColor());
+            if (node.OutgoingArcs != null)
+              foreach (var arc in node.OutgoingArcs)
+                if (arc.Source.Data != arc.Target.Data && arc.Target == _visualNodeMap[arc.Target.Data][0]) {
+                  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());
+                }
           }
         } else {
@@ -206 +213 @@
         if (_selectedGenealogyGraphNode != null)
           /* emit clicked event */
-          GenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
+          OnGenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
       }
     }
 
     public void ClearAllNodes() {
+      foreach (var primitive in Chart.Group.Primitives) {
+        if (primitive.Brush != null)
+          primitive.Brush = null;
+        if (primitive is VisualGenealogyGraphArc) {
+          var arc = primitive as VisualGenealogyGraphArc;
+          if (arc.Source.Data != arc.Target.Data && primitive.Pen.Brush != null)
+            primitive.Pen.Brush = new SolidBrush(Color.Transparent);
+        }
+      }
+    }
+
+    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());
+          }
+        }
+      }
+    }
+
+    public void HighlightNodes(IEnumerable<ISymbolicExpressionTree> trees, Color color) {
+      foreach (var visualNode in trees.Select(tree => _visualNodeMap[Graph.GetNode(tree)]).SelectMany(vList => vList))
+        visualNode.Brush = new SolidBrush(color);
+    }
+
+    public void HighlightInDegree() {
       Chart.UpdateEnabled = false;
-      foreach (var node in Chart.Group.Primitives.Where(p => p is VisualGenealogyGraphNode).Cast<VisualGenealogyGraphNode>()) {
-        node.Brush = null;
-        if (node.IncomingArcs != null)
-          foreach (var arc in node.IncomingArcs)
-            if (arc.Source.Data != node.Data) arc.Pen = new Pen(Color.Transparent);
+      ClearAllNodes();
+      var graphNodes = Graph.Values.ToList();
+      double min = graphNodes.Min(x => x.InEdges == null ? 0 : x.InEdges.Count);
+      double max = graphNodes.Max(x => x.InEdges == null ? 0 : x.InEdges.Count);
+      foreach (var graphNode in graphNodes) {
+        var visualNode = _visualNodeMap[graphNode][0];
+        double deg = graphNode.InEdges == null ? 0 : graphNode.InEdges.Count;
+        var color = Color.FromArgb((int)(1 - deg / max) * 255, (int)(deg / max * 255), 100);
+        visualNode.Brush = new SolidBrush(color);
       }
       Chart.UpdateEnabled = true;
@@ -222 +264 @@
     }
 
-    public void HighlightNodes(IEnumerable<ISymbolicExpressionTree> trees, Color color) {
+    public void HighlightOutDegree() {
       Chart.UpdateEnabled = false;
-      foreach (var visualNode in trees.Select(tree => _visualNodeMap[Graph.GetNode(tree)]).SelectMany(vList => vList))
-        visualNode.Brush = new SolidBrush(color);
-
+      ClearAllNodes();
+      var graphNodes = Graph.Values.ToList();
+      double min = graphNodes.Min(x => x.OutEdges == null ? 0 : x.OutEdges.Count);
+      double max = graphNodes.Max(x => x.OutEdges == null ? 0 : x.OutEdges.Count);
+      foreach (var graphNode in graphNodes) {
+        var visualNode = _visualNodeMap[graphNode][0];
+        double deg = graphNode.OutEdges == null ? 0 : graphNode.OutEdges.Count;
+        int index = (int)(deg / max * ColorGradient.Colors.Count) - 1;
+        if (index < 0) index = 0;
+        visualNode.Brush = new SolidBrush(ColorGradient.Colors[index]);
+      }
       Chart.UpdateEnabled = true;
       Chart.EnforceUpdate();

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

@@ -27 +27 @@
       this.mainTableLayout = new System.Windows.Forms.TableLayoutPanel();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.topControlBox = new System.Windows.Forms.GroupBox();
-      this.similarityModeLabel = new System.Windows.Forms.Label();
-      this.similarityModeSelector = new System.Windows.Forms.ComboBox();
-      this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.genealogyTableLayout = new System.Windows.Forms.TableLayoutPanel();
       this.graphControlsPanel = new System.Windows.Forms.Panel();
@@ -36 +32 @@
       this.moveModeButton = new System.Windows.Forms.RadioButton();
       this.zoomModeButton = new System.Windows.Forms.RadioButton();
+      this.symbolicExpressionTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
+      this.topControlBox = new System.Windows.Forms.GroupBox();
+      this.similarityModeLabel = new System.Windows.Forms.Label();
+      this.similarityModeSelector = new System.Windows.Forms.ComboBox();
       this.genealogyGraphChart = new HeuristicLab.EvolutionaryTracking.Views.GenealogyGraphChart();
+      this.inDegreeButton = new System.Windows.Forms.Button();
+      this.outDegreeButton = new System.Windows.Forms.Button();
       this.mainTableLayout.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -42 +44 @@
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
-      this.topControlBox.SuspendLayout();
       this.genealogyTableLayout.SuspendLayout();
       this.graphControlsPanel.SuspendLayout();
+      this.topControlBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -83 +85 @@
       this.splitContainer.TabIndex = 7;
       // 
-      // topControlBox
-      // 
-      this.topControlBox.Controls.Add(this.similarityModeLabel);
-      this.topControlBox.Controls.Add(this.similarityModeSelector);
-      this.topControlBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.topControlBox.Location = new System.Drawing.Point(3, 3);
-      this.topControlBox.Name = "topControlBox";
-      this.topControlBox.Size = new System.Drawing.Size(522, 44);
-      this.topControlBox.TabIndex = 6;
-      this.topControlBox.TabStop = false;
-      this.topControlBox.Text = "Controls";
-      // 
-      // similarityModeLabel
-      // 
-      this.similarityModeLabel.AutoSize = true;
-      this.similarityModeLabel.Location = new System.Drawing.Point(6, 20);
-      this.similarityModeLabel.Name = "similarityModeLabel";
-      this.similarityModeLabel.Size = new System.Drawing.Size(80, 13);
-      this.similarityModeLabel.TabIndex = 1;
-      this.similarityModeLabel.Text = "Similarity Mode:";
-      // 
-      // similarityModeSelector
-      // 
-      this.similarityModeSelector.FormattingEnabled = true;
-      this.similarityModeSelector.Items.AddRange(new object[] {
-            "Exact",
-            "High",
-            "Relaxed"});
-      this.similarityModeSelector.Location = new System.Drawing.Point(92, 17);
-      this.similarityModeSelector.Name = "similarityModeSelector";
-      this.similarityModeSelector.Size = new System.Drawing.Size(148, 21);
-      this.similarityModeSelector.TabIndex = 0;
-      this.similarityModeSelector.SelectedIndexChanged += new System.EventHandler(this.similarityModeSelector_SelectedIndexChanged);
-      // 
-      // symbolicExpressionTreeChart
-      // 
-      this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
-      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
-      this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
-      this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
-      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(275, 385);
-      this.symbolicExpressionTreeChart.Spacing = 5;
-      this.symbolicExpressionTreeChart.SuspendRepaint = false;
-      this.symbolicExpressionTreeChart.TabIndex = 2;
-      this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
-      this.symbolicExpressionTreeChart.Tree = null;
-      // 
       // genealogyTableLayout
       // 
@@ -148 +102 @@
       // graphControlsPanel
       // 
+      this.graphControlsPanel.Controls.Add(this.outDegreeButton);
+      this.graphControlsPanel.Controls.Add(this.inDegreeButton);
       this.graphControlsPanel.Controls.Add(this.selectModeButton);
       this.graphControlsPanel.Controls.Add(this.moveModeButton);
@@ -160 +116 @@
       this.selectModeButton.Appearance = System.Windows.Forms.Appearance.Button;
       this.selectModeButton.AutoSize = true;
-      this.selectModeButton.Location = new System.Drawing.Point(103, 3);
+      this.selectModeButton.Location = new System.Drawing.Point(65, 3);
       this.selectModeButton.Name = "selectModeButton";
-      this.selectModeButton.Size = new System.Drawing.Size(47, 23);
+      this.selectModeButton.Size = new System.Drawing.Size(24, 23);
       this.selectModeButton.TabIndex = 5;
       this.selectModeButton.TabStop = true;
-      this.selectModeButton.Text = "Select";
+      this.selectModeButton.Text = "S";
       this.selectModeButton.UseVisualStyleBackColor = true;
       this.selectModeButton.CheckedChanged += new System.EventHandler(this.selectModeButton_CheckedChanged);
@@ -175 +131 @@
       this.moveModeButton.Location = new System.Drawing.Point(3, 3);
       this.moveModeButton.Name = "moveModeButton";
-      this.moveModeButton.Size = new System.Drawing.Size(44, 23);
+      this.moveModeButton.Size = new System.Drawing.Size(26, 23);
       this.moveModeButton.TabIndex = 3;
       this.moveModeButton.TabStop = true;
-      this.moveModeButton.Text = "Move";
+      this.moveModeButton.Text = "M";
       this.moveModeButton.UseVisualStyleBackColor = true;
       this.moveModeButton.CheckedChanged += new System.EventHandler(this.moveModeButton_CheckedChanged);
@@ -186 +142 @@
       this.zoomModeButton.Appearance = System.Windows.Forms.Appearance.Button;
       this.zoomModeButton.AutoSize = true;
-      this.zoomModeButton.Location = new System.Drawing.Point(53, 3);
+      this.zoomModeButton.Location = new System.Drawing.Point(35, 3);
       this.zoomModeButton.Name = "zoomModeButton";
-      this.zoomModeButton.Size = new System.Drawing.Size(44, 23);
+      this.zoomModeButton.Size = new System.Drawing.Size(24, 23);
       this.zoomModeButton.TabIndex = 4;
       this.zoomModeButton.TabStop = true;
-      this.zoomModeButton.Text = "Zoom";
+      this.zoomModeButton.Text = "Z";
       this.zoomModeButton.UseVisualStyleBackColor = true;
       this.zoomModeButton.CheckedChanged += new System.EventHandler(this.zoomModeButton_CheckedChanged);
+      // 
+      // symbolicExpressionTreeChart
+      // 
+      this.symbolicExpressionTreeChart.BackgroundColor = System.Drawing.Color.White;
+      this.symbolicExpressionTreeChart.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.symbolicExpressionTreeChart.LineColor = System.Drawing.Color.Black;
+      this.symbolicExpressionTreeChart.Location = new System.Drawing.Point(0, 0);
+      this.symbolicExpressionTreeChart.Name = "symbolicExpressionTreeChart";
+      this.symbolicExpressionTreeChart.Size = new System.Drawing.Size(275, 385);
+      this.symbolicExpressionTreeChart.Spacing = 5;
+      this.symbolicExpressionTreeChart.SuspendRepaint = false;
+      this.symbolicExpressionTreeChart.TabIndex = 2;
+      this.symbolicExpressionTreeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
+      this.symbolicExpressionTreeChart.Tree = null;
+      // 
+      // topControlBox
+      // 
+      this.topControlBox.Controls.Add(this.similarityModeLabel);
+      this.topControlBox.Controls.Add(this.similarityModeSelector);
+      this.topControlBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.topControlBox.Location = new System.Drawing.Point(3, 3);
+      this.topControlBox.Name = "topControlBox";
+      this.topControlBox.Size = new System.Drawing.Size(522, 44);
+      this.topControlBox.TabIndex = 6;
+      this.topControlBox.TabStop = false;
+      this.topControlBox.Text = "Controls";
+      // 
+      // similarityModeLabel
+      // 
+      this.similarityModeLabel.AutoSize = true;
+      this.similarityModeLabel.Location = new System.Drawing.Point(6, 20);
+      this.similarityModeLabel.Name = "similarityModeLabel";
+      this.similarityModeLabel.Size = new System.Drawing.Size(80, 13);
+      this.similarityModeLabel.TabIndex = 1;
+      this.similarityModeLabel.Text = "Similarity Mode:";
+      // 
+      // similarityModeSelector
+      // 
+      this.similarityModeSelector.FormattingEnabled = true;
+      this.similarityModeSelector.Items.AddRange(new object[] {
+            "Exact",
+            "High",
+            "Relaxed"});
+      this.similarityModeSelector.Location = new System.Drawing.Point(92, 17);
+      this.similarityModeSelector.Name = "similarityModeSelector";
+      this.similarityModeSelector.Size = new System.Drawing.Size(148, 21);
+      this.similarityModeSelector.TabIndex = 0;
+      this.similarityModeSelector.SelectedIndexChanged += new System.EventHandler(this.similarityModeSelector_SelectedIndexChanged);
       // 
       // genealogyGraphChart
@@ -204 +208 @@
       this.genealogyGraphChart.Size = new System.Drawing.Size(233, 343);
       this.genealogyGraphChart.TabIndex = 2;
+      // 
+      // inDegreeButton
+      // 
+      this.inDegreeButton.AutoSize = true;
+      this.inDegreeButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.inDegreeButton.Location = new System.Drawing.Point(95, 3);
+      this.inDegreeButton.Name = "inDegreeButton";
+      this.inDegreeButton.Size = new System.Drawing.Size(28, 23);
+      this.inDegreeButton.TabIndex = 6;
+      this.inDegreeButton.Text = "IN";
+      this.inDegreeButton.UseVisualStyleBackColor = true;
+      this.inDegreeButton.Click += new System.EventHandler(this.inDegreeButton_Click);
+      // 
+      // outDegreeButton
+      // 
+      this.outDegreeButton.AutoSize = true;
+      this.outDegreeButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.outDegreeButton.Location = new System.Drawing.Point(129, 3);
+      this.outDegreeButton.Name = "outDegreeButton";
+      this.outDegreeButton.Size = new System.Drawing.Size(40, 23);
+      this.outDegreeButton.TabIndex = 7;
+      this.outDegreeButton.Text = "OUT";
+      this.outDegreeButton.UseVisualStyleBackColor = true;
+      this.outDegreeButton.Click += new System.EventHandler(this.outDegreeButton_Click);
       // 
       // GenealogyGraphView
@@ -217 +245 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
-      this.topControlBox.ResumeLayout(false);
-      this.topControlBox.PerformLayout();
       this.genealogyTableLayout.ResumeLayout(false);
       this.graphControlsPanel.ResumeLayout(false);
       this.graphControlsPanel.PerformLayout();
+      this.topControlBox.ResumeLayout(false);
+      this.topControlBox.PerformLayout();
       this.ResumeLayout(false);
 
@@ -240 +268 @@
     private System.Windows.Forms.RadioButton moveModeButton;
     private System.Windows.Forms.RadioButton zoomModeButton;
+    private System.Windows.Forms.Button inDegreeButton;
+    private System.Windows.Forms.Button outDegreeButton;
 
   }

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

@@ -29 +29 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Visualization;
 
@@ -92 +93 @@
       var genealogyGraphNode = (GenealogyGraphNode)visualGenealogyGraphNode.Data;
       symbolicExpressionTreeChart.Tree = (ISymbolicExpressionTree)genealogyGraphNode.Data;
+      // highlight the relevant fragment in the symbolic expression tree
       if (_selectedVisualSymbolicExpressionTreeNode != null) {
         var nodes = symbolicExpressionTreeChart.Tree.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
@@ -140 +142 @@
       var treeNode = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode;
       Color[] colors = { Color.LightSkyBlue, Color.PaleGreen, Color.Tan };
-
+      // update visual graph nodes
+      genealogyGraphChart.Chart.UpdateEnabled = false;
       genealogyGraphChart.ClearAllNodes(); // clear node colors
       // color each graph node according to the degree to which it matches the selected tree fragment
@@ -147 +150 @@
         if (owners.Any()) genealogyGraphChart.HighlightNodes(owners, colors[i]); // highlight matching individuals from the genealogy
       }
+      genealogyGraphChart.Chart.UpdateEnabled = true;
+      genealogyGraphChart.Chart.EnforceUpdate();
 
       // highlight subtree nodes in the tree chart
@@ -164 +169 @@
       var owners = genealogyGraphChart.Graph.TraceFragment(treeNode, similarityModeSelector.SelectedIndex).ToList();
       if (owners.Any()) {
+        genealogyGraphChart.Chart.UpdateEnabled = false;
         genealogyGraphChart.ClearAllNodes(); // clear the fill color of all nodes
         genealogyGraphChart.HighlightNodes(owners, Color.LightSkyBlue); // highlight matching individuals from the genealogy
+        genealogyGraphChart.Chart.UpdateEnabled = true;
       }
+      genealogyGraphChart.Chart.EnforceUpdate();
       // highlight subtree nodes in the tree chart
       foreach (var visualNode in symbolicExpressionTreeChart.Tree.IterateNodesPostfix().Select(node => symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node)))
@@ -174 +182 @@
     }
     #endregion
+
+    private void inDegreeButton_Click(object sender, EventArgs e) {
+      genealogyGraphChart.HighlightInDegree();
+    }
+
+    private void outDegreeButton_Click(object sender, EventArgs e) {
+      genealogyGraphChart.HighlightOutDegree();
+    }
   }
 }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/HeuristicLab.EvolutionaryTracking.Views-3.4.csproj

@@ -18 +18 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
+    <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -67 +67 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
-    </Reference>
-    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
@@ -118 +114 @@
       <Name>HeuristicLab.EvolutionaryTracking-3.4</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
+      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -123 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="GenealogyGraphView.resx">
+      <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.PluginInfrastructure;
 
@@ -28 +25 @@
   [Plugin("HeuristicLab.EvolutionaryTracking.Views", "Provides controls and views for the evolution graph and related structures.", "3.4.2.7439")]
   [PluginFile("HeuristicLab.EvolutionaryTracking.Views-3.4.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
-  [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
-  [PluginDependency("HeuristicLab.Operators", "3.3")]
-  [PluginDependency("HeuristicLab.Optimization", "3.3")]
-  [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.4")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Visualization", "3.3")]
+  [PluginDependency("HeuristicLab.EvolutionaryTracking", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
+
   public class HeuristicLabEvolutionaryTrackingPlugin : PluginBase {
   }

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

@@ -25 +25 @@
 
 namespace HeuristicLab.EvolutionaryTracking.Views {
-  class VisualGenealogyGraphArc : Line {
+  public class VisualGenealogyGraphArc : Line {
     public VisualGenealogyGraphNode Source;
     public VisualGenealogyGraphNode Target;

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

@@ -28 +28 @@
   public class VisualGenealogyGraphNode : Ellipse {
     public GenealogyGraphNode Data { get; internal set; }
-    internal List<VisualGenealogyGraphArc> IncomingArcs = new List<VisualGenealogyGraphArc>();
-    internal List<VisualGenealogyGraphArc> OutgoingArcs = new List<VisualGenealogyGraphArc>();
+    private List<VisualGenealogyGraphArc> _incomingArcs = new List<VisualGenealogyGraphArc>();
+    private List<VisualGenealogyGraphArc> _outgoingArgs = new List<VisualGenealogyGraphArc>();
+
+    public List<VisualGenealogyGraphArc> IncomingArcs {
+      get { return _incomingArcs; }
+      set { _incomingArcs = value; }
+    }
+    public List<VisualGenealogyGraphArc> OutgoingArcs {
+      get { return _outgoingArgs; }
+      set { _outgoingArgs = value; }
+    }
 
     public VisualGenealogyGraphNode(IChart chart, PointD lowerLeft, PointD upperRight)

@@ +1 @@
+*.suo
 _ReSharper.HeuristicLab.Tracking
 bin