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

Timestamp:

05/10/12 17:17:14 (12 years ago)

Author:

bburlacu

Message:

#1772: Changelog:

• Removed GetCutIndex method, and corresponding index field in the GenealogyGraphNode.
• Implemented tracking for mutated fragments.
• Improved FindMatch method.
• Added IterateNodesBreadth functionality to symbolic expression trees and nodes.
• Added check conditions for clearing global tracking structures so that the 2 analyzers are not mutually exclusive anymore.

Location:

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

Files:

• GenealogyGraphChart.cs (modified) (3 diffs)
• GenealogyGraphView.cs (modified) (3 diffs)

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

@@ -114 +114 @@
               style = DashStyle.Dash;
             } else {
-              style = arc.OperatorType == 0 ? DashStyle.Solid : DashStyle.Dash;
+              style = node.InEdges.Count == 2 ? DashStyle.Solid : DashStyle.Dash;
             }
             var arcPen = new Pen(Color.Transparent) { DashStyle = style };
@@ -183 +183 @@
                 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.Data.CutpointIndex == -1) {
-                  // if the cut index wasn't computed yet
-                  var parent = arc.Source.Data.Data as ISymbolicExpressionTree;
-                  var child = node.Data.Data as ISymbolicExpressionTree;
-                  node.Data.CutpointIndex = GetCutIndex(parent, child);
-                }
               }
             }
@@ -236 +230 @@
       Chart.EnforceUpdate();
     }
-
-    // maybe this method does't belong here
-    // TODO: find a good location for this kind of functionality
-    private static int GetCutIndex(ISymbolicExpressionTree parent, ISymbolicExpressionTree child) {
-      var e1 = parent.IterateNodesPostfix().GetEnumerator();
-      var e2 = child.IterateNodesPostfix().GetEnumerator();
-      int pos = 0;
-      var comparer = new SymbolicExpressionTreeNodeComparer((int)SymbolicExpressionTreeMatching.SimilarityLevel.Exact);
-      while (e1.MoveNext() && e2.MoveNext() && comparer.Equals(e1.Current, e2.Current)) ++pos;
-      if (pos == 0) return -1;
-      if (pos == child.Length) return 0;
-      return pos;
-      //return pos == 0 ? -1 : pos;
-    }
   }
 }

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -92 +93 @@
       symbolicExpressionTreeChart.Tree = (ISymbolicExpressionTree)genealogyGraphNode.Data;
       if (_selectedVisualSymbolicExpressionTreeNode != null) {
-        var nodes = symbolicExpressionTreeChart.Tree.IterateNodesPostfix().ToArray();
-        var fragments = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode.IterateNodesPostfix().ToArray();
+        var nodes = symbolicExpressionTreeChart.Tree.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+        var fragments = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
         int index = SymbolicExpressionTreeMatching.FindMatch(nodes, fragments, similarityModeSelector.SelectedIndex);
         if (index != -1) {
-          _selectedVisualSymbolicExpressionTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(nodes[index + fragments.Count() - 1]);
+          _selectedVisualSymbolicExpressionTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(nodes[index + fragments.Count - 1]);
           var subtree = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode;
           foreach (var visualNode in subtree.IterateNodesPostfix().Select(node => symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node))) {
@@ -104 +105 @@
         }
       }
-      // the cutpoint index represents the index of the node/subtree (when the tree is enumerated in postfix order) 
-      // that was changed (by mutation) or received from a parent (by crossover)
-      if (visualGenealogyGraphNode.Data.CutpointIndex != -1) {
-        var gNode = visualGenealogyGraphNode.Data;
-        var symbExprTree = gNode.Data as ISymbolicExpressionTree;
-        if (symbExprTree == null) return;
-        var nodes = symbExprTree.IterateNodesPostfix();
-        var fragment = nodes.ElementAt(gNode.CutpointIndex);
-        if (fragment != null) foreach (var node in fragment.IterateNodesPostfix()) {
-            var visualNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node);
-            visualNode.FillColor = Color.LightPink;
-          }
-        symbolicExpressionTreeChart.Repaint();
-      }
+      // what's left to be done here is to:
+      // - get the symbolic expression tree 
+      // - get the corresponding fragment
+      // - for all symbolic expression tree nodes in the fragment, colorize the corresponding visual nodes
+      // - repaint the tree
     }