Changeset 17712 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs

Timestamp:

08/04/20 07:06:39 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -70 +70 @@
           distance = individual.GetTourLength(individual.Tours[currentTour]);
           individual.Tours[currentTour].Stops.InsertRange(currentCity, toBeDeleted);
-          if (instance.TourFeasible(individual.Tours[currentTour], individual)) {
+          var tourEval = instance.EvaluateTour(individual.Tours[currentTour], individual);
+          if (tourEval.IsFeasible) {
             double lengthIncrease =
               individual.GetTourLength(individual.Tours[currentTour]) - distance;
@@ -94 +95 @@
     public static void ApplyManipulation(IRandom random, PotvinEncodedSolution individual, IVRPProblemInstance instance, int maxIterations) {
       //only apply to feasible individuals
-      if (instance.Feasible(individual)) {
+      var eval = instance.Evaluate(individual);
+      if (eval.IsFeasible) {
         bool insertionFound;
         int iterations = 0;