Changeset 11458 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking

Timestamp:

10/13/14 13:03:24 (10 years ago)

Author:

bburlacu

Message:

#1772: HeuristicLab.Problems.DataAnalysis.Symbolic:

• Merged trunk changes (SymbolicExpressionImporter)
• Added Passthrough symbol (does not perform an operation, just transfers the input), adjusted interpreter and opcodes accordingly
• Added diversity preserving crossover
• Replaced IDistanceCalculator interface with ISymbolicDataAnalysisExpressionSimilarityCalculator and adjusted similarity calculators
• Refactored tracing, moved functionality to the TraceCalculator (when this is complete the old code will be removed)

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• . (modified) (1 prop)
• Tracking/SymbolicDataAnalysisExpressionTracing.cs (modified) (8 diffs)
• Tracking/TraceCalculator.cs (added)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

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

@@ -48 +48 @@
       var parent = parentNode; // current parent
 
+      IGenealogyGraphNode<ISymbolicExpressionTree> n1 = null;
+      int i1 = -1;
+
       while (true) {
+        if (node == n1 && index == i1)
+          throw new InvalidOperationException("Infinite loop detected");
+
+        n1 = node;
+        i1 = index;
+
         if (!node.Parents.Any()) {
           // no tracing if there are no parents, return a fragment node representing the current trace
-          var fragmentNode = new FragmentNode(node) { SubtreeIndex = index };
+          var fragmentNode = new FragmentNode(node.Data) { SubtreeIndex = index };
           if (parent != null) {
-            var arc = new Arc(parent, fragmentNode);
+            var arc = new GenealogyGraphArc(parent, fragmentNode);
             parent.AddArc(arc);
             fragmentNode.AddArc(arc);
@@ -82 +91 @@
         if (parents.Count == 1) {
           // we are tracing a mutation operation
-          var fragmentNode = new FragmentNode(node) {
+          var fragmentNode = new FragmentNode(node.Data) {
             SubtreeIndex = index,
             FragmentIndex = fragment.Index1
@@ -91 +100 @@
             fragmentNode.AddArc(arc);
           }
+          if (node == parents[0])
+            throw new InvalidOperationException("Node == parents[0]");
+
           node = parents[0];
-          if (subtreeIndex == fragment.Index1) {
+
+          if (index == fragment.Index1) {
             // index stays the same
-          } else if (fragment.Index1 < subtreeIndex) {
-            if (subtreeIndex < fragment.Index1 + fragmentLength) {
+          } else if (fragment.Index1 < index) {
+            if (index < fragment.Index1 + fragmentLength) {
               // in the case of mutation, the fragment could have been introduced via a node replacement
               // there is no guarantee the subtree exists above this level, therefore the index is set to the fragment index
@@ -103 +116 @@
               index += node.Data.NodeAt(fragment.Index1).GetLength() - fragmentLength;
             }
-          } else if (subtreeIndex < fragment.Index1) {
-            if (fragment.Index1 < subtreeIndex + subtreeLength) {
+          } else if (index < fragment.Index1) {
+            if (fragment.Index1 < index + subtreeLength) {
               // subtree contains fragment
               index = fragment.Index1;
@@ -111 +124 @@
             }
           }
-
           yield return fragmentNode;
-          var up = Trace(node, index, fragmentNode); // force immediate query execution
+          if (node == graphNode && index == subtreeIndex)
+            throw new ArgumentException("Infinite recursion detected");
+          var up = Trace(node, index, fragmentNode).ToList(); // force immediate query execution
           foreach (var v in up) { yield return v; }
           break;
@@ -121 +135 @@
         #region crossover tracing
         if (parents.Count == 2) {
+          if (node == parents[0])
+            throw new InvalidOperationException("Node == parents[0]");
+          if (node == parents[1])
+            throw new InvalidOperationException("Node == parents[1]");
           // we are tracing a crossover operation
           if (fragment.Index1 == index) {
@@ -143 +161 @@
             if (fragment.Index1 < index + subtreeLength) {
               // subtree contains fragment => branching point in the fragment graph
-              var fragmentNode = new FragmentNode(node) {
+              var fragmentNode = new FragmentNode(node.Data) {
                 SubtreeIndex = index,
                 FragmentIndex = fragment.Index1
               };
               if (parent != null) {
-                var arc = new Arc(parent, fragmentNode);
+                var arc = new GenealogyGraphArc(parent, fragmentNode);
                 parent.AddArc(arc);
                 fragmentNode.AddArc(arc);
@@ -176 +194 @@
       return writer.ToString();
     }
-    #region some helper methods for shortening the tracing code
-    private static ISymbolicExpressionTreeNode NodeAt(this ISymbolicExpressionTree tree, int position) {
-      return NodeAt(tree.Root, position);
-    }
-    private static ISymbolicExpressionTreeNode NodeAt(this ISymbolicExpressionTreeNode root, int position) {
-      return root.IterateNodesPrefix().ElementAt(position);
-    }
-    #endregion
   }
 }

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer