Changeset 11881 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Timestamp:

02/04/15 00:43:44 (10 years ago)

Author:

bburlacu

Message:

#1772:

• TraceGraph: Improved saving of trace data, changed GetTraceNode method to AddTraceNode and made the code more clear.
• SymbolicDataAnalysisGenealogyGraphView: added highlighting of trace information (when visualizing trace graphs)
• GenealogyGraphChart: removed useless code

File:

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

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

@@ -26 +26 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
@@ -81 +82 @@
         // get the ancestors into a new view
         var cloner = new Cloner();
-
+        // clone arcs and vertices and use them to create a new graph 
+        // that will include just the individual and its ancestors
         var graph = new GenealogyGraph<ISymbolicExpressionTree>();
         var ancestors = new[] { graphNode }.Concat(graphNode.Ancestors);
@@ -89 +91 @@
           graph.AddArc(cloner.Clone(arc));
         }
-        //        graph.AddVertices(graphNode.Ancestors);
         MainFormManager.MainForm.ShowContent(graph);
       }
 
       if (graphNode.InArcs.Any()) {
-        var fragment = graphNode.InArcs.Last().Data as IFragment<ISymbolicExpressionTreeNode>;
+        var data = graphNode.InArcs.Last().Data;
+        var fragment = data as IFragment<ISymbolicExpressionTreeNode>;
+        var td = data as TraceData;
         if (fragment != null) {
           treeChart_HighlightSubtree(graphNode.Data.NodeAt(fragment.Index1));
-        }
-      }
-      if (graphNode.OutArcs.Any()) {
-        var td = graphNode.OutArcs.Last().Data as Tuple<int, int, int, int>;
-        if (td != null) {
-          var s = graphNode.Data.NodeAt(td.Item3); // subtree index
-          var f = graphNode.Data.NodeAt(td.Item4); // fragment index 
-          treeChart_HighlightSubtree(s, Color.Orange);
-          treeChart_HighlightSubtree(f, Color.RoyalBlue);
+        } else if (td != null) {
+          var nodes = graphNode.Data.IterateNodesPrefix().ToList();
+          treeChart_HighlightSubtree(nodes[td.LastSubtreeIndex], Color.Orange);
+          treeChart_HighlightSubtree(nodes[td.LastFragmentIndex], Color.DodgerBlue);
         }
       }
@@ -127 +125 @@
           genealogyGraphChart.UpdateEnabled = false;
           genealogyGraphChart.ClearArcs();
-          //          genealogyGraphChart.ClearPrimitives();
           var genealogyNodes = traceGraph.Vertices.Select(v => Content.GetByContent(v.Data));
-          //          genealogyGraphChart.HighlightNodes(graphNode.Ancestors, Color.Gray, false);
           genealogyGraphChart.HighlightNodes(genealogyNodes, Color.Black, false);
-          //          foreach (var a in traceGraph.Arcs) {
-          //            genealogyGraphChart.HighlightArc(Content.GetByContent(a.Target.Data), Content.GetByContent(a.Source.Data));
-          //          }
           genealogyGraphChart.UpdateEnabled = true;
           genealogyGraphChart.EnforceUpdate();
@@ -184 +177 @@
     private void navigateLeftButton_Click(object sender, EventArgs e) {
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
-      if (graphNode.Parents.Any()) {
-        genealogyGraphChart.SelectedGraphNode = graphNode.Parents.First();
+      var inArcs = (List<IArc>)((IVertex)graphNode).InArcs;
+      if (inArcs.Count > 0) {
+        genealogyGraphChart.SelectedGraphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[0].Source;
       }
     }
@@ -191 +185 @@
     private void navigateRightButton_Click(object sender, EventArgs e) {
       var graphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)genealogyGraphChart.SelectedGraphNode;
-      if (graphNode.Parents.Any()) {
-        genealogyGraphChart.SelectedGraphNode = graphNode.Parents.Last(); // this will only work for genealogy graphs (not trace graphs)
+      var inArcs = (List<IArc>)((IVertex)graphNode).InArcs;
+      if (inArcs.Count > 0) {
+        var data = inArcs.Last().Data;
+        var fragment = (data as IFragment<ISymbolicExpressionTreeNode>);
+        var td = data as TraceData;
+        if (fragment != null) {
+          genealogyGraphChart.SelectedGraphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs.Last().Source;
+        } else if (td != null) {
+          if (inArcs.Count == 1) {
+            genealogyGraphChart.SelectedGraphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[0].Source;
+            return;
+          }
+          // the first arc from inArcs will always represent the connection to the root parent
+          // (tracing the body of the traced subtree)
+          // therefore, in order to follow the correct non-root parent, we have to find the correct arc
+          // But, the FragmentIndex recorded in the TraceData of the first arc has to match the SubtreeIndex recorded in the TraceData of the searched arc
+          td = (TraceData)inArcs[0].Data;
+          var f1 = (graphNode.Data).NodeAt(td.LastFragmentIndex);
+          for (int i = 1; i < inArcs.Count; ++i) {
+            td = (TraceData)inArcs[i].Data;
+            var f2 = ((ISymbolicExpressionTree)inArcs[i].Source.Data).NodeAt(td.SubtreeIndex);
+            // if the subtrees are the same we have found a match
+            // note: this is not necessarily 100% correct if in the trace graph we have identical fragments on different arcs
+            if (f1.Difference(f2) == null) {
+              genealogyGraphChart.SelectedGraphNode = (IGenealogyGraphNode<ISymbolicExpressionTree>)inArcs[i].Source;
+              return;
+            }
+          }
+          throw new InvalidOperationException("Error calculating the next step.");
+        }
       }
     }