Changeset 11350

Timestamp:

09/06/14 11:58:54 (10 years ago)

Author:

bburlacu

Message:

#1772: Small fix to fragment tracing.

Location:

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

Files:

• SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTracing.cs (modified) (1 diff)

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.");
-
+      // if the fragment is null it means that nodes0 is identical with childNodes (in other words crossover did nothing)
       arcs[0].Data = null;
       arcs[1].Data = fragment;

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

@@ -61 +61 @@
         }
         var parents = node.Parents.ToList();
-        if (node.IsElite) {
-          // skip elite, go up the graph to original individual
+        var fragment = (IFragment<ISymbolicExpressionTreeNode>)node.InArcs.Last().Data;
+
+        if (fragment == null) {
+          // fragment == null can only mean that the individual is the previous generation elite 
+          // which got introduced in the next generation. 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();