Changeset 6838 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators

Timestamp:

09/27/11 13:29:56 (13 years ago)

Author:

svonolfe

Message:

Updated interface of evaluator - added individual (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators

Files:

• PotvinLocalSearchManipulator.cs (modified) (1 diff)
• PotvinTwoLevelExchangeManipulator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs

@@ -69 +69 @@
           distance = individual.GetTourLength(individual.Tours[currentTour]);
           individual.Tours[currentTour].Stops.InsertRange(currentCity, toBeDeleted);
-          if (ProblemInstance.Feasible(individual.Tours[currentTour])) {
+          if (ProblemInstance.TourFeasible(individual.Tours[currentTour], individual)) {
             double lengthIncrease =
               individual.GetTourLength(individual.Tours[currentTour]) - distance;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs

@@ -66 +66 @@
               route1.Stops.RemoveAt(customer1Position);
 
-              if (ProblemInstance.Feasible(tour)) {
+              if (ProblemInstance.TourFeasible(tour, individual)) {
                 int routeIdx, place;
                 if (FindInsertionPlace(individual,