Changeset 11503 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

10/26/14 22:20:26 (10 years ago)

Author:

bburlacu

Message:

#1772: Added handling of double click event in the genealogy graph (opens a new view of the selected symbolic expression tree). Added highlighting of trace data. Very minor cosmetic changes to the TraceCalculator. Removed resx file from project.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/TraceCalculator.cs

@@ -187 +187 @@
     private void ConnectLast(IGenealogyGraphNode<ISymbolicExpressionTree> g, int si, IGenealogyGraphNode<ISymbolicExpressionTree> last) {
       IFragment<ISymbolicExpressionTreeNode> fragment = g.Parents.Any() ? (IFragment<ISymbolicExpressionTreeNode>)g.InArcs.Last().Data : null;
-      var n = traceGraph.GetByContent(g.Data);
-      if (n == null) {
-        n = g.Copy();
-        traceGraph.AddVertex(n);
-      }
       int fi = fragment == null ? 0 : fragment.Index1; // fragment index
-      traceMap[n] = new Tuple<int, int>(si, fi);
+      var n = GetTraceNode(g, si, fi); // will append n to the trace graph if it does not exist
       if (last == null)
         return;
@@ -201 +196 @@
       var td = new Tuple<int, int, int, int>(si, fi, lastSi, lastFi); // trace data
       var arc = n.InArcs.SingleOrDefault(a => a.Source == last && a.Data.Equals(td));
-      if (arc != null)
-        return;
-      arc = new GenealogyGraphArc(last, n) { Data = td };
-      traceGraph.AddArc(arc);
+      if (arc == null) {
+        arc = new GenealogyGraphArc(last, n) { Data = td };
+        traceGraph.AddArc(arc);
+      }
     }
   }