Changeset 6449 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs

Timestamp:

06/20/11 13:36:49 (13 years ago)

Author:

svonolfe

Message:

Improved performance of many VRP operators by optimizing the parameter lookup (#1561)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -36 +37 @@
     public PotvinTwoLevelExchangeManipulator() : base() { }
 
-    protected override void Manipulate(IRandom random, PotvinEncoding individual) {
+    public static void Apply(IRandom random, PotvinEncoding individual, 
+      DoubleArray dueTime, DoubleArray readyTime, DoubleArray serviceTime, DoubleArray demand,
+      DoubleValue capacity, DistanceMatrix distMatrix) {
       int selectedIndex = SelectRandomTourBiasedByLength(random, individual);
-      Tour route1 = individual.Tours[selectedIndex]; 
+      Tour route1 = individual.Tours[selectedIndex];
 
       bool performed = false;
@@ -53 +56 @@
               //customer1 can be feasibly inserted at the location of customer2
               tour.Cities[customer2Position] = customer1;
-              if (Feasible(tour)) {
+              if (tour.Feasible(dueTime, serviceTime, readyTime, demand, capacity, distMatrix)) {
                 int routeIdx, place;
                 if (FindInsertionPlace(individual,
-                  customer2, selectedIndex, out routeIdx, out place)) {
-                    individual.Tours[routeIdx].Cities.Insert(place, customer2);
-                    route1.Cities.RemoveAt(customer1Position);
+                  customer2, selectedIndex,
+                  dueTime, serviceTime, readyTime, demand, capacity,
+                  distMatrix,
+                  out routeIdx, out place)) {
+                  individual.Tours[routeIdx].Cities.Insert(place, customer2);
+                  route1.Cities.RemoveAt(customer1Position);
 
-                    if (route1.Cities.Count == 0)
+                  if (route1.Cities.Count == 0)
                     individual.Tours.Remove(route1);
 
@@ -83 +89 @@
       }
     }
+
+    protected override void Manipulate(IRandom random, PotvinEncoding individual) {
+      BoolValue useDistanceMatrix = UseDistanceMatrixParameter.ActualValue;
+      DoubleMatrix coordinates = CoordinatesParameter.ActualValue;
+      DistanceMatrix distMatrix = VRPUtilities.GetDistanceMatrix(coordinates, DistanceMatrixParameter, useDistanceMatrix);
+      DoubleArray dueTime = DueTimeParameter.ActualValue;
+      DoubleArray readyTime = ReadyTimeParameter.ActualValue;
+      DoubleArray serviceTime = ServiceTimeParameter.ActualValue;
+      DoubleArray demand = DemandParameter.ActualValue;
+      DoubleValue capacity = CapacityParameter.ActualValue;
+
+      Apply(random, individual, dueTime, readyTime, serviceTime, demand, capacity, distMatrix);
+    }
   }
 }