Changeset 6459 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators

Timestamp:

06/21/11 10:27:03 (13 years ago)

Author:

svonolfe

Message:

Added possibility to allow infeasible solutions (#1561)

Location:

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

Files:

• PotvinManipulator.cs (modified) (3 diffs)
• PotvinOneLevelExchangeManipulator.cs (modified) (3 diffs)
• PotvinTwoLevelExchangeManipulator.cs (modified) (3 diffs)

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

@@ -35 +35 @@
     }
 
+    public IValueParameter<BoolValue> AllowInfeasibleSolutions {
+      get { return (IValueParameter<BoolValue>)Parameters["AllowInfeasibleSolutions"]; }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (!Parameters.ContainsKey("AllowInfeasibleSolutions")) {
+        Parameters.Add(new ValueParameter<BoolValue>("AllowInfeasibleSolutions", "Indicates if infeasible solutions should be allowed.", new BoolValue(false)));
+      }
+      #endregion
+    }
+
     [StorableConstructor]
     protected PotvinManipulator(bool deserializing) : base(deserializing) { }
@@ -42 +56 @@
     public PotvinManipulator() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
+      Parameters.Add(new ValueParameter<BoolValue>("AllowInfeasibleSolutions", "Indicates if infeasible solutions should be allowed.", new BoolValue(false)));
     }
 
@@ -75 +90 @@
     protected static bool FindInsertionPlace(PotvinEncoding individual, int city, int routeToAvoid,
       DoubleArray dueTime, DoubleArray serviceTime, DoubleArray readyTime, DoubleArray demand,
-      DoubleValue capacity, DistanceMatrix distMatrix,
+      DoubleValue capacity, DistanceMatrix distMatrix,  bool allowInfeasible,
       out int route, out int place) {
       return individual.FindInsertionPlace(
         dueTime, serviceTime, readyTime,
         demand, capacity, distMatrix,
-        city, routeToAvoid, out route, out place);
+        city, routeToAvoid, allowInfeasible, 
+        out route, out place);
     }
       

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

@@ -42 +42 @@
     public static void Apply(IRandom random, PotvinEncoding individual, 
      DoubleArray dueTime, DoubleArray readyTime, DoubleArray serviceTime, DoubleArray demand,
-      DoubleValue capacity, DistanceMatrix distMatrix) {
+      DoubleValue capacity, DistanceMatrix distMatrix, bool allowInfeasible) {
       int selectedIndex = SelectRandomTourBiasedByLength(random, individual);
       Tour route1 =
@@ -53 +53 @@
         if (FindInsertionPlace(individual, route1.Cities[i], selectedIndex,
           dueTime, serviceTime, readyTime, demand, capacity,
-          distMatrix,
+          distMatrix, allowInfeasible,
           out insertedRoute, out insertedPlace)) {
           individual.Tours[insertedRoute].Cities.Insert(insertedPlace, route1.Cities[i]);
@@ -82 +82 @@
       DoubleValue capacity = CapacityParameter.ActualValue;
 
-      Apply(random, individual, dueTime, readyTime, serviceTime, demand, capacity, distMatrix); 
+      bool allowInfeasible = AllowInfeasibleSolutions.Value.Value;
+
+      Apply(random, individual, dueTime, readyTime, serviceTime, demand, capacity, distMatrix, allowInfeasible); 
     }
   }

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

@@ -39 +39 @@
     public static void Apply(IRandom random, PotvinEncoding individual, 
       DoubleArray dueTime, DoubleArray readyTime, DoubleArray serviceTime, DoubleArray demand,
-      DoubleValue capacity, DistanceMatrix distMatrix) {
+      DoubleValue capacity, DistanceMatrix distMatrix, bool allowInfeasible) {
       int selectedIndex = SelectRandomTourBiasedByLength(random, individual);
       Tour route1 = individual.Tours[selectedIndex];
@@ -61 +61 @@
                   customer2, selectedIndex,
                   dueTime, serviceTime, readyTime, demand, capacity,
-                  distMatrix,
+                  distMatrix, allowInfeasible,
                   out routeIdx, out place)) {
                   individual.Tours[routeIdx].Cities.Insert(place, customer2);
@@ -100 +100 @@
       DoubleValue capacity = CapacityParameter.ActualValue;
 
-      Apply(random, individual, dueTime, readyTime, serviceTime, demand, capacity, distMatrix);
+      bool allowInfeasible = AllowInfeasibleSolutions.Value.Value;
+
+      Apply(random, individual, dueTime, readyTime, serviceTime, demand, capacity, distMatrix, allowInfeasible);
     }
   }