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

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

Files:

• Creators/PushForwardInsertionCreator.cs (modified) (3 diffs)
• Crossovers/PotvinCrossover.cs (modified) (3 diffs)
• Crossovers/PotvinInsertionBasedCrossover.cs (modified) (2 diffs)
• Manipulators/PotvinLocalSearchManipulator.cs (modified) (3 diffs)
• Manipulators/PotvinPairwiseOneLevelExchangeManipulator.cs (modified) (2 diffs)
• Manipulators/PotvinPairwiseTwoLevelExchangeManipulator.cs (modified) (3 diffs)
• Manipulators/PotvinTwoLevelExchangeManipulator.cs (modified) (2 diffs)
• PotvinEncodedSolution.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/PushForwardInsertionCreator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
@@ -299 +299 @@
             } else {
               double cost = tourCost;
-              bool feasible = problemInstance.Feasible(eval);
-              if (cost < minimumCost && feasible) {
+              if (cost < minimumCost && eval.IsFeasible) {
                 customer = unrouted;
                 minimumCost = cost;

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++) {

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;

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

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -88 +88 @@
 
             if (delta < bestQuality &&
-               (instance.Feasible(evalNew) || allowInfeasible)) {
+               (evalNew.IsFeasible || allowInfeasible)) {
               bestQuality = delta;
               bestTour = tourIdx;

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

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HEAL.Attic;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -77 +77 @@
 
       replacedSourceTour.Stops[replacedSourceTour.Stops.IndexOf(replacedSource)] = replacingSource;
-      if (!allowInfeasible && !instance.TourFeasible(replacedSourceTour, individual))
+      var evalSourceTour = instance.EvaluateTour(replacedSourceTour, individual);
+      if (!allowInfeasible && !evalSourceTour.IsFeasible)
         return null;
 
+      var evalTargetTour = instance.EvaluateTour(replacedTargetTour, individual);
       replacedTargetTour.Stops[replacedTargetTour.Stops.IndexOf(replacedTarget)] = replacingTarget;
-      if (!allowInfeasible && !instance.TourFeasible(replacedTargetTour, individual))
+      if (!allowInfeasible && !evalTargetTour.IsFeasible)
         return null;
 
@@ -101 +103 @@
 
           if (delta < bestQuality &&
-              (instance.Feasible(evalNew) || allowInfeasible)) {
+              (evalNew.IsFeasible || allowInfeasible)) {
             bestQuality = delta;
             bestTour = tourIdx;

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

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
@@ -62 +62 @@
                 route1.Stops.RemoveAt(customer1Position);
 
-                if (instance.TourFeasible(tour, individual)) {
+                var tourEval = instance.EvaluateTour(tour, individual);
+                if (tourEval.IsFeasible) {
                   int routeIdx, place;
                   if (FindInsertionPlace(individual,

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

@@ -219 +219 @@
 
       VRPEvaluation eval = ProblemInstance.Evaluate(this);
-      bool originalFeasible = ProblemInstance.Feasible(eval);
 
       for (int tour = 0; tour < Tours.Count; tour++) {