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

Timestamp:

03/24/14 23:50:17 (10 years ago)

Author:

bburlacu

Message:

#1772: Some progress on tracking fragments and building blocks, still incomplete.

Location:

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

Files:

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

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

@@ -9 +9 @@
   public class SymbolicDataAnalysisExpressionAfterCrossoverOperator : AfterCrossoverOperator<ISymbolicExpressionTree> {
     public override IOperation Apply() {
-      var childVertex = GenealogyGraph[ChildParameter.ActualValue].Last();
+      var child = ChildParameter.ActualValue;
+      var childVertex = GenealogyGraph[child].Last();
       var arc0 = (IGenealogyGraphArc)childVertex.InArcs[0];
       var arc1 = (IGenealogyGraphArc)childVertex.InArcs[1];
       var nodes0 = (List<ISymbolicExpressionTreeNode>)arc0.Data;
       var nodes1 = (List<ISymbolicExpressionTreeNode>)arc1.Data;
-      var childNodes = ChildParameter.ActualValue.IterateNodesBreadth().ToList();
+      var childNodes = child.IterateNodesPrefix().ToList();
       IFragment<ISymbolicExpressionTreeNode> fragment = null;
-
       for (int i = 0; i < Math.Min(nodes0.Count, childNodes.Count); ++i) {
         if (nodes0[i] == childNodes[i]) continue;
         fragment = new Fragment<ISymbolicExpressionTreeNode> {
           Root = childNodes[i],
-          Index = i
+          Index = i,
         };
+        fragment.OldIndex = nodes1.IndexOf(fragment.Root);
+        break;
       }
       if (fragment == null) throw new Exception("Could not determine fragment!");
-
-      for (int i = 0; i < nodes1.Count; ++i) {
-        if (nodes1[i] != fragment.Root) continue;
-        fragment.OldIndex = i;
-      }
 
       arc0.Data = null;

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

@@ -7 +7 @@
   public class SymbolicDataAnalysisExpressionBeforeCrossoverOperator : BeforeCrossoverOperator<ISymbolicExpressionTree> {
     public override IOperation Apply() {
-      var result = base.Apply();
+      var result = base.Apply(); // the child will be added to the graph before the crossover
       var parents = ParentsParameter.ActualValue.ToList();
       var childVertex = GenealogyGraph[parents[0]].Last(); // use the parent since it is actually the child before crossover (and the ChildParameter doesn't have a value yet)
       //      var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => CurrentGeneration[int.Parse(s.Name)]).ToList();
 
+      // we add the breadth list of nodes of each parent as the data element of the arc from the parent to the child
       for (int i = 0; i < parents.Count; ++i) {
-        var nodes = parents[i].IterateNodesBreadth().ToList();
+        var nodes = parents[i].IterateNodesPrefix().ToList();
         var arc = (IGenealogyGraphArc)childVertex.InArcs[i];
         arc.Data = nodes;