Changeset 6909 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment

Timestamp:

10/12/11 15:45:48 (13 years ago)

Author:

svonolfe

Message:

Fixed more isses that occured in dynamic instances (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment

Files:

• PotvinVehicleAssignmentMultiMoveGenerator.cs (modified) (1 diff)
• PotvinVehicleAssignmentSingleMoveGenerator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMultiMoveGenerator.cs

@@ -64 +64 @@
 
       for (int i = 0; i < SampleSizeParameter.ActualValue.Value; i++) {
-        result.Add(PotvinVehicleAssignmentSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue));
+        var move = PotvinVehicleAssignmentSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue);
+        if(move != null)
+          result.Add(move);
       }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentSingleMoveGenerator.cs

@@ -65 +65 @@
 
     public static PotvinVehicleAssignmentMove Apply(PotvinEncoding individual, IVRPProblemInstance problemInstance, IRandom rand) {
-      int tour1 = rand.Next(individual.Tours.Count);
-      int tour2 = rand.Next(problemInstance.Vehicles.Value);
+      if (individual.Tours.Count > 1) {
+        int tour1 = rand.Next(individual.Tours.Count);
+        int tour2 = rand.Next(problemInstance.Vehicles.Value);
 
-      while (tour2 == tour1)
-        tour2 = rand.Next(problemInstance.Vehicles.Value);
+        while (tour2 == tour1)
+          tour2 = rand.Next(problemInstance.Vehicles.Value);
 
-      return new PotvinVehicleAssignmentMove(tour1, tour2, individual);
+        return new PotvinVehicleAssignmentMove(tour1, tour2, individual);
+      } else {
+        return null;
+      }
     }