Changeset 11262 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

Timestamp:

08/04/14 14:50:52 (10 years ago)

Author:

bburlacu

Message:

#1772: Added missing Storable constructor to GenealogyGraphNode<T> class. Prefer cloning vertices in the GenealogyAnalyzer. Add In/Out Degree in node tooltip in the GenealogyGraphChart.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs (modified) (2 diffs)

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

@@ -272 +272 @@
           var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetByContent(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
-          var w = new GenealogyGraphNode<T>(prevVertex); //shallow copy, arcs are not copied
+          var w = (IGenealogyGraphNode<T>)prevVertex.Clone();
           var v = new GenealogyGraphNode<T>(prevVertex.Data) {
             Rank = generation,
@@ -321 +321 @@
       int generation = GenerationsParameter.ActualValue.Value;
       var population = PopulationParameter.ActualValue;
-      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population);
+      var discardedOffspring = GenealogyGraph.Ranks[generation].Select(x => (T)x.Data).Except(population).ToList();
       foreach (var vertex in discardedOffspring.Select(individual => GenealogyGraph.GetByContent(individual))) {
         if (vertex.InDegree == 1) {
           var p = vertex.Parents.First();
-          if (p.Rank.Equals(generation - 1))
+          if (!p.Rank.Equals(generation - 0.5))
             throw new InvalidOperationException("Parent must be an intermediate vertex");
           GenealogyGraph.RemoveVertex(p);