Changeset 17269 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/Extensions

Timestamp:

09/25/19 17:18:41 (5 years ago)

Author:

dpiringe

Message:

#3026

• deleted IItemExtensions.cs
• fixed a bug in GetInterfaceDistance in TypeExtensions.cs -> generic types were ignored
• lots of code clean ups
• added new transformers: ParameterizedItemTransformer, MultiCheckedOperatorTransformer

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/Extensions

Files:

• IItemExtensions.cs (deleted)
• TypeExtensions.cs (modified) (3 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/Extensions/TypeExtensions.cs

@@ -4 +4 @@
 using System.Text;
 using System.Threading.Tasks;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Manufacture {
@@ -9 +10 @@
     public static int GetInterfaceDistance(this Type type, Type interfaceType) {
       if (!interfaceType.IsInterface) return -1;
-      int distance = 0;
+      int distance = int.MaxValue;
       Type baseType = type;
       while (baseType != typeof(object)) {
         var interfaces = baseType.GetInterfaces();
         var minimalInterfaces = interfaces.Except(interfaces.SelectMany(i => i.GetInterfaces()));
-        if (baseType == interfaceType && minimalInterfaces.Any(i => i == interfaceType))
-          ++distance;
+        if (minimalInterfaces.Any(i => {
+          if (i.IsGenericType)
+            return i.GetGenericTypeDefinition() == interfaceType;
+          return i == interfaceType;
+        })) --distance;
         baseType = baseType.BaseType;
       }
       return distance;
     }
+
     public static bool IsEqualTo(this Type type, Type other) {
       if (other == null) throw new ArgumentNullException("other");
@@ -30 +35 @@
             .Any(i => i.GetGenericTypeDefinition() == other);
       else if (other.IsInterface) {
-        /*
-        Type baseType = type;
-        while (baseType != typeof(object)) {
-          var interfaces = baseType.GetInterfaces();
-          var minimalInterfaces = interfaces.Except(interfaces.SelectMany(i => i.GetInterfaces()));
-          if (baseType == other && minimalInterfaces.Any(i => i == other))
-            return true;
-          baseType = baseType.BaseType;
-        }
-        */
         return type.GetInterfaces().Any(i => i == other);
       }