Context Navigation

-                      r15273
+                      r15334
   using Attributes;
   using Data.Pool;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Extensions;
   using Stack;
 …
+    }
+    private static bool IsSubclassOf(Type type, Type baseType) {
+      if (type == null || baseType == null || type == baseType)
+        return false;
+      if (baseType.IsGenericType == false) {
+        if (type.IsGenericType == false)
+          return type.IsSubclassOf(baseType);
+      } else {
+        baseType = baseType.GetGenericTypeDefinition();
+      }
+      type = type.BaseType;
+      var objectType = typeof(object);
+      while (type != objectType && type != null) {
+        var curentType = type.IsGenericType ? type.GetGenericTypeDefinition() : type;
+        if (curentType == baseType)
+          return true;
+        type = type.BaseType;
+      }
+      return false;
+    }
     private static IEnumerable<Type> GetExpressionTypes(Type baseType) {
 …
              from assemblyType in domainAssembly.GetTypes()
              where !assemblyType.IsAbstract &&
                    IsSubclassOf(assemblyType, baseType) &&
+                   assemblyType.IsSubclass(baseType) &&
                    assemblyType.GetConstructor(Type.EmptyTypes) != null
              select assemblyType;

Note: See TracChangeset for help on using the changeset viewer.

Changeset 15334 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ExpressionTable.cs