Changeset 4347 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3

Timestamp:

08/31/10 14:24:12 (14 years ago)

Author:

svonolfe

Message:

Sorted Operators alphabetically, disabled LS operators by default (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3

Files:

• Encodings/General/Creators/MultiVRPSolutionCreator.cs (modified) (1 diff)
• Encodings/General/Crossovers/MultiVRPSolutionCrossover.cs (modified) (1 diff)
• Encodings/General/Manipulators/MultiVRPSolutionManipulator.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Creators/MultiVRPSolutionCreator.cs

@@ -94 +94 @@
         Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
 
-        foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCreator))) {
+        foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCreator)).OrderBy(op => op.Name)) {
           if (!typeof(MultiOperator<IVRPCreator>).IsAssignableFrom(type))
             Operators.Add((IVRPCreator)Activator.CreateInstance(type), true);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Crossovers/MultiVRPSolutionCrossover.cs

@@ -101 +101 @@
       Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
 
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCrossover))) {
+      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPCrossover)).OrderBy(op => op.Name)) {
         if (!typeof(MultiOperator<IVRPCrossover>).IsAssignableFrom(type))
           Operators.Add((IVRPCrossover)Activator.CreateInstance(type), true);

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

@@ -94 +94 @@
       Parameters.Add(new LookupParameter<DoubleArray>("ServiceTime", "The service time of each customer."));
 
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPManipulator))) {
-        if (!typeof(MultiOperator<IVRPManipulator>).IsAssignableFrom(type))
-          Operators.Add((IVRPManipulator)Activator.CreateInstance(type), true);
+      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IVRPManipulator)).OrderBy(op => op.Name)) {
+        if (!typeof(MultiOperator<IVRPManipulator>).IsAssignableFrom(type)) {
+          IVRPManipulator op = (IVRPManipulator)Activator.CreateInstance(type);
+          bool operatorChecked = true; 
+          if(op is HeuristicLab.Problems.VehicleRouting.Encodings.Potvin.PotvinLocalSearchManipulator || 
+            op is HeuristicLab.Problems.VehicleRouting.Encodings.Prins.PrinsLSManipulator)
+            operatorChecked = false;
+          Operators.Add(op, operatorChecked);
+        }
       }
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

@@ -118 +118 @@
       Parameters.Add(new LookupParameter<IVRPMove>("VRPMove", "The generated moves."));
 
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator))) {
+      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IMultiVRPMoveGenerator)).OrderBy(op => op.Name)) {
         if (!typeof(MultiOperator<IMultiVRPMoveGenerator>).IsAssignableFrom(type))
           Operators.Add((IMultiVRPMoveGenerator)Activator.CreateInstance(type), true);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -320 +320 @@
       operators.Add(new BestAverageWorstVRPToursAnalyzer());
       ParameterizeAnalyzer();
-      operators.AddRange(ApplicationManager.Manager.GetInstances<IVRPOperator>().Cast<IOperator>());
+      operators.AddRange(ApplicationManager.Manager.GetInstances<IVRPOperator>().Cast<IOperator>().OrderBy(op => op.Name));
       ParameterizeOperators();
       UpdateMoveEvaluators();