Changeset 5177 for branches/ParallelEngine/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

Timestamp:

12/26/10 03:51:30 (14 years ago)

Author:

swagner

Message:

Removed property ExecutionContext in Operator (#1333)

File:

• branches/ParallelEngine/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs (modified) (1 diff)

branches/ParallelEngine/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

@@ -47 +47 @@
     }
 
-    protected override ZhuEncoding Crossover(IRandom random, ZhuEncoding parent1, ZhuEncoding parent2) {
+    protected override ZhuEncoding Crossover(IExecutionContext context, IRandom random, ZhuEncoding parent1, ZhuEncoding parent2) {
       //note - the inner crossover is called here and the result is converted to a prins representation
       //some refactoring should be done here in the future - the crossover operation should be called directly
 
       InnerCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;
-      IAtomicOperation op = this.ExecutionContext.CreateOperation(
-        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
+      IAtomicOperation op = context.CreateOperation(
+        InnerCrossoverParameter.ActualValue, context.Scope);
       op.Operator.Execute((IExecutionContext)op);
 
       string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
-      if (ExecutionContext.Scope.Variables.ContainsKey(childName)) {
-        Permutation permutation = ExecutionContext.Scope.Variables[childName].Value as Permutation;
-        ExecutionContext.Scope.Variables.Remove(childName);
+      if (context.Scope.Variables.ContainsKey(childName)) {
+        Permutation permutation = context.Scope.Variables[childName].Value as Permutation;
+        context.Scope.Variables.Remove(childName);
 
         return new ZhuEncoding(permutation, Cities,