Changeset 7867 for trunk/sources/HeuristicLab.Problems.Instances

Timestamp:

05/22/12 12:05:20 (13 years ago)

Author:

svonolfe

Message:

Added support for derived data types (#1782)

Location:

trunk/sources/HeuristicLab.Problems.Instances/3.3

Files:

• IProblemInstanceConsumer.cs (modified) (1 diff)
• ProblemInstanceManager.cs (modified) (1 diff)

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/ProblemInstanceManager.cs

@@ -36 +36 @@
           .Select(x => typeof(IProblemInstanceProvider<>).MakeGenericType(x));
 
+        if (instanceTypes.Any(x => x.GetGenericArguments().First().IsInterface)) {
+          var interfaceTypes = instanceTypes.Where(x => x.GetGenericArguments().First().IsInterface)
+            .SelectMany(x => ApplicationManager.Manager.GetTypes(x.GetGenericArguments().First()));
+
+          if (interfaceTypes.Any())
+            instanceTypes = instanceTypes.Union(interfaceTypes.Select(x => typeof(IProblemInstanceProvider<>).MakeGenericType(x))).Distinct();
+        }
+
         foreach (var type in instanceTypes) {
           foreach (var provider in ApplicationManager.Manager.GetInstances(type))