Changeset 14713 for branches/PersistenceOverhaul/HeuristicLab.Persistence

Timestamp:

03/03/17 18:41:01 (8 years ago)

Author:

gkronber

Message:

#2520 work in progress to support loading/saving of all samples

Location:

branches/PersistenceOverhaul/HeuristicLab.Persistence

Files:

• 3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)
• 4.0/Core/StaticCache.cs (modified) (3 diffs)
• 4.0/Transformers/StorableClassTransformer.cs (modified) (1 diff)

branches/PersistenceOverhaul/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -21 +21 @@
 
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
@@ -69 +70 @@
     /// </returns>
     public bool CanSerialize(Type type) {
-      var markedStorable = StorableReflection.HasStorableClassAttribute(type);
+      var markedStorable = StorableReflection.HasStorableClassAttribute(type) && !type.IsEnum && !type.IsValueType;
       if (GetConstructor(type) == null)
         if (markedStorable)

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/StaticCache.cs

@@ -113 +113 @@
       // RegisterType(new Guid("3B3AA69E-1641-4202-AE1D-7EEFF60FA355"), typeof(double[]));
       // RegisterType(new Guid("7DF325A6-2553-4915-B7C6-D98191107CB7"), typeof(string[]));
+
+      RegisterType(new Guid("E451A99B-0CFD-48E6-9BEF-0AE9D1E73628"), typeof(IList));                                        
       RegisterType(new Guid("DB2A785C-5803-42C7-A01F-E1FD845A83A1"), typeof(List<>));
       RegisterType(new Guid("EB98A564-BEDC-458A-9E9B-4BF3CDAFB9BE"), typeof(Stack<>));
@@ -121 +123 @@
       RegisterType(new Guid("7E2F3277-7216-4295-A498-9ACA43527D5B"), typeof(HashSet<>));
       RegisterType(new Guid("E92C35AD-32B1-4F37-B8D2-BE2F5FEB465B"), typeof(Dictionary<,>));
+      RegisterType(new Guid("18504ADF-2332-4497-8CA0-B2F00CA2EBA2"), typeof(Type));
 
       var allTypes = new Dictionary<string, Type>(5000);
@@ -162 +165 @@
       RegisterType(new Guid("00C8C940-63D9-43FF-99BA-9C69301BF043"), allTypes["System.Collections.Generic.RandomizedObjectEqualityComparer"]);
       RegisterType(new Guid("DAF22757-7FCC-49AC-B148-F3DD7E9E0A3B"), allTypes["System.Collections.Generic.IEqualityComparer`1"]);
-
 
       //var registeredTypes = type2Guid.Keys.ToArray();

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Transformers/StorableClassTransformer.cs

@@ -30 +30 @@
   internal sealed class StorableClassBoxTransformer : BoxTransformer<object> {
     public override bool CanTransformType(Type type) {
-      return StorableTypeAttribute.IsStorableType(type) && !type.IsValueType || // don't transform structs
+      return StorableTypeAttribute.IsStorableType(type) && !type.IsValueType && !type.IsEnum || // don't transform structs or enums
         type.BaseType != null && CanTransformType(type.BaseType);
     }