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

Timestamp:

07/24/20 00:58:42 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP (WIP)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs (modified) (7 diffs)

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

@@ -51 +51 @@
     }
 
-    private static int SelectRandomTourBiasedByLength(IRandom random, PotvinEncoding individual) {
+    private static int SelectRandomTourBiasedByLength(IRandom random, PotvinEncodedSolution individual) {
       int tourIndex = -1;
 
@@ -109 +109 @@
     }
 
-    private int SelectCityBiasedByNeighborDistance(IRandom random, Tour tour, IVRPEncoding solution) {
+    private int SelectCityBiasedByNeighborDistance(IRandom random, Tour tour, IVRPEncodedSolution solution) {
       int cityIndex = -1;
 
@@ -150 +150 @@
 
     private bool FindRouteInsertionPlace(
-      PotvinEncoding individual,
+      PotvinEncodedSolution individual,
       Tour tour,
       int city, bool allowInfeasible, out int place) {
@@ -181 +181 @@
     }
 
-    private ICollection<int> GetUnrouted(PotvinEncoding solution, int cities) {
+    private ICollection<int> GetUnrouted(PotvinEncodedSolution solution, int cities) {
       HashSet<int> undiscovered = new HashSet<int>();
       for (int i = 1; i <= cities; i++) {
@@ -195 +195 @@
     }
 
-    protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
-      PotvinEncoding child = parent1.Clone() as PotvinEncoding;
+    protected override PotvinEncodedSolution Crossover(IRandom random, PotvinEncodedSolution parent1, PotvinEncodedSolution parent2) {
+      PotvinEncodedSolution child = parent1.Clone() as PotvinEncodedSolution;
       child.Tours.Clear();
 
@@ -202 +202 @@
 
       List<Tour> R1 = new List<Tour>();
-      PotvinEncoding p1Clone = parent1.Clone() as PotvinEncoding;
+      PotvinEncodedSolution p1Clone = parent1.Clone() as PotvinEncodedSolution;
 
       int length = Math.Min(Length.Value.Value, parent1.Tours.Count) + 1;
@@ -277 +277 @@
       else {
         if (random.NextDouble() < 0.5)
-          return parent1.Clone() as PotvinEncoding;
+          return parent1.Clone() as PotvinEncodedSolution;
         else
-          return parent2.Clone() as PotvinEncoding;
+          return parent2.Clone() as PotvinEncodedSolution;
       }
     }