Changeset 17717 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu

Timestamp:

08/05/20 04:37:37 (4 years ago)

Author:

abeham

Message:

#2521: working on VRP (refactoring all the capabilities, features, and operator discovery)

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu

Files:

• Crossovers/ZhuMergeCrossover1.cs (modified) (1 diff)
• Crossovers/ZhuMergeCrossover2.cs (modified) (1 diff)
• IZhuOperator.cs (modified) (1 diff)
• ZhuEncodedSolution.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover1.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HEAL.Attic;
-using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover2.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HEAL.Attic;
-using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/IZhuOperator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Problems.VehicleRouting.Variants;
 using HEAL.Attic;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
   [StorableType("CD11FA3C-3B50-4710-AAFC-32C9C61B3321")]
-  public interface IZhuOperator :
-    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {
+  public interface IZhuOperator : IGeneralVRPOperator {
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncodedSolution.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -114 +115 @@
     public static ZhuEncodedSolution ConvertFrom(IVRPEncodedSolution encoding, IVRPProblemInstance problemInstance) {
       List<Tour> tours = encoding.GetTours();
-      List<int> route = new List<int>();
+      var count = tours.Sum(x => x.Stops.Count);
+      var route = new int[count];
 
+      var i = 0;
       foreach (Tour tour in tours) {
         foreach (int city in tour.Stops)
-          route.Add(city - 1);
+          route[i++] = city - 1;
       }
 
       return new ZhuEncodedSolution(
-        new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), problemInstance);
+        new Permutation(PermutationTypes.RelativeUndirected, route), problemInstance);
     }
 
     public static ZhuEncodedSolution ConvertFrom(List<int> routeParam, IVRPProblemInstance problemInstance) {
-      List<int> route = new List<int>(routeParam);
-
-      while (route.Remove(0)) { //remove all delimiters (0)
-      }
-
-      for (int i = 0; i < route.Count; i++)
-        route[i]--;
+      var route = routeParam.Where(x => x != 0).Select(x => x - 1).ToArray();
 
       return new ZhuEncodedSolution(
-        new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), problemInstance);
+        new Permutation(PermutationTypes.RelativeUndirected, route), problemInstance);
     }
   }