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

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/Alba

Files:

• AlbaEncodedSolution.cs (modified) (3 diffs)
• Crossovers/AlbaCrossover.cs (modified) (1 diff)
• IAlbaOperator.cs (modified) (1 diff)
• LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (modified) (1 diff)
• Manipulators/AlbaCustomerInsertionManipulator.cs (modified) (1 diff)
• Manipulators/AlbaManipulator.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncodedSolution.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -138 +139 @@
     public static AlbaEncodedSolution ConvertFrom(IVRPEncodedSolution encoding, IVRPProblemInstance instance) {
       List<Tour> tours = encoding.GetTours();
-
-      int cities = 0;
-      foreach (Tour tour in tours) {
-        cities += tour.Stops.Count;
-      }
+      var cities = tours.Sum(x => x.Stops.Count);
 
       int emptyVehicles = instance.Vehicles.Value - tours.Count;
@@ -171 +168 @@
       }
 
-      AlbaEncodedSolution solution = new AlbaEncodedSolution(new Permutation(PermutationTypes.RelativeUndirected, new IntArray(array)), instance);
-
-      return solution;
+      return new AlbaEncodedSolution(new Permutation(PermutationTypes.RelativeUndirected, new IntArray(array)), instance);
     }
   }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaCrossover.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/IAlbaOperator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Problems.VehicleRouting.Variants;
 using HEAL.Attic;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
   [StorableType("E4EADC47-5FEC-429D-B713-795171F8C85B")]
-  public interface IAlbaOperator :
-    ISingleDepotOperator, IHeterogenousCapacitatedOperator, IMultiDepotOperator, ITimeWindowedOperator {
+  public interface IAlbaOperator : IGeneralVRPOperator {
+    // the Alba encoding is agnostic to constraints of the VRP
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

@@ -111 +111 @@
     public override IOperation InstrumentedApply() {
       int maxIterations = MaximumIterationsParameter.ActualValue.Value;
-      AlbaEncodedSolution solution = null;
+      var solution = VRPToursParameter.ActualValue as AlbaEncodedSolution;
 
-      if (VRPToursParameter.ActualValue is AlbaEncodedSolution)
-        solution = VRPToursParameter.ActualValue as AlbaEncodedSolution;
-      else
+      if (solution == null)
         VRPToursParameter.ActualValue = solution = AlbaEncodedSolution.ConvertFrom(VRPToursParameter.ActualValue, ProblemInstance);
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;