Changeset 10897 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers

Timestamp:

05/27/14 16:33:17 (10 years ago)

Author:

bburlacu

Message:

#1772: Adjusted namespace in Plugin.cs.frame for HeuristicLab.EvolutionTracking.Views. Simplified DirectedGraph and GenealogyGraph API. Added public events for the Vertex content (so that the graph itself can be notified when the content changes and can adjust it's content-to-vertex map. Adjusted instrumented operators code to reflect api changes.

File:

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

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

@@ -252 +252 @@
         for (int i = 0; i < population.Count; ++i) {
           var individual = population[i];
-          var vertex = new GenealogyGraphNode<T> { Content = individual, Rank = Generations.Value };
+          var vertex = new GenealogyGraphNode<T>(individual) { Rank = Generations.Value };
           GenealogyGraph.AddVertex(vertex);
           // save the vertex id in the individual scope (so that we can identify graph indices)
@@ -258 +258 @@
         }
       } else {
-        var elite = population.FirstOrDefault(x => GenealogyGraph.Contains(x));
+        int index = 0;
+        T elite = null;
+        for (int i = 0; i < population.Count; ++i) {
+          if (GenealogyGraph.Contains(population[i])) {
+            elite = population[i];
+            index = i;
+          }
+          break;
+        }
+
         if (elite != null) {
-          var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph[elite];
+          var prevVertex = (IGenealogyGraphNode<T>)GenealogyGraph.GetVertex(elite);
           prevVertex.IsElite = true; // mark elites in the graph retroactively
 
           var clone = (T)elite.Clone();
 
-          var vertex = new GenealogyGraphNode<T> {
-            Content = prevVertex.Content,
+          var vertex = new GenealogyGraphNode<T>(prevVertex.Content) {
             Rank = Generations.Value,
             Quality = prevVertex.Quality,
@@ -272 +280 @@
           };
 
-          GenealogyGraph.SetContent(prevVertex, clone);
-          // swap id
-          var id = prevVertex.Id;
-          GenealogyGraph.SetId(prevVertex, vertex.Id);
-
-          // add new vertex to the graph
-          vertex.Id = id;
+          prevVertex.Content = clone;
+
+          ExecutionContext.Scope.SubScopes[index].Variables["Id"].Value = new StringValue(vertex.Id);
+
           GenealogyGraph.AddVertex(vertex);
 
@@ -290 +295 @@
       // update qualities
       for (int i = 0; i < population.Count; ++i) {
-        var vertex = (IGenealogyGraphNode)GenealogyGraph[population[i]];
+        var vertex = (IGenealogyGraphNode)GenealogyGraph.GetVertex(population[i]);
         vertex.Quality = qualities[i].Value;
       }