Changeset 10936 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Timestamp:

06/04/14 12:56:05 (10 years ago)

Author:

bburlacu

Message:

#1772: Modified GenealogyAnalyzer to remove discarded offspring selection children from the genealogy graph.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (3 diffs)
• DirectedGraph/DirectedGraph.cs (modified) (1 diff)

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

@@ -137 +137 @@
       get { return GenerationsParameter.ActualValue; }
     }
+
     public IGenealogyGraph<T> GenealogyGraph {
       get {
@@ -281 +282 @@
 
           prevVertex.Content = clone;
-
+          // inject the graph node unique id to the scope
           ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(vertex.Id);
 
@@ -299 +300 @@
       }
 
+      // remove extra graph nodes (added by the instrumented operators in the case of offspring selection)
+      var discardedOffspring = GenealogyGraph.Ranks[Generations.Value].Select(x => (T)x.Content).Except(population).ToList();
+      foreach (var individual in discardedOffspring) {
+        var vertex = GenealogyGraph.GetVertex(individual);
+        GenealogyGraph.RemoveVertex(vertex);
+      }
+
       return base.Apply();
     }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs

@@ -128 +128 @@
           throw new Exception("Content already exists in the graph.");
         }
-        contentMap.Add(vertex.Content, vertex);
+        contentMap[vertex.Content] = vertex;
       }
       idMap.Add(vertex.Id, vertex);