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

Timestamp:

07/31/14 17:11:39 (10 years ago)

Author:

bburlacu

Message:

#1772: Ported the rest of the changes to the DirectedGraph and Vertex to the GenealogyGraph and GenealogyGraphNode. Adapted tracking operators, analyzers and views.

File:

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

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

@@ -70 +70 @@
       tileDictionary.Clear();
       foreach (var node in Content.Vertices) {
-        var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)node.Content;
+        var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)node.Data;
         var tile = new SymbolicExpressionTreeTile(chart);
         tile.LayoutEngine = symbolicExpressionEngine;
-        tile.Label = "Generation " + node.Content.Rank + Environment.NewLine +
-                     "Quality " + String.Format("{0:0.000}", node.Content.Quality);
-        tile.Root = graphNode.Content.Root;
+        tile.Label = "Generation " + node.Data.Rank + Environment.NewLine +
+                     "Quality " + String.Format("{0:0.000}", node.Data.Quality);
+        tile.Root = graphNode.Data.Root;
         var tileNode = new TileLayoutNode { Tile = tile };
         tileDictionary.Add(node, tileNode);
@@ -117 +117 @@
         var aSize = aTile.Size;
         var aPos = aTile.Position;
-        var graphNode = node.Content;
+        var graphNode = node.Data;
 
         if (node.SubtreeIndex > 0) {
-          var subtree = graphNode.Content.Root.NodeAt(node.SubtreeIndex);
+          var subtree = graphNode.Data.Root.NodeAt(node.SubtreeIndex);
           foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
@@ -132 +132 @@
         }
         if (node.FragmentIndex > 0) {
-          var subtree = graphNode.Content.Root.NodeAt(node.FragmentIndex);
+          var subtree = graphNode.Data.Root.NodeAt(node.FragmentIndex);
           foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
@@ -149 +149 @@
             var index = node.SubtreeIndex + (parent.FragmentIndex - parent.SubtreeIndex);
             // some mutations create discontinuities which invalidate the index
-            if (index >= 0 && index < graphNode.Content.Length) {
-              var subtree = graphNode.Content.NodeAt(index);
+            if (index >= 0 && index < graphNode.Data.Length) {
+              var subtree = graphNode.Data.NodeAt(index);
               var primitive = aTile.GetPrimitive(subtree);
               primitive.Brush = new SolidBrush(Color.LightCoral);