Changeset 12958 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking

Timestamp:

09/21/15 01:03:12 (9 years ago)

Author:

bburlacu

Message:

#1772: Properly remove older generations in the genealogy graph. Fix namespaces in the schema diversification operators.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (1 diff)
• GenealogyGraph/GenealogyGraph.cs (modified) (1 diff)

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

@@ -333 +333 @@
       //trim
       if (TrimOlderGenerations) {
-        for (int i = 0; i < generation - 1; ++i) {
-          var vertices = genealogyGraph.GetByRank(i).ToList();
-          genealogyGraph.RemoveVertices(vertices);
-        }
+        var vertices = genealogyGraph.Vertices.Where(x => x.Rank < generation - 1).ToList(); // select all ranks older than the previous generation
+        genealogyGraph.RemoveVertices(vertices);
       }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -121 +121 @@
       base.RemoveVertex(vertex);
     }
+
+    public override void RemoveVertices(IEnumerable<IVertex> vertices) {
+      foreach (var v in vertices)
+        this.RemoveVertex(v);
+    }
+
     public IGenealogyGraphNode GetByContent(object content) {
       IGenealogyGraphNode result;