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

Timestamp:

07/28/20 23:36:25 (4 years ago)

Author:

abeham

Message:

#2521: worked on VRP

Location:

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

Files:

• AlbaEncoding.cs (modified) (3 diffs)
• LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (modified) (2 diffs)

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

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
@@ -54 +55 @@
     static AlbaEncoding() {
       encodingSpecificOperatorTypes = new List<Type>() {
-          typeof (IAlbaOperator)
+          typeof (IAlbaOperator),
+          typeof (IVRPCreator),
+          typeof (IMultiVRPOperator)
       };
     }
@@ -63 +66 @@
       var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
+      foreach (var op in newOperators.OfType<IMultiVRPOperator>().ToList()) {
+        op.SetOperators(Operators.Concat(newOperators));
+        if (!op.Operators.Any()) newOperators.Remove(op);
+      }
+      foreach (var op in Operators.OfType<IMultiVRPOperator>()) {
+        op.SetOperators(newOperators);
+      }
       ConfigureOperators(newOperators);
       foreach (var @operator in newOperators)

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

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Core;
-using HEAL.Attic;
-using HeuristicLab.Data;
-using HeuristicLab.Common;
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
@@ -31 +31 @@
   [Item("AlbaLambdaInterchangeLocalImprovementOperator", "Takes a solution and finds the local optimum with respect to the lambda interchange neighborhood by decending along the steepest gradient.")]
   [StorableType("84981F03-B886-4ADD-8DB5-C12628404335")]
-  public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
+  public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator, ISingleObjectiveOperator, IAlbaOperator {
 
     public IValueLookupParameter<IntValue> MaximumIterationsParameter {