Changeset 5867 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

03/29/11 15:40:01 (14 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Files:

• Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)
• Moves/VRPMoveEvaluator.cs (modified) (2 diffs)
• TourEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

@@ -58 +58 @@
       moveEvaluator.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
       IAtomicOperation op = this.ExecutionContext.CreateOperation(moveEvaluator);
-      op.Operator.Execute((IExecutionContext)op);
+      op.Operator.Execute((IExecutionContext)op, CancellationToken);
     }
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs

@@ -60 +60 @@
       moveMaker.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
       IAtomicOperation op = this.ExecutionContext.CreateOperation(moveMaker);
-      op.Operator.Execute((IExecutionContext)op);
+      op.Operator.Execute((IExecutionContext)op, CancellationToken);
     }
   }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

@@ -64 +64 @@
     //helper method to evaluate an updated individual
     protected void UpdateEvaluation(IVRPEncoding updatedTours) {
-      IVRPEvaluator evaluator = ProblemInstance.EvaluatorParameter.Value.Clone() as IVRPEvaluator;
-
-      Dictionary<IParameter, string> originalName =
-        new Dictionary<IParameter, string>();
-
-      foreach (IParameter parameter in evaluator.Parameters) {
-        if (parameter is ILookupParameter 
-          && parameter != evaluator.ProblemInstanceParameter 
-          && parameter != evaluator.VRPToursParameter) {
-            originalName[parameter] = (parameter as ILookupParameter).ActualName;
-
-            (parameter as ILookupParameter).ActualName =
-              MovePrefix +
-              (parameter as ILookupParameter).ActualName;
-        }
-      }
+      IVRPEvaluator evaluator = ProblemInstance.MoveEvaluator;
 
       try {
@@ -86 +71 @@
 
         IAtomicOperation op = this.ExecutionContext.CreateChildOperation(evaluator);
-        op.Operator.Execute((IExecutionContext)op);
+        op.Operator.Execute((IExecutionContext)op, CancellationToken);
       }
       finally {
-        foreach (IParameter parameter in originalName.Keys) {
-          (parameter as ILookupParameter).ActualName = originalName[parameter];
-        }
-
         this.ExecutionContext.Scope.Variables.Remove(evaluator.VRPToursParameter.ActualName);
       }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -34 +34 @@
   public abstract class TourEncoding : Item, IVRPEncoding {
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
     }