Changeset 7785 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Timestamp:

05/09/12 09:56:56 (12 years ago)

Author:

bburlacu

Message:

#1772: Moved tree matching functionality in separate class, implemented new tree fragments analyzer. Fixed bug in GetCutIndex method.

Location:

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

Files:

• GenealogyGraphChart.cs (modified) (5 diffs)
• GenealogyGraphView.cs (modified) (2 diffs)

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

@@ -177 +177 @@
           foreach (var node in ancestors.SelectMany(n => _visualNodeMap[n])) {
             node.Brush = new SolidBrush(node.ToColor());
-            if (node.IncomingArcs != null && node == _visualNodeMap[node.Data].First())
+            if (node.IncomingArcs != null && node == _visualNodeMap[node.Data].First()) {
               foreach (var arc in node.IncomingArcs) {
                 if (arc.Source.Data == node.Data) continue;
@@ -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
+                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;
@@ -189 +190 @@
                 }
               }
+            }
           }
           // highlight the descendants
@@ -208 +210 @@
         Chart.UpdateEnabled = true;
         Chart.EnforceUpdate();
-        if (_selectedGenealogyGraphNode != null) /* emit clicked event */ OnGenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
+        if (_selectedGenealogyGraphNode != null)
+          /* emit clicked event */
+          OnGenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
       }
     }
@@ -238 +242 @@
       var e1 = parent.IterateNodesPostfix().GetEnumerator();
       var e2 = child.IterateNodesPostfix().GetEnumerator();
-      int pos = -1;
-      var comparer = new SymbolicExpressionTreeGenealogyGraph.SymbolicExpressionTreeNodeComparer(0);
+      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

@@ -94 +94 @@
         var nodes = symbolicExpressionTreeChart.Tree.IterateNodesPostfix().ToArray();
         var fragments = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode.IterateNodesPostfix().ToArray();
-        int index = SymbolicExpressionTreeGenealogyGraph.FindMatch(nodes, fragments, similarityModeSelector.SelectedIndex);
+        int index = SymbolicExpressionTreeMatching.FindMatch(nodes, fragments, similarityModeSelector.SelectedIndex);
         if (index != -1) {
           _selectedVisualSymbolicExpressionTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(nodes[index + fragments.Count() - 1]);
@@ -143 +143 @@
       genealogyGraphChart.ClearAllNodes(); // clear node colors
       // color each graph node according to the degree to which it matches the selected tree fragment
-      foreach (var i in Enum.GetValues(typeof(SymbolicExpressionTreeGenealogyGraph.SimilarityLevel)).Cast<int>().Reverse()) {
+      foreach (var i in Enum.GetValues(typeof(SymbolicExpressionTreeMatching.SimilarityLevel)).Cast<int>().Reverse()) {
         var owners = genealogyGraphChart.Graph.TraceFragment(treeNode, i).ToList();
         if (owners.Any()) genealogyGraphChart.HighlightNodes(owners, colors[i]); // highlight matching individuals from the genealogy