Ticket #1774: type discovery.patch

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs

@@ -123 +123 @@
     /// <returns>Enumerable of the discovered types.</returns>
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable = true, bool includeGenericTypeDefinitions = false) {
       try {
-        var assemblyTypes = assembly.GetTypes();
-
-        var buildTypes = from t in assemblyTypes
+        var buildTypes = from t in assembly.GetTypes()
                          where !IsNonDiscoverableType(t)
                          where CheckTypeCompatibility(type, t)
-                         where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                         where onlyInstantiable == false ||
+                               (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
                          select BuildType(t, type);
 
+        var buildTypes2 = from t in assembly.GetTypes()
+                          where !IsNonDiscoverableType(t)
+                          where onlyInstantiable == false ||
+                                (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                          where CheckTypeCompatibility2(type, t)
+                          select BuildType(t, type);
+
+        if (!buildTypes.SequenceEqual(buildTypes2)) throw new InvalidOperationException(type.FullName);
+
         return from t in buildTypes
                where includeGenericTypeDefinitions || !t.IsGenericTypeDefinition
                select t;
@@ -159 +167 @@
       }
       return false;
     }
+
+    private static bool CheckTypeCompatibility2(Type type, Type other) {
+      if (type.IsAssignableFrom(other))
+        return true;
+      if (type.IsGenericType && other.IsGenericType) {
+        var otherGenericArguments = other.GetGenericArguments();
+        var typeGenericArguments = type.GetGenericArguments();
+
+        //check type arguments count
+        if (otherGenericArguments.Length != typeGenericArguments.Length)
+          return false;
+
+        //check type arguments & constraints
+        int i = 0;
+        foreach (var genericArgument in typeGenericArguments) {
+          if (otherGenericArguments[i].IsGenericParameter) {
+            foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
+              if (!constraint.IsAssignableFrom(genericArgument)) return false;
+          } else if (genericArgument != otherGenericArguments[i]) return false;
+          i++;
+        }
+        //check types
+        try {
+          var otherGenericTypeDefinition = other.GetGenericTypeDefinition();
+          if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
+            return true;
+        }
+        catch (Exception) { }
+      }
+      return false;
+    }
     private static Type BuildType(Type type, Type protoType) {
       if (type.IsGenericType && protoType.IsGenericType)
         return type.GetGenericTypeDefinition().MakeGenericType(protoType.GetGenericArguments());

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -271 +271 @@
                              (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
                        select BuildType(t, type);
 
+      var buildTypes2 = from t in assembly.GetTypes()
+                        where !IsNonDiscoverableType(t)
+                        where onlyInstantiable == false ||
+                              (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                        where CheckTypeCompatibility2(type, t)
+                        select BuildType(t, type);
+
+      if (!buildTypes.SequenceEqual(buildTypes2)) throw new InvalidOperationException("implementation error");
+
       return from t in buildTypes
              where includeGenericTypeDefinitions || !t.IsGenericTypeDefinition
              select t;
@@ -293 +302 @@
       }
       return false;
     }
+
+    private static bool CheckTypeCompatibility2(Type type, Type other) {
+      if (type.IsAssignableFrom(other))
+        return true;
+      if (type.IsGenericType && other.IsGenericType) {
+        var otherGenericArguments = other.GetGenericArguments();
+        var typeGenericArguments = type.GetGenericArguments();
+
+        //check type arguments count
+        if (otherGenericArguments.Length != typeGenericArguments.Length)
+          return false;
+
+        //check type arguments & constraints
+        int i = 0;
+        foreach (var genericArgument in typeGenericArguments) {
+          if (otherGenericArguments[i].IsGenericParameter) {
+            foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
+              if (!constraint.IsAssignableFrom(genericArgument)) return false;
+          } else if (genericArgument != otherGenericArguments[i]) return false;
+          i++;
+        }
+        //check types
+        try {
+          var otherGenericTypeDefinition = other.GetGenericTypeDefinition();
+          if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
+            return true;
+        }
+        catch (Exception) { }
+      }
+      return false;
+    }
     private static Type BuildType(Type type, Type protoType) {
       if (type.IsGenericType && protoType.IsGenericType)
         return type.GetGenericTypeDefinition().MakeGenericType(protoType.GetGenericArguments());

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -90 +93 @@
       Assert.IsTrue(errorMessage.Length == 0, errorMessage.ToString());
     }
 
+    [TestMethod]
+    public void CheckTypeDiscovery() {
+      List<Type> list = new List<Type>();
+      foreach (Type deepCloneableType in ApplicationManager.Manager.GetTypes(typeof(HeuristicOptimizationProblem<IEvaluator, ISolutionCreator>), false, true)) {
+        list.Add(deepCloneableType);
+      }
+      list.Clear();
+
+      foreach (Type deepCloneableType in ApplicationManager.Manager.GetTypes(typeof(IValueParameter<>))) {
+        list.Add(deepCloneableType);
+      }
+      list.Clear();
+
+      foreach (Type deepCloneableType in ApplicationManager.Manager.GetTypes(typeof(IValueParameter<IItem>), false, true)) {
+        list.Add(deepCloneableType);
+      }
+      list.Clear();
+
+      var objects = new List<object>();
+      foreach (IDeepCloneable deepCloneable in ApplicationManager.Manager.GetInstances(typeof(IValueParameter<>))) {
+        if (deepCloneable.GetType().FullName.Contains("Hive")) continue;
+        objects.Add(deepCloneable.ToString());
+      }
+      objects.Clear();
+
+      foreach (IDeepCloneable deepCloneable in ApplicationManager.Manager.GetInstances(typeof(IValueParameter<Item>))) {
+        if (deepCloneable.GetType().FullName.Contains("Hive")) continue;
+        objects.Add(deepCloneable.ToString());
+      }
+      objects.Clear();
+
+    }
+
     private static Type GetPluginFromAssembly(Assembly assembly) {
       return assembly.GetExportedTypes().Where(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).FirstOrDefault();
     }