Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/29/11 15:40:01 (13 years ago)
Author:
svonolfe
Message:

Merged changes from trunk into branch (#1177)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

    r5127 r5867  
    6464    //helper method to evaluate an updated individual
    6565    protected void UpdateEvaluation(IVRPEncoding updatedTours) {
    66       IVRPEvaluator evaluator = ProblemInstance.EvaluatorParameter.Value.Clone() as IVRPEvaluator;
    67 
    68       Dictionary<IParameter, string> originalName =
    69         new Dictionary<IParameter, string>();
    70 
    71       foreach (IParameter parameter in evaluator.Parameters) {
    72         if (parameter is ILookupParameter
    73           && parameter != evaluator.ProblemInstanceParameter
    74           && parameter != evaluator.VRPToursParameter) {
    75             originalName[parameter] = (parameter as ILookupParameter).ActualName;
    76 
    77             (parameter as ILookupParameter).ActualName =
    78               MovePrefix +
    79               (parameter as ILookupParameter).ActualName;
    80         }
    81       }
     66      IVRPEvaluator evaluator = ProblemInstance.MoveEvaluator;
    8267
    8368      try {
     
    8671
    8772        IAtomicOperation op = this.ExecutionContext.CreateChildOperation(evaluator);
    88         op.Operator.Execute((IExecutionContext)op);
     73        op.Operator.Execute((IExecutionContext)op, CancellationToken);
    8974      }
    9075      finally {
    91         foreach (IParameter parameter in originalName.Keys) {
    92           (parameter as ILookupParameter).ActualName = originalName[parameter];
    93         }
    94 
    9576        this.ExecutionContext.Scope.Variables.Remove(evaluator.VRPToursParameter.ActualName);
    9677      }
Note: See TracChangeset for help on using the changeset viewer.