Changeset 17712 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers

Timestamp:

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

Author:

abeham

Message:

#2521: working on VRP

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers

Files:

• PotvinCrossover.cs (modified) (3 diffs)
• PotvinInsertionBasedCrossover.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinCrossover.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
@@ -134 +134 @@
         solution.Tours.Remove(tour);
       }
-
-      if (newTour.Stops.Count > 0 && !allowInfeasible && !instance.TourFeasible(newTour, solution))
+      var tourEval = instance.EvaluateTour(newTour, solution);
+      if (newTour.Stops.Count > 0 && !allowInfeasible && !tourEval.IsFeasible)
         return false;
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
-using System.Collections.Generic;
 using HeuristicLab.Data;
-using System;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -165 +165 @@
       double minDetour = 0;
       VRPEvaluation eval = ProblemInstance.EvaluateTour(tour, individual);
-      bool originalFeasible = ProblemInstance.Feasible(eval);
 
       for (int i = 0; i <= tour.Stops.Count; i++) {