Changeset 10675

Timestamp:

03/27/14 02:18:08 (11 years ago)

Author:

bburlacu

Message:

#1772: Fixed genealogy graph creation.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (1 diff)
• Operators/BeforeCrossoverOperator.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -226 +226 @@
             IsElite = true
           };
-          var previousVertex = GenealogyGraph[elite].Last();
+          var previousVertex = (IGenealogyGraphNode<T>)GenealogyGraph[elite].Last();
           GenealogyGraph.AddVertex(vertex);
           previousVertex.AddForwardArc(vertex);
           vertex.AddReverseArc(previousVertex);
+          vertex.InArcs.Last().Data = previousVertex.InArcs.Last().Data; // save the fragment in case there is one
+          vertex.Id = previousVertex.Id;
         }
       }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs

@@ -63 +63 @@
     public override IOperation Apply() {
       if (CurrentGeneration == null) throw new Exception();
-      // we get the parents by parsing the scope name because the individuals in the execution scope are clones of the ones saved in the graph
-      //      var parentVertices = ExecutionContext.Scope.SubScopes.Select(s => CurrentGeneration.Find(x => x.Id == ((StringValue)s.Variables["Id"].Value)).ToList();
       var parentVertices = (from s in ExecutionContext.Scope.SubScopes
                             let id = ((StringValue)s.Variables["Id"].Value).Value