Changeset 11285

Timestamp:

08/19/14 13:50:15 (10 years ago)

Author:

pfleck

Message:

#2225
The ProblemInstanceProvider is now contravariant. Therefore the ProblemInstanceManager discovers all derivations of InstanceProvider<IVRPData>.

Note that there was a problem with covariant InstanceConsumers with the ProblemInstanceProviderView in the past (#1981).
Due to the fixes from #2110 this problem should not occur anymore.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

@@ -25 +25 @@
   public interface IProblemInstanceConsumer : IContent { }
 
-  public interface IProblemInstanceConsumer<TData> : IProblemInstanceConsumer {
+  public interface IProblemInstanceConsumer<in TData> : IProblemInstanceConsumer {
     /// <summary>
     /// Loads the given instance data.

trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs

@@ -25 +25 @@
   /// Describes instances of the Vehicle Routing Problem (VRP).
   /// </summary>
-  public abstract class VRPData: IVRPData {
+  public class VRPData : IVRPData {
     /// <summary>
     /// The name of the instance

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -42 +42 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class VehicleRoutingProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<VRPData> {
+  public sealed class VehicleRoutingProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<IVRPData> {
     public string Filename { get; set; }
 
@@ -390 +390 @@
     #region IProblemInstanceConsumer<VRPData> Members
 
-    public void Load(VRPData data) {
+    public void Load(IVRPData data) {
       var interpreterDataType = data.GetType();
       var interpreterType = typeof(IVRPDataInterpreter<>).MakeGenericType(interpreterDataType);