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

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/General

Files:

• Manipulators/MultiVRPSolutionManipulator.cs (modified) (1 diff)
• PermutationEncoding.cs (modified) (1 diff)
• ShakingOperators/VehicleRoutingShakingOperator.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));
     }