Changeset 6607 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation

Timestamp:

07/28/11 14:16:21 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk (#1561) into branch (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs

@@ -106 +106 @@
 
       //reset move quality
-      VRPEvaluation eval = ProblemInstance.EvaluatorParameter.Value.Evaluate(ProblemInstance, newSolution);
+      VRPEvaluation eval = ProblemInstance.Evaluate(newSolution);
       MoveQualityParameter.ActualValue.Value = eval.Quality;
 
       //update penalty factor
       double sigma = SigmaParameter.Value.Value;
-      if (ProblemInstance.EvaluatorParameter.Value.Feasible(eval)) {
+      if (ProblemInstance.Feasible(eval)) {
         newSolution.PenaltyFactor /= (1 + sigma);
         if (newSolution.PenaltyFactor < MinPenaltyFactorParameter.Value.Value)