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

Timestamp:

04/16/14 17:15:33 (11 years ago)

Author:

bburlacu

Message:

#1772: Simplified genealogy graph and fragment graph creation:

• the genealogy graph now has a 1-1 mapping between content and vertices (as opposed to 1-n as it was previously, to account for elites); this required changes to the directed graph implementation
• the fragment graph only contains bifurcation points (where the subtree contains the fragment so tracing must be done both ways (in the root parent AND in the other parent). in the other cases, tracing is restarted from the parent genealogy graph node.

File:

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

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

@@ -10 +10 @@
     public override IOperation Apply() {
       var child = ChildParameter.ActualValue;
-      var childVertex = (IGenealogyGraphNode)GenealogyGraph[child].Last();
+      var childVertex = (IGenealogyGraphNode)GenealogyGraph[child];
       var arcs = childVertex.InArcs.ToList();
       var nodes0 = (List<ISymbolicExpressionTreeNode>)arcs[0].Data;
@@ -20 +20 @@
         fragment = new Fragment<ISymbolicExpressionTreeNode> {
           Root = childNodes[i],
-          Index = i,
+          Index1 = i,
         };
-        fragment.OldIndex = nodes1.IndexOf(fragment.Root);
+        fragment.Index2 = nodes1.IndexOf(fragment.Root);
         break;
       }