Changeset 17478 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

03/17/20 14:55:23 (5 years ago)

Author:

dpiringe

Message:

#3026:

• removed type extension for type comparison (was a complicated comparison, which should not be a public extension method for Type)
  • comparison is now located (as private method) in JsonItemConverter
  • also simplified it a lot (did some tests to measure the relevance of specific checks -> last check got completely removed)

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• Extensions/TypeExtensions.cs (deleted)
• HeuristicLab.JsonInterface.csproj (modified) (3 diffs)
• JsonItemConverter.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

@@ -61 +61 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AdvancedTypeComparer.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Converters\AlgorithmConverter.cs" />
@@ -99 +100 @@
     <Compile Include="Models\ValueLookupJsonItem.cs" />
     <Compile Include="SingleLineArrayJsonWriter.cs" />
-    <Compile Include="Extensions\TypeExtensions.cs" />
     <Compile Include="JCGenerator.cs" />
     <Compile Include="JsonTemplateInstantiator.cs" />
@@ -166 +166 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Extensions\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItemConverter.cs

@@ -40 +40 @@
       
       foreach (var x in Converters)
-        if (type.IsEqualTo(x.Key))
+        if (CompareTypes(type, x.Key))
           possibleConverters.Add(x.Value);
 
@@ -91 +91 @@
       Converters = converters;
     }
+
+    private bool CompareGenericTypes(Type t1, Type t2) =>
+      (t1.IsGenericType && t1.GetGenericTypeDefinition() == t2) ||
+      (t2.IsGenericType && t2.GetGenericTypeDefinition() == t1);
+
+    private bool CompareTypes(Type t1, Type t2) =>
+      t1 == t2 || t1.IsAssignableFrom(t2) ||
+      t1.GetInterfaces().Any(
+        i => i == t2 || CompareGenericTypes(i, t2)
+      ) ||
+      CompareGenericTypes(t1, t2);
   }
 }