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

Timestamp:

05/23/12 11:16:22 (13 years ago)

Author:

mkommend

Message:

#1782: Minor changes in discovery of problem instance providers.

File:

• trunk/sources/HeuristicLab.Problems.Instances/3.3/ProblemInstanceManager.cs (modified) (1 diff)

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()));
+        var interfaceTypes = instanceTypes.Where(x => x.GetGenericArguments().First().IsInterface);
+        if (interfaceTypes.Any()) {
+          var concreteTypes = interfaceTypes.SelectMany(x => ApplicationManager.Manager.GetTypes(x.GetGenericArguments().First()));
 
-          if (interfaceTypes.Any())
-            instanceTypes = instanceTypes.Union(interfaceTypes.Select(x => typeof(IProblemInstanceProvider<>).MakeGenericType(x))).Distinct();
+          if (concreteTypes.Any())
+            instanceTypes = instanceTypes.Union(concreteTypes.Select(x => typeof(IProblemInstanceProvider<>).MakeGenericType(x))).Distinct();
         }