Changeset 7792 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

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.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.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;
-    }
   }
 }