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

Timestamp:

03/26/14 17:14:14 (10 years ago)

Author:

bburlacu

Message:

#1772: Found bug in GenealogyGraph creation, attempted fix by injecting vertex guid's in the individual scopes.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

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

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

@@ -211 +211 @@
         ConfigureTrackingOperators();
 
-        foreach (var individual in population) {
+        for (int i = 0; i < population.Count; ++i) {
+          var individual = population[i];
           var vertex = new GenealogyGraphNode<T> { Content = individual, Rank = Generations.Value, };
           GenealogyGraph.AddVertex(vertex);
+          // save the vertex id in the individual scope (so that we can identify graph indices)
+          ExecutionContext.Scope.SubScopes[i].Variables.Add(new Variable("Id", new StringValue(vertex.Id)));
         }
       } else {

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -63 +64 @@
       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[int.Parse(s.Name)]).ToList();
+      //      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
+                            select CurrentGeneration.First(x => x.Id == id)).ToList(); // the id is unique
 
       var parents = ParentsParameter.ActualValue.ToList();
@@ -77 +81 @@
         v.AddForwardArc(childVertex);
       }
+      ExecutionContext.Scope.Variables.Add(new Variable("Id", new StringValue(childVertex.Id)));
 
       return base.Apply();