Changeset 11233 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SymbolicDataAnalysisExpressionTracing.cs

Timestamp:

07/30/14 01:41:54 (10 years ago)

Author:

bburlacu

Message:

#1772: Worked towards integrating the new graph api with the tracking operators.

File:

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

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

@@ -30 +30 @@
   public static class SymbolicDataAnalysisExpressionTracing {
     public static FragmentGraph TraceSubtree(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, int subtreeIndex) {
-      var graph = new FragmentGraph { AllowDuplicateContent = true };
+      var graph = new FragmentGraph();
       var nodes = Trace(graphNode, subtreeIndex);
       foreach (var n in nodes) {
@@ -51 +51 @@
       while (true) {
         if (!node.Parents.Any()) {
-          var fragmentNode = new FragmentNode {
-            Content = node,
+          var fragmentNode = new FragmentNode(node) {
             SubtreeIndex = index,
           };
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
-            parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(arc);
+            parent.AddArc(arc);
+            fragmentNode.AddArc(arc);
+
+            //            parent.AddForwardArc(arc);
+            //            fragmentNode.AddReverseArc(arc);
           }
           yield return fragmentNode; // no tracing if there are no parents
@@ -79 +81 @@
         if (parents.Count == 1) {
           // we are tracing a mutation operation
-          var fragmentNode = new FragmentNode {
-            Content = node,
+          var fragmentNode = new FragmentNode(node) {
             SubtreeIndex = index,
             FragmentIndex = fragment.Index1
@@ -86 +87 @@
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
-            parent.AddForwardArc(arc);
-            fragmentNode.AddReverseArc(arc);
+            parent.AddArc(arc);
+            fragmentNode.AddArc(arc);
           }
           node = parents[0];
@@ -138 +139 @@
             if (fragment.Index1 < index + subtreeLength) {
               // subtree contains fragment => bifurcation point in the fragment graph
-              var fragmentNode = new FragmentNode {
-                Content = node,
+              var fragmentNode = new FragmentNode(node) {
                 SubtreeIndex = index,
                 FragmentIndex = fragment.Index1
@@ -145 +145 @@
               if (parent != null) {
                 var arc = new Arc(parent, fragmentNode);
-                parent.AddForwardArc(arc);
-                fragmentNode.AddReverseArc(arc);
+                parent.AddArc(arc);
+                fragmentNode.AddArc(arc);
               }
               yield return fragmentNode;