Changeset 7855 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Timestamp:

05/21/12 14:32:32 (13 years ago)

Author:

svonolfe

Message:

Deactivated LS manipulators by default (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Files:

• General/Manipulators/MultiVRPSolutionManipulator.cs (modified) (1 diff)
• General/PermutationEncoding.cs (modified) (1 diff)
• General/ShakingOperators/VehicleRoutingShakingOperator.cs (modified) (1 diff)
• Potvin/Manipulators/PotvinLocalSearchManipulator.cs (modified) (1 diff)
• Prins/Manipulators/PrinsLSManipulator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/MultiVRPSolutionManipulator.cs

@@ -84 +84 @@
       foreach (IOperator op in operators) {
         if (op is IVRPManipulator && !(op is MultiVRPSolutionManipulator)) {
-          Operators.Add(op.Clone() as IVRPManipulator, true);
+          Operators.Add(op.Clone() as IVRPManipulator, !(op is IVRPLocalSearchManipulator));
         }
       }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

@@ -36 +36 @@
     public abstract List<Tour> GetTours();
 
-    public int GetTourIndex(Tour tour) {
+    public virtual int GetTourIndex(Tour tour) {
       int index = -1;
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/ShakingOperators/VehicleRoutingShakingOperator.cs

@@ -71 +71 @@
      
       foreach (IVRPManipulator shaker in ApplicationManager.Manager.GetInstances<IVRPManipulator>().OrderBy(x => x.Name))
-        if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker);
+        if (!(shaker is MultiVRPSolutionManipulator)) Operators.Add(shaker, !(shaker is IVRPLocalSearchManipulator));
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.cs

@@ -27 +27 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PotvinLocalSearchManipulator", "The LSM operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
   [StorableClass]
-  public sealed class PotvinLocalSearchManipulator : PotvinManipulator {
+  public sealed class PotvinLocalSearchManipulator : PotvinManipulator, IVRPLocalSearchManipulator {
     public IValueParameter<IntValue> Iterations {
       get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsLSManipulator.cs

@@ -27 +27 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
   [Item("PrinsLSManipulator", "An operator which manipulates a VRP representation by using the Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
   [StorableClass]
-  public abstract class PrinsLSManipulator : PrinsManipulator {
+  public abstract class PrinsLSManipulator : PrinsManipulator, IVRPLocalSearchManipulator {
     public IValueParameter<IntValue> Iterations {
       get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }