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

Timestamp:

08/31/14 18:28:25 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug and improved handling of elite individuals in the genealogy analyzer. Fixed minor bug in the tracing code. Other minor cosmetic improvements to the GenealogyGraph and FragmentGraphView.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (2 diffs)
• Tracking/SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs (modified) (1 diff)
• Tracking/SymbolicDataAnalysisExpressionTracing.cs (modified) (3 diffs)

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

@@ -173 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs" />
+    <Compile Include="Analyzers\SymbolicDataAnalysisPhenotypicDiversityAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs" />
     <Compile Include="Analyzers\SymbolicDataAnalysisGenealogyAnalyzer.cs" />
@@ -198 +200 @@
     <Compile Include="SimilarityCalculators\BottomUpSimilarityCalculator.cs" />
     <Compile Include="SimilarityCalculators\MaxCommonSubtreeSimilarityCalculator.cs" />
+    <Compile Include="SimilarityCalculators\PhenotypicSimilarityCalculator.cs" />
     <Compile Include="SymbolicExpressionTreeBacktransformator.cs" />
     <Compile Include="SlidingWindow\GenerationalSlidingWindowAnalyzer.cs" />

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

@@ -46 +46 @@
       }
 
+      if (fragment == null)
+        throw new InvalidOperationException("Could not identify crossover fragment.");
+
       arcs[0].Data = null;
       arcs[1].Data = fragment;

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

@@ -32 +32 @@
     public static FragmentGraph TraceSubtree(IGenealogyGraphNode<ISymbolicExpressionTree> graphNode, int subtreeIndex) {
       var graph = new FragmentGraph();
-      var nodes = Trace(graphNode, subtreeIndex);
-      foreach (var n in nodes) {
-        graph.AddVertex(n);
-      }
+      var vertices = Trace(graphNode, subtreeIndex).ToList();
+      graph.AddVertices(vertices);
       return graph;
     }
@@ -52 +50 @@
       while (true) {
         if (!node.Parents.Any()) {
-          var fragmentNode = new FragmentNode(node) {
-            SubtreeIndex = index,
-          };
+          // no tracing if there are no parents, return a fragment node representing the current trace
+          var fragmentNode = new FragmentNode(node) { SubtreeIndex = index };
           if (parent != null) {
             var arc = new Arc(parent, fragmentNode);
             parent.AddArc(arc);
             fragmentNode.AddArc(arc);
-
-            //            parent.AddForwardArc(arc);
-            //            fragmentNode.AddReverseArc(arc);
           }
-          yield return fragmentNode; // no tracing if there are no parents
+          yield return fragmentNode;
           break;
         }
         var parents = node.Parents.ToList();
-        var fragment = (IFragment<ISymbolicExpressionTreeNode>)node.InArcs.Last().Data;
-
-        if (node.IsElite || fragment == null) {
+        if (node.IsElite) {
           // skip elite, go up the graph to original individual
           node = parents[0];
           continue;
         }
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)node.InArcs.Last().Data;
+
+        if (node.Rank > 1 && fragment == null)
+          throw new ArgumentNullException("Fragment cannot be null");
+
         var fragmentLength = fragment.Root.GetLength();
         var tree = node.Data;
@@ -139 +136 @@
           if (fragment.Index1 > index) {
             if (fragment.Index1 < index + subtreeLength) {
-              // subtree contains fragment => bifurcation point in the fragment graph
+              // subtree contains fragment => branching point in the fragment graph
               var fragmentNode = new FragmentNode(node) {
                 SubtreeIndex = index,