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

Timestamp:

05/11/14 18:29:47 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed identification of mutation fragments.

Location:

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

Files:

• SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs (modified) (2 diffs)
• SymbolicDataAnalysisExpressionBeforeManipulatorOperator.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTracing.cs (modified) (2 diffs)

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

@@ -48 +48 @@
         var a = nodesAfter[i];
         var b = nodesBefore[i];
-        if (ReferenceEquals(a, b) && comparer.Equals(a, b)) continue;
+
+        bool found = false;
+        if (comparer.Equals(a, b)) {
+          int m = 0;
+          for (int j = 0; j < a.SubtreeCount; ++j) {
+            if (!AreSimilar(a.GetSubtree(j), b.GetSubtree(j), comparer)) { ++m; }
+            if (m > 1) {
+              found = true;
+              break;
+            }
+          }
+          if (m == 0) {
+            // everything is similar so we skip the whole subtree
+            i += a.GetLength();
+          }
+          if (!found) continue;
+        }
         fragment = new Fragment<ISymbolicExpressionTreeNode> {
           Root = a,
@@ -60 +76 @@
       return base.Apply();
     }
+
+    private bool AreSimilar(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b, SymbolicExpressionTreeNodeSimilarityComparer comp) {
+      int length = a.GetLength();
+      return comparer.Equals(a, b) && length.Equals(b.GetLength()) && SymbolicExpressionTreeMatching.Match(a, b, comp) == length;
+    }
   }
 }

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

@@ -31 +31 @@
 
       var vChild = (IGenealogyGraphNode<ISymbolicExpressionTree>)GenealogyGraph[ChildParameter.ActualValue];
-      vChild.InArcs.First().Data = vChild.Content.IterateNodesPrefix().ToList();
+      var vClone = (IGenealogyGraphNode<ISymbolicExpressionTree>)vChild.InArcs.Last().Source;
+      vChild.InArcs.First().Data = vClone.Content.IterateNodesPrefix().ToList();
 
-      var vClone = (IGenealogyGraphNode<ISymbolicExpressionTree>)vChild.InArcs.Last().Source;
       var fragment = (IFragment<ISymbolicExpressionTreeNode>)vClone.InArcs.Last().Data;
       if (fragment != null) {

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

@@ -36 +36 @@
             var arc = new GenealogyGraphArc { Source = parent, Target = fragmentNode };
             parent.AddForwardArc(arc);
-            //            fragmentNode.Content.Index1 = parent.Content.Index1;
           }
           yield return fragmentNode; // no tracing if there are no parents
@@ -62 +61 @@
           var fragmentNode = new FragmentNode {
             Content = new Fragment<ISymbolicExpressionTreeNode> { Root = subtree },
-            Rank = node.Rank
+            Rank = node.Rank,
+            Quality = node.Quality
           };
           if (parent != null) {