Changeset 11318 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs

Timestamp:

08/31/14 18:28:25 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug and improved handling of elite individuals in the genealogy analyzer. Fixed minor bug in the tracing code. Other minor cosmetic improvements to the GenealogyGraph and FragmentGraphView.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs (modified) (7 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/FragmentGraphView.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
-using HeuristicLab.EvolutionTracking;
 using HeuristicLab.MainForm;
 using HeuristicLab.Visualization;
@@ -38 +37 @@
     private const int PreferredVerticalSpacing = 25;
 
-    private ReingoldTilfordLayoutEngine<TileLayoutNode> layoutEngine;
-    private ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> symbolicExpressionEngine;
-
-    private Dictionary<FragmentNode, TileLayoutNode> tileDictionary;
+    private readonly ReingoldTilfordLayoutEngine<TileLayoutNode> layoutEngine;
+    private readonly ReingoldTilfordLayoutEngine<ISymbolicExpressionTreeNode> symbolicExpressionEngine;
+
+    private readonly Dictionary<FragmentNode, TileLayoutNode> nodeToTileMap;
 
     private SymbolicExpressionTreeTile Root { get; set; }
@@ -63 +62 @@
         NodeHeight = 40
       };
-      tileDictionary = new Dictionary<FragmentNode, TileLayoutNode>();
+      nodeToTileMap = new Dictionary<FragmentNode, TileLayoutNode>();
     }
 
     private void MakeTiles() {
       var chart = symbolicExpressionChartControl.Chart;
-      tileDictionary.Clear();
+      nodeToTileMap.Clear();
       foreach (var node in Content.Vertices) {
-        var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)node.Data;
         var tile = new SymbolicExpressionTreeTile(chart);
         tile.LayoutEngine = symbolicExpressionEngine;
         tile.Label = "Generation " + node.Data.Rank + Environment.NewLine +
                      "Quality " + String.Format("{0:0.000}", node.Data.Quality);
-        tile.Root = graphNode.Data.Root;
+        tile.Root = node.Data.Data.Root;
         var tileNode = new TileLayoutNode { Tile = tile };
-        tileDictionary.Add(node, tileNode);
+        nodeToTileMap.Add(node, tileNode);
       }
       foreach (var node in Content.Vertices.Where(n => n.OutArcs.Any())) {
-        var layoutNode = tileDictionary[node];
-        layoutNode.Children = new List<TileLayoutNode>(node.OutArcs.Select(a => tileDictionary[(FragmentNode)a.Target]));
+        var layoutNode = nodeToTileMap[node];
+        layoutNode.Children = new List<TileLayoutNode>(node.OutArcs.Select(a => nodeToTileMap[(FragmentNode)a.Target]));
       }
     }
@@ -89 +87 @@
       var nodes = Content.Vertices.ToList();
       var root = nodes[0];
-      var fragmentRoot = tileDictionary[root];
+      var fragmentRoot = nodeToTileMap[root];
       int maxTileWidth = 0, maxTileHeight = 0;
-      var tiles = nodes.Select(x => tileDictionary[x].Tile).ToList();
+      var tiles = nodes.Select(x => nodeToTileMap[x].Tile).ToList();
 
       foreach (var tile in tiles) {
@@ -114 +112 @@
       // add connections between the tiles
       foreach (var node in nodes) {
-        var aTile = tileDictionary[node].Tile;
+        var aTile = nodeToTileMap[node].Tile;
         var aSize = aTile.Size;
         var aPos = aTile.Position;
@@ -158 +156 @@
 
         foreach (var child in node.OutArcs.Select(x => (FragmentNode)x.Target)) {
-          var bTile = tileDictionary[child].Tile;
+          var bTile = nodeToTileMap[child].Tile;
           var bSize = bTile.Size;
           var bPos = bTile.Position;
@@ -169 +167 @@
       }
       // center display on the root of the fragment graph
-      symbolicExpressionChartControl.Chart.Move(tileDictionary[root].Tile.Position.X, tileDictionary[root].Tile.Position.Y);
+      symbolicExpressionChartControl.Chart.Move(nodeToTileMap[root].Tile.Position.X, nodeToTileMap[root].Tile.Position.Y);
       symbolicExpressionChartControl.UpdateEnabled = true;
       symbolicExpressionChartControl.EnforceUpdate();