Changeset 17717 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRPProblemInstance.cs

Timestamp:

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

Author:

abeham

Message:

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

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRPProblemInstance.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRPProblemInstance.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 IHeterogenousCapacitatedOperator);
+      return base.FilterOperators(operators)
+        .Where(x => !(x is INotCapacitatedOperaor))
+        .Union(operators.Where(x => x is IHeterogenousCapacitatedOperator
+                                 || x is ICapacitatedOperator && !(x is IHomogenousCapacitatedOperator)));
     }