Changeset 8531 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Timestamp:

08/28/12 13:11:15 (12 years ago)

Author:

mkommend

Message:

#1919: Refactored calculation of thresholds for SymbolicDiscriminantFunctionClassficationModels and removed the automatic recalculation of thresholds during solution creation.

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/3.3

Files:

• LightweightApplicationManager.cs (modified) (4 diffs)
• SandboxApplicationManager.cs (modified) (1 diff)

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

@@ -75 +75 @@
       foreach (Type t in GetTypes(type)) {
         object instance = null;
-        try { instance = Activator.CreateInstance(t); } catch { }
+        try { instance = Activator.CreateInstance(t); }
+        catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -137 +138 @@
                where includeGenericTypeDefinitions || !t.IsGenericTypeDefinition
                select t;
-      } catch (TypeLoadException) {
+      }
+      catch (TypeLoadException) {
         return Enumerable.Empty<Type>();
-      } catch (ReflectionTypeLoadException) {
+      }
+      catch (ReflectionTypeLoadException) {
         return Enumerable.Empty<Type>();
       }
@@ -163 +166 @@
         foreach (var genericArgument in typeGenericArguments) {
           if (otherGenericArguments[i].IsGenericParameter) {
+            //check class contraint on generic type parameter
+            if (otherGenericArguments[i].GenericParameterAttributes.HasFlag(GenericParameterAttributes.ReferenceTypeConstraint))
+              if (!genericArgument.IsClass) return false;
+
+            //check default constructor constraint on generic type parameter
+            if (otherGenericArguments[i].GenericParameterAttributes.HasFlag(GenericParameterAttributes.DefaultConstructorConstraint))
+              if (!genericArgument.IsValueType && genericArgument.GetConstructor(Type.EmptyTypes) == null) return false;
+
             foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
               if (!constraint.IsAssignableFrom(genericArgument)) return false;
@@ -173 +184 @@
           if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
-        } catch (Exception) { }
+        }
+        catch (Exception) { }
       }
       return false;

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

@@ -293 +293 @@
         foreach (var genericArgument in typeGenericArguments) {
           if (otherGenericArguments[i].IsGenericParameter) {
+            //check class contraint on generic type parameter
+            if (otherGenericArguments[i].GenericParameterAttributes.HasFlag(GenericParameterAttributes.ReferenceTypeConstraint))
+              if (!genericArgument.IsClass) return false;
+
+            //check default constructor constraint on generic type parameter
+            if (otherGenericArguments[i].GenericParameterAttributes.HasFlag(GenericParameterAttributes.DefaultConstructorConstraint))
+              if (!genericArgument.IsValueType && genericArgument.GetConstructor(Type.EmptyTypes) == null) return false;
+
             foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
               if (!constraint.IsAssignableFrom(genericArgument)) return false;