Changeset 11638 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking

Timestamp:

12/03/14 17:04:46 (10 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk changes. Updated PhenotypicSimilarityCalculator, updated FragmentGraphView.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Files:

• . (modified) (1 prop)
• 3.4/Tracking/FragmentGraphView.Designer.cs (modified) (1 diff)
• 3.4/Tracking/FragmentGraphView.cs (modified) (6 diffs)

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

@@ -45 +45 @@
       this.Name = "FragmentGraphView";
       this.Size = new System.Drawing.Size(1144, 682);
+      this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.FragmentGraphView_KeyPress);
       this.ResumeLayout(false);
 

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

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -71 +72 @@
         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 = node.Data.Data.Root;
+        tile.Label = "Generation " + node.Rank + Environment.NewLine +
+                     "Quality " + String.Format("{0:0.000}", node.Quality);
+        tile.Root = node.Data.Root;
         var tileNode = new TileLayoutNode { Tile = tile };
         nodeToTileMap.Add(node, tileNode);
@@ -115 +116 @@
         var aSize = aTile.Size;
         var aPos = aTile.Position;
-        var graphNode = node.Data;
+        var tree = node.Data;
 
         if (node.SubtreeIndex > 0) {
-          var subtree = graphNode.Data.Root.NodeAt(node.SubtreeIndex);
+          var subtree = tree.Root.NodeAt(node.SubtreeIndex);
           foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
@@ -130 +131 @@
         }
         if (node.FragmentIndex > 0) {
-          var subtree = graphNode.Data.Root.NodeAt(node.FragmentIndex);
+          var subtree = tree.Root.NodeAt(node.FragmentIndex);
           foreach (var s in subtree.IterateNodesPrefix()) {
             var primitive = aTile.GetPrimitive(s);
@@ -147 +148 @@
             var index = node.SubtreeIndex + (parent.FragmentIndex - parent.SubtreeIndex);
             // some mutations create discontinuities which invalidate the index
-            if (index >= 0 && index < graphNode.Data.Length) {
-              var subtree = graphNode.Data.NodeAt(index);
+            if (index >= 0 && index < tree.Length) {
+              var subtree = tree.NodeAt(index);
               var primitive = aTile.GetPrimitive(subtree);
               primitive.Brush = new SolidBrush(Color.LightCoral);
@@ -198 +199 @@
     }
 
+    private void FragmentGraphView_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) {
+      if (e.KeyChar == 'i') {
+        // highlight node impacts
+      }
+    }
+
     #region Event Handlers (child controls)