Changeset 17717 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP

Timestamp:

08/05/20 04:37:37 (5 years ago)

Author:

abeham

Message:

#2521: working on VRP (refactoring all the capabilities, features, and operator discovery)

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP

Files:

• CVRPPDTWProblemInstance.cs (modified) (2 diffs)
• CVRPProblemInstance.cs (modified) (2 diffs)
• CVRPTWProblemInstance.cs (modified) (2 diffs)
• SingleDepotVRPProblemInstance.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRPPDTWProblemInstance.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
@@ -70 +69 @@
 
     public override IEnumerable<IOperator> FilterOperators(IEnumerable<IOperator> operators) {
-      return base.FilterOperators(operators).Where(x => x is IPickupAndDeliveryOperator);
+      return base.FilterOperators(operators)
+        .Where(x => !(x is INotPickupAndDeliveryOperator))
+        .Union(operators.Where(x => x is IPickupAndDeliveryOperator));
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRPProblemInstance.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
@@ -66 +65 @@
 
     public override IEnumerable<IOperator> FilterOperators(IEnumerable<IOperator> operators) {
-      return base.FilterOperators(operators).Where(x => x is IHomogenousCapacitatedOperator);
+      return base.FilterOperators(operators)
+        .Where(x => !(x is INotCapacitatedOperaor))
+        .Union(operators.Where(x => x is IHomogenousCapacitatedOperator
+                                 || x is ICapacitatedOperator && !(x is IHeterogenousCapacitatedOperator)));
     }
     protected override VRPEvaluation CreateTourEvaluation() {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRPTWProblemInstance.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
@@ -88 +87 @@
 
     public override IEnumerable<IOperator> FilterOperators(IEnumerable<IOperator> operators) {
-      return base.FilterOperators(operators).Where(x => x is ITimeWindowedOperator);
+      return base.FilterOperators(operators)
+        .Where(x => !(x is INotTimeWindowedOperator))
+        .Union(operators.Where(x => x is ITimeWindowedOperator));
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
@@ -35 +34 @@
 
     public override IEnumerable<IOperator> FilterOperators(IEnumerable<IOperator> operators) {
-      return base.FilterOperators(operators).Where(x => x is ISingleDepotOperator);
+      return base.FilterOperators(operators)
+        .Where(x => !(x is INotSingleDepotOperator))
+        .Union(operators.Where(x => x is ISingleDepotOperator));
     }