Changeset 10888 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs

Timestamp:

05/26/14 01:56:35 (10 years ago)

Author:

bburlacu

Message:

#1772: Introduced separate class for FragmentNodes and adjusted tracing code. Fixed small bug creating the genealogy graph.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs (modified) (4 diffs)

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

@@ -43 +43 @@
     }
 
+    public IValueParameter<IntValue> ExecutionCountParameter {
+      get { return (IValueParameter<IntValue>)Parameters["ExecutionCount"]; }
+    }
+
     protected BeforeCrossoverOperator(BeforeCrossoverOperator<T> original, Cloner cloner)
       : base(original, cloner) {
@@ -53 +57 @@
       Parameters.Add(new ScopeTreeLookupParameter<T>(ParentsParameterName));
       Parameters.Add(new LookupParameter<T>(ChildParameterName));
+      Parameters.Add(new ValueParameter<IntValue>("ExecutionCount", new IntValue(0)));
     }
 
@@ -65 +70 @@
     private readonly Func<IScope, string> getScopeId = s => ((StringValue)s.Variables["Id"].Value).Value;
     public override IOperation Apply() {
-      if (CurrentGeneration == null) throw new Exception();
+      ExecutionCountParameter.Value.Value++;
+
       var subScopes = ExecutionContext.Scope.SubScopes;
       var parentVertices = subScopes.Select(x => (GenealogyGraphNode<T>)GenealogyGraph.GetVertex(getScopeId(x))).ToList();
@@ -75 +81 @@
         // but the first parent is actually the future child so we use this
         Content = parents[0],
+        //        Rank = Generations.Value + 1
         Rank = parentVertices[0].Rank + 1
       };
+
       GenealogyGraph.AddVertex(childVertex);
+
       foreach (var parentVertex in parentVertices) {
         GenealogyGraph.AddArc(parentVertex, childVertex);