Changeset 17699 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting

Timestamp:

07/25/20 01:23:08 (4 years ago)

Author:

abeham

Message:

#2521: Made encodings non-generic classes (the TEncodedSolution type parameter is not actually used), this will make it considerably easier to port the VRP to the new architecture

Location:

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

Files:

• Encodings/Alba/AlbaEncoding.cs (modified) (1 diff)
• Interfaces/IVRPEncoding.cs (modified) (2 diffs)
• VehicleRoutingProblem.cs (modified) (2 diffs)

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

@@ -32 +32 @@
   [Item("AlbaEncoding", "Represents the encoding for Alba encoded solutions.")]
   [StorableType("9ff9f959-31d2-44e5-8a5e-b122220535c2")]
-  public class AlbaEncoding : Encoding<AlbaEncodedSolution>, IVRPEncoding<AlbaEncodedSolution> {
+  public class AlbaEncoding : Encoding, IVRPEncoding {
 
     [StorableConstructor]

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEncoding.cs

@@ -22 +22 @@
 using HEAL.Attic;
 using HeuristicLab.Optimization;
-using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -28 +27 @@
   [StorableType("b6674651-cc95-48d8-a2c3-83ee9325def3")]
   public interface IVRPEncoding : IEncoding { }
-
-  [StorableType("7d010ab3-2e01-4383-bb6c-7c47ef9d803f")]
-  public interface IVRPEncoding<T> : IVRPEncoding, IEncoding<T> where T : class, IVRPEncodedSolution { }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -45 +45 @@
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 110)]
   [StorableType("95137523-AE3B-4638-958C-E86829D54CE3")]
-  public sealed class VehicleRoutingProblem : SingleObjectiveProblem<AlbaEncoding, AlbaEncodedSolution>, IProblemInstanceConsumer<IVRPData> {
+  public sealed class VehicleRoutingProblem : SingleObjectiveProblem<IVRPEncoding, IVRPEncodedSolution>, IProblemInstanceConsumer<IVRPData> {
 
     public static new Image StaticItemImage {
@@ -97 +97 @@
     }
 
-    public override ISingleObjectiveEvaluationResult Evaluate(AlbaEncodedSolution solution, IRandom random, CancellationToken cancellationToken) {
+    public override ISingleObjectiveEvaluationResult Evaluate(IVRPEncodedSolution solution, IRandom random, CancellationToken cancellationToken) {
       return new SingleObjectiveEvaluationResult(ProblemInstance.Evaluate(solution).Quality);
     }