Changeset 17954 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Timestamp:

04/21/21 15:31:20 (4 years ago)

Author:

abeham

Message:

#2521: updated samples (except for GPR - unit test needs to be refactored first)

• Fixed a few bugs in VRP
• Fixed the GAGroupingProblemSampleTest

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Files:

• Alba/AlbaEncoding.cs (modified) (1 diff)
• GVR/GVREncoding.cs (modified) (1 diff)
• Potvin/IPotvinOperator.cs (modified) (1 diff)
• Potvin/PotvinEncoding.cs (modified) (1 diff)
• Prins/PrinsEncoding.cs (modified) (1 diff)
• VRPEncoding.cs (modified) (2 diffs)
• Zhu/ZhuEncoding.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -64 +64 @@
       var assembly = typeof(IAlbaOperator).Assembly;
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
+      discoveredTypes = discoveredTypes.Where(x => EncodingOperatorTypes.Except(new[] { typeof(IAlbaOperator) }).All(y => !y.IsAssignableFrom(x)));
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs

@@ -64 +64 @@
       var assembly = typeof(IGVROperator).Assembly;
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
+      discoveredTypes = discoveredTypes.Where(x => EncodingOperatorTypes.Except(new[] { typeof(IGVROperator) }).All(y => !y.IsAssignableFrom(x)));
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/IPotvinOperator.cs

@@ -21 +21 @@
 
 using HEAL.Attic;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [StorableType("90265685-321B-4E34-AD9F-30FA917F07A0")]
-  public interface IPotvinOperator /*:
-    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator,
-    IMultiDepotOperator, IHeterogenousCapacitatedOperator*/ {
+  public interface IPotvinOperator : IGeneralVRPOperator {
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -64 +64 @@
       var assembly = typeof(IPotvinOperator).Assembly;
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
+      discoveredTypes = discoveredTypes.Where(x => EncodingOperatorTypes.Except(new[] { typeof(IPotvinOperator) }).All(y => !y.IsAssignableFrom(x)));
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

@@ -64 +64 @@
       var assembly = typeof(IPrinsOperator).Assembly;
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
+      discoveredTypes = discoveredTypes.Where(x => EncodingOperatorTypes.Except(new[] { typeof(IPrinsOperator) }).All(y => !y.IsAssignableFrom(x)));
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/VRPEncoding.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -31 +33 @@
   [StorableType("2bb0d7d5-d842-4cf7-8242-1d49940aa4b6")]
   public abstract class VRPEncoding : Encoding, IVRPEncoding {
+    private static HashSet<Type> encodingOperatorTypes = new HashSet<Type>() { typeof(Alba.IAlbaOperator), typeof(GVR.IGVROperator),
+      typeof(Potvin.IPotvinOperator), typeof(Prins.IPrinsOperator), typeof(Zhu.IZhuOperator) };
+    public static IReadOnlyCollection<Type> EncodingOperatorTypes => encodingOperatorTypes.ToList().AsReadOnly();
 
     [StorableConstructor]

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

@@ -64 +64 @@
       var assembly = typeof(IZhuOperator).Assembly;
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, assembly, true, false, false);
+      discoveredTypes = discoveredTypes.Where(x => EncodingOperatorTypes.Except(new[] { typeof(IZhuOperator) }).All(y => !y.IsAssignableFrom(x)));
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();