Changeset 4268 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General

Timestamp:

08/19/10 16:51:30 (14 years ago)

Author:

svonolfe

Message:

Added prins encoding (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General

Files:

• Manipulators (added)
• Manipulators/MultiVRPManipulator.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Crossovers/MultiVRPManipulator.cs)
• Moves/Interfaces/IVRPMove.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs (modified) (1 diff)
• PermutationEncoding.cs (added)
• TourEncoding.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/Interfaces/IVRPMove.cs

@@ -27 +27 @@
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
   public interface IVRPMove : IItem {
-    TourEvaluation GetMoveQuality(IVRPEncoding individual, 
+    TourEvaluation GetMoveQuality(IVRPEncoding individual,  IntValue vehicles,
         DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, 
         DoubleValue capacity,DoubleMatrix coordinates,

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

@@ -47 +47 @@
       return move.GetMoveQuality(
         VRPToursParameter.ActualValue,
+        VehiclesParameter.ActualValue,
         DueTimeParameter.ActualValue,
         ServiceTimeParameter.ActualValue,

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs

@@ -37 +37 @@
     
     #region IVRPEncoding Members
-    public virtual List<Tour> GetTours() {
-      return new List<Tour>(Tours);
+    public virtual List<Tour> GetTours(ILookupParameter<DoubleMatrix> distanceMatrix = null, int maxVehicles = int.MaxValue) {
+      List<Tour> result = new List<Tour>(Tours);
+
+      while (result.Count > maxVehicles) {
+        Tour tour = result[result.Count - 1];
+        result[result.Count - 2].Cities.AddRange(tour.Cities);
+
+        result.Remove(tour);
+      }
+
+      return result;
     }
 
@@ -66 +75 @@
       : base() {
     }
-    
-    public static void ConvertFrom(IVRPEncoding encoding, TourEncoding solution) {
-      solution.Tours = new ItemList<Tour>(encoding.GetTours());
+
+    public static void ConvertFrom(IVRPEncoding encoding, TourEncoding solution, ILookupParameter<DoubleMatrix> distanceMatrix) {
+      solution.Tours = new ItemList<Tour>(encoding.GetTours(distanceMatrix));
     }