Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/03/17 11:41:43 (7 years ago)
Author:
gkronber
Message:

#2520

  • renamed StorableClass -> StorableType
  • changed persistence to use GUIDs instead of type names
Location:
branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/Mapper.cs

    r14594 r14711  
    139139      bundle.RootBoxId = mapper.GetBoxId(o);
    140140      bundle.AddRangeTransformerGuids(mapper.transformers.GetValues().Select(x => x.Guid).Select(x => ByteString.CopyFrom(x.ToByteArray())));
    141       bundle.AddRangeTypeGuids(mapper.types.GetValues().Select(x => x.AssemblyQualifiedName ?? x.Name).Select(x => ByteString.CopyFromUtf8(x)));
     141      bundle.AddRangeTypeGuids(mapper.types.GetValues().Select(x => ByteString.CopyFrom(StaticCache.GetGuid(x).ToByteArray())));
    142142      bundle.AddRangeStrings(mapper.strings.GetValues());
    143143      bundle.AddRangeBoxes(mapper.boxId2Box.OrderBy(x => x.Key).Select(x => x.Value));
    … …  
    146146    public static object ToObject(Bundle bundle) {
    147147      var mapper = new Mapper();
    148       mapper.types = new Index<Type>(bundle.TypeGuidsList.Select(x => x.ToStringUtf8()).Select(x => Type.GetType(x)));
     148      mapper.types = new Index<Type>(bundle.TypeGuidsList.Select(x => StaticCache.GetType(new Guid(x.ToByteArray()))));
    149149      mapper.strings = new Index<string>(bundle.StringsList);
    150150      mapper.boxId2Box = bundle.BoxesList.Select((b, i) => new { Box = b, Index = i }).ToDictionary(k => (uint)k.Index + 1, v => v.Box);

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

    r14594 r14711  
    3535    private Dictionary<Guid, ITransformer> guid2Transformer;
    3636    private Dictionary<ITransformer, Guid> transformer2Guid;
    37     //private Dictionary<string, Type> guid2Type;
    38     //private Dictionary<Type, string> type2Guid;
     37    private Dictionary<Guid, Type> guid2Type;
     38    private Dictionary<Type, Guid> type2Guid;
    3939    private Dictionary<Type, TypeInfo> typeInfos;
    4040    private ExtensionRegistry extensionRegistry;
    … …  
    4343      guid2Transformer = new Dictionary<Guid, ITransformer>();
    4444      transformer2Guid = new Dictionary<ITransformer, Guid>();
    45       //guid2Type = new Dictionary<string, Type>();
    46       //type2Guid = new Dictionary<Type, string>();
     45      guid2Type = new Dictionary<Guid, Type>();
     46      type2Guid = new Dictionary<Type, Guid>();
    4747      typeInfos = new Dictionary<Type, TypeInfo>();
    4848      extensionRegistry = ExtensionRegistry.CreateInstance();
    … …  
    5252
    5353
    54       // ECC12A57-DA8D-43D9-9EC7-FCAC878A4D69
    55       // E8348C94-9817-4164-9C98-377689F83F30
    56       // 05551382-E894-4218-B860-FEE1D92CA07D
    57       // 4CC0D44E-65B2-4DF1-A333-30F058CB78CA
    58       // 5D451A64-EBD9-411F-A07E-232250B33784
    59       // EEBD2D26-56CC-45EA-900A-DD29B9F598CE
    60       // B8EEEFA7-8576-42DD-937C-AFBB66297B56
    61       // 4C3C8E0A-7DCF-4814-B798-AECB86E1E4E3
    62       // EAA4FF91-B90C-47CB-AC0F-66AB66D41186
    63       // EB51B342-826F-4004-B2C6-F2A03A8C35C9
    64       // 14138614-45DB-4A0D-9E59-AE9373241D6B
    65 
    66 
    67       //       RegisterType(new Guid("94AD8522-3F55-4580-A6F8-2D2AAEDD4B8C"), typeof(bool));
    68       //       RegisterType(new Guid("4A1C0FD5-423D-4F96-AB22-A496578C25AC"), typeof(byte));
    69       //       RegisterType(new Guid("C4B00F0B-FED7-439F-B1B2-8A0048B64882"), typeof(sbyte));
    70       //       RegisterType(new Guid("9F451811-3DE1-43AB-8B74-D7E03851857B"), typeof(short));
    71       //       RegisterType(new Guid("46244D54-0145-49F7-9CF3-9CDB7FB5F240"), typeof(ushort));
    72       //       RegisterType(new Guid("1FDDE40C-09E3-491F-8FBB-32BB3C885E9E"), typeof(char));
    73       //       RegisterType(new Guid("EE3E0F9C-A5C2-4461-AF36-28BD8F26E6FB"), typeof(int));
    74       //       RegisterType(new Guid("69476D18-D285-43E9-BC7C-6CC9E9F2321E"), typeof(uint));
    75       //       RegisterType(new Guid("7C7BC5EC-F001-4BA0-9F85-50DCBAA9AE81"), typeof(long));
    76       //       RegisterType(new Guid("AC808D5A-63BB-457C-9B92-C9B83DA2B139"), typeof(ulong));
    77       //       RegisterType(new Guid("BF22653A-026C-4367-BBBA-2125AECF6C08"), typeof(float));
    78       //       RegisterType(new Guid("8B49821A-3ADC-4715-9DB1-08E2F3CFDF15"), typeof(double));
    79       //       RegisterType(new Guid("7BB386BF-6FD4-443D-A6C1-387096798C67"), typeof(DateTime));
    80       //       RegisterType(new Guid("724A2D49-7E7B-455B-BBA9-4214C64E8A21"), typeof(TimeSpan));
    81       //       RegisterType(new Guid("4DB2ED2B-D9F2-4695-B555-A2CF42740740"), typeof(Color));
    82       //       RegisterType(new Guid("9BC74087-D5C0-4C39-99B4-D7465F478492"), typeof(Point));
    83       //       RegisterType(new Guid("E84C326A-7E14-4F28-AEFF-BC16CC671655"), typeof(KeyValuePair<,>));
    84       //       RegisterType(new Guid("F0280B55-25E8-4981-B309-D675D081402A"), typeof(string));
    8554      //
    86       //       RegisterType(new Guid("9CF55419-439B-4A90-B2ED-8C7F7768EB61"), typeof(Array));
    87       //       RegisterType(new Guid("D15AD28B-203A-460E-815C-F7230C4B1F75"), typeof(bool[]));
    88       //       RegisterType(new Guid("EE318DC4-580D-4DB1-9AAD-988B0E50A3DB"), typeof(byte[]));
    89       //       RegisterType(new Guid("326B9484-361F-46F8-B8A6-46C781A8C51F"), typeof(sbyte[]));
    90       //       RegisterType(new Guid("C854783D-4C91-43C8-A19A-F96012494F8A"), typeof(short[]));
    91       //       RegisterType(new Guid("C47FB329-2A1D-4EB7-AFB1-1CF72AB30E98"), typeof(ushort[]));
    92       //       RegisterType(new Guid("9681D044-B50C-4907-B23E-BDFEBC6C3FFC"), typeof(char[]));
    93       //       RegisterType(new Guid("0FC62D91-D63F-4507-8696-885D4C07285A"), typeof(int[]));
    94       //       RegisterType(new Guid("C43A25A0-9B99-4DA4-9279-7495FE10428E"), typeof(uint[]));
    95       //       RegisterType(new Guid("7AC4DDAC-0E13-428E-BF49-7BE7B76746CB"), typeof(long[]));
    96       //       RegisterType(new Guid("8D9283A7-FE49-4AEA-A09F-D53CF3BE520A"), typeof(ulong[]));
    97       //       RegisterType(new Guid("BB9CFA0B-DD29-4C44-85C6-3A6289C55448"), typeof(float[]));
    98       //       RegisterType(new Guid("3B3AA69E-1641-4202-AE1D-7EEFF60FA355"), typeof(double[]));
    99       //       RegisterType(new Guid("7DF325A6-2553-4915-B7C6-D98191107CB7"), typeof(string[]));
    100       //       RegisterType(new Guid("DB2A785C-5803-42C7-A01F-E1FD845A83A1"), typeof(List<>));
    101       //       RegisterType(new Guid("EB98A564-BEDC-458A-9E9B-4BF3CDAFB9BE"), typeof(Stack<>));
    102       //       RegisterType(new Guid("D5E3118B-957A-43B5-A740-1BBAA0EAB666"), typeof(System.Collections.Stack));
    103       //       RegisterType(new Guid("7E2F3277-7216-4295-A498-9ACA43527D5B"), typeof(HashSet<>));
    104       //       RegisterType(new Guid("E92C35AD-32B1-4F37-B8D2-BE2F5FEB465B"), typeof(Dictionary<,>));
    105 
    106       //RegisterTypeAndFullName(typeof(object));
    107       //RegisterTypeAndFullName(typeof(bool));
    108       //RegisterTypeAndFullName(typeof(byte));
    109       //RegisterTypeAndFullName(typeof(sbyte));
    110       //RegisterTypeAndFullName(typeof(short));
    111       //RegisterTypeAndFullName(typeof(ushort));
    112       //RegisterTypeAndFullName(typeof(char));
    113       //RegisterTypeAndFullName(typeof(int));
    114       //RegisterTypeAndFullName(typeof(uint));
    115       //RegisterTypeAndFullName(typeof(long));
    116       //RegisterTypeAndFullName(typeof(ulong));
    117       //RegisterTypeAndFullName(typeof(float));
    118       //RegisterTypeAndFullName(typeof(double));
    119       //RegisterTypeAndFullName(typeof(decimal));
    120       //RegisterTypeAndFullName(typeof(DateTime));
    121       //RegisterTypeAndFullName(typeof(TimeSpan));
    122       //RegisterTypeAndFullName(typeof(Font));
    123       //RegisterTypeAndFullName(typeof(Color));
    124       //RegisterTypeAndFullName(typeof(Bitmap));
    125       //RegisterTypeAndFullName(typeof(Point));
    126       //RegisterTypeAndFullName(typeof(KeyValuePair<,>));
    127       //RegisterTypeAndFullName(typeof(Tuple<>));
    128       //RegisterTypeAndFullName(typeof(Tuple<,>));
    129       //RegisterTypeAndFullName(typeof(Tuple<,,>));
    130       //RegisterTypeAndFullName(typeof(Tuple<,,,>));
    131       //RegisterTypeAndFullName(typeof(Tuple<,,,,>));
    132       //RegisterTypeAndFullName(typeof(Tuple<,,,,,>));
    133       //RegisterTypeAndFullName(typeof(Tuple<,,,,,,>));
    134       //RegisterTypeAndFullName(typeof(Tuple<,,,,,,,>));
    135       //RegisterTypeAndFullName(typeof(Nullable<>));
    136       //RegisterTypeAndFullName(typeof(string));
    137 
    138       //RegisterTypeAndFullName(typeof(Array));
    139       //RegisterTypeAndFullName(typeof(bool[]));
    140       //RegisterTypeAndFullName(typeof(byte[]));
    141       //RegisterTypeAndFullName(typeof(sbyte[]));
    142       //RegisterTypeAndFullName(typeof(short[]));
    143       //RegisterTypeAndFullName(typeof(ushort[]));
    144       //RegisterTypeAndFullName(typeof(char[]));
    145       //RegisterTypeAndFullName(typeof(int[]));
    146       //RegisterTypeAndFullName(typeof(uint[]));
    147       //RegisterTypeAndFullName(typeof(long[]));
    148       //RegisterTypeAndFullName(typeof(ulong[]));
    149       //RegisterTypeAndFullName(typeof(float[]));
    150       //RegisterTypeAndFullName(typeof(double[]));
    151       //RegisterTypeAndFullName(typeof(string[]));
    152       //RegisterTypeAndFullName(typeof(List<>));
    153       //RegisterTypeAndFullName(typeof(ArrayList));
    154       //RegisterTypeAndFullName(typeof(HashSet<>));
    155       //RegisterTypeAndFullName(typeof(Stack<>));
    156       //RegisterTypeAndFullName(typeof(Stack));
    157       //RegisterTypeAndFullName(typeof(Queue<>));
    158       //RegisterTypeAndFullName(typeof(Queue));
    159       //RegisterTypeAndFullName(typeof(Dictionary<,>));
    160 
    161       //foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
    162       //  foreach (var t in asm.GetTypes().Where(x => StorableClassAttribute.IsStorableClass(x) // storable classes
    163       //                                           || x.IsValueType && !x.IsPrimitive && !x.IsEnum && x.IsSealed // structs
    164       //                                           || typeof(IEqualityComparer).IsAssignableFrom(x) // equality comparers
    165       //                                           || x.IsGenericType && typeof(IEqualityComparer<>).IsAssignableFrom(x.GetGenericTypeDefinition()))) // generic equality comparers
    166       //    RegisterTypeAndFullName(t);
    167       //}
     55      // 
     56      // 
     57      // 
     58      // 
     59      // 
     60      //  "B7313EE2-045F-41C9-AEC9-7B1A8CDBF90F"
     61      //  "D5265599-7380-4A28-AB0D-9F336EF290C5"
     62      //  "6A92B935-5D05-42D8-933C-333C9AB71133"
     63      //  "934A44AA-7E04-4E2D-B640-EDD3DE24894F"
     64      //  "0F24C888-AF34-4318-9472-187B9AA85F3C"
     65
     66
     67
     68      RegisterType(new Guid("ECAEA154-6BFF-419F-8BE6-2565E9314825"), typeof(object));
     69      RegisterType(new Guid("94AD8522-3F55-4580-A6F8-2D2AAEDD4B8C"), typeof(bool));
     70      RegisterType(new Guid("4A1C0FD5-423D-4F96-AB22-A496578C25AC"), typeof(byte));
     71      RegisterType(new Guid("C4B00F0B-FED7-439F-B1B2-8A0048B64882"), typeof(sbyte));
     72      RegisterType(new Guid("9F451811-3DE1-43AB-8B74-D7E03851857B"), typeof(short));
     73      RegisterType(new Guid("46244D54-0145-49F7-9CF3-9CDB7FB5F240"), typeof(ushort));
     74      RegisterType(new Guid("1FDDE40C-09E3-491F-8FBB-32BB3C885E9E"), typeof(char));
     75      RegisterType(new Guid("EE3E0F9C-A5C2-4461-AF36-28BD8F26E6FB"), typeof(int));
     76      RegisterType(new Guid("69476D18-D285-43E9-BC7C-6CC9E9F2321E"), typeof(uint));
     77      RegisterType(new Guid("7C7BC5EC-F001-4BA0-9F85-50DCBAA9AE81"), typeof(long));
     78      RegisterType(new Guid("AC808D5A-63BB-457C-9B92-C9B83DA2B139"), typeof(ulong));
     79      RegisterType(new Guid("BF22653A-026C-4367-BBBA-2125AECF6C08"), typeof(float));
     80      RegisterType(new Guid("8B49821A-3ADC-4715-9DB1-08E2F3CFDF15"), typeof(double));
     81      RegisterType(new Guid("5C6CB86C-81DA-4334-9196-6571C6706240"), typeof(decimal));
     82
     83      RegisterType(new Guid("7BB386BF-6FD4-443D-A6C1-387096798C67"), typeof(DateTime));
     84      RegisterType(new Guid("724A2D49-7E7B-455B-BBA9-4214C64E8A21"), typeof(TimeSpan));
     85      RegisterType(new Guid("ECC12A57-DA8D-43D9-9EC7-FCAC878A4D69"), typeof(Font));
     86      RegisterType(new Guid("E8348C94-9817-4164-9C98-377689F83F30"), typeof(Bitmap));
     87      RegisterType(new Guid("05551382-E894-4218-B860-FEE1D92CA07D"), typeof(Nullable<>));
     88      RegisterType(new Guid("4CC0D44E-65B2-4DF1-A333-30F058CB78CA"), typeof(Tuple<>));
     89      RegisterType(new Guid("5D451A64-EBD9-411F-A07E-232250B33784"), typeof(Tuple<,>));
     90      RegisterType(new Guid("EEBD2D26-56CC-45EA-900A-DD29B9F598CE"), typeof(Tuple<,,>));
     91      RegisterType(new Guid("B8EEEFA7-8576-42DD-937C-AFBB66297B56"), typeof(Tuple<,,,>));
     92      RegisterType(new Guid("4C3C8E0A-7DCF-4814-B798-AECB86E1E4E3"), typeof(Tuple<,,,,>));
     93      RegisterType(new Guid("EAA4FF91-B90C-47CB-AC0F-66AB66D41186"), typeof(Tuple<,,,,,>));
     94      RegisterType(new Guid("EB51B342-826F-4004-B2C6-F2A03A8C35C9"), typeof(Tuple<,,,,,,>));
     95      RegisterType(new Guid("14138614-45DB-4A0D-9E59-AE9373241D6B"), typeof(Tuple<,,,,,,,>));
     96      RegisterType(new Guid("4DB2ED2B-D9F2-4695-B555-A2CF42740740"), typeof(Color));
     97      RegisterType(new Guid("9BC74087-D5C0-4C39-99B4-D7465F478492"), typeof(Point));
     98      RegisterType(new Guid("E84C326A-7E14-4F28-AEFF-BC16CC671655"), typeof(KeyValuePair<,>));
     99      RegisterType(new Guid("F0280B55-25E8-4981-B309-D675D081402A"), typeof(string));
     100      //
     101      RegisterType(new Guid("9CF55419-439B-4A90-B2ED-8C7F7768EB61"), typeof(Array));
     102      // RegisterType(new Guid("D15AD28B-203A-460E-815C-F7230C4B1F75"), typeof(bool[]));
     103      // RegisterType(new Guid("EE318DC4-580D-4DB1-9AAD-988B0E50A3DB"), typeof(byte[]));
     104      // RegisterType(new Guid("326B9484-361F-46F8-B8A6-46C781A8C51F"), typeof(sbyte[]));
     105      // RegisterType(new Guid("C854783D-4C91-43C8-A19A-F96012494F8A"), typeof(short[]));
     106      // RegisterType(new Guid("C47FB329-2A1D-4EB7-AFB1-1CF72AB30E98"), typeof(ushort[]));
     107      // RegisterType(new Guid("9681D044-B50C-4907-B23E-BDFEBC6C3FFC"), typeof(char[]));
     108      // RegisterType(new Guid("0FC62D91-D63F-4507-8696-885D4C07285A"), typeof(int[]));
     109      // RegisterType(new Guid("C43A25A0-9B99-4DA4-9279-7495FE10428E"), typeof(uint[]));
     110      // RegisterType(new Guid("7AC4DDAC-0E13-428E-BF49-7BE7B76746CB"), typeof(long[]));
     111      // RegisterType(new Guid("8D9283A7-FE49-4AEA-A09F-D53CF3BE520A"), typeof(ulong[]));
     112      // RegisterType(new Guid("BB9CFA0B-DD29-4C44-85C6-3A6289C55448"), typeof(float[]));
     113      // RegisterType(new Guid("3B3AA69E-1641-4202-AE1D-7EEFF60FA355"), typeof(double[]));
     114      // RegisterType(new Guid("7DF325A6-2553-4915-B7C6-D98191107CB7"), typeof(string[]));
     115      RegisterType(new Guid("DB2A785C-5803-42C7-A01F-E1FD845A83A1"), typeof(List<>));
     116      RegisterType(new Guid("EB98A564-BEDC-458A-9E9B-4BF3CDAFB9BE"), typeof(Stack<>));
     117      RegisterType(new Guid("D5E3118B-957A-43B5-A740-1BBAA0EAB666"), typeof(Stack));
     118      RegisterType(new Guid("8CBC5F9F-5671-4805-A690-DD034AEB7932"), typeof(ArrayList));
     119      RegisterType(new Guid("80CAB5BF-06C2-4DB2-9CF0-EE6E93D40B30"), typeof(Queue));
     120      RegisterType(new Guid("C528E123-F3DD-4711-83E2-A26E2A9A85E9"), typeof(Queue<>));
     121      RegisterType(new Guid("7E2F3277-7216-4295-A498-9ACA43527D5B"), typeof(HashSet<>));
     122      RegisterType(new Guid("E92C35AD-32B1-4F37-B8D2-BE2F5FEB465B"), typeof(Dictionary<,>));
     123
     124      var allTypes = new Dictionary<string, Type>(5000);
     125      foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) {
     126        if (asm.FullName == "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") {
     127          foreach (var t in asm.GetTypes()) {
     128            if (typeof(IEqualityComparer).IsAssignableFrom(t))
     129              allTypes.Add(t.FullName, t);
     130
     131            else if (typeof(IEqualityComparer<>).IsAssignableFrom(t))
     132              allTypes.Add(t.FullName, t);
     133          }
     134        } else {
     135          foreach (var t in asm.GetTypes()) {
     136            if (StorableTypeAttribute.IsStorableType(t)) {
     137              RegisterType(StorableTypeAttribute.GetStorableTypeAttribute(t).Guid, t);
     138            }
     139          }
     140        }
     141      }
     142      RegisterType(new Guid("67C35B3B-DC23-4929-9BA9-0A0CD5FE17F5"), allTypes["System.StringComparer"]);
     143      RegisterType(new Guid("C7FDE8F0-EF3F-4A4D-8D87-5559C32A8B90"), allTypes["System.CultureAwareComparer"]);
     144      RegisterType(new Guid("4AF3A1F6-49CD-4172-8394-FE464889250E"), allTypes["System.CultureAwareRandomizedComparer"]);
     145      RegisterType(new Guid("6A80741F-066D-460B-B333-4F766A4D4AEF"), allTypes["System.OrdinalComparer"]);
     146      RegisterType(new Guid("4C7F657C-B69E-4D1A-8812-3254D6219FD2"), allTypes["System.OrdinalRandomizedComparer"]);
     147      RegisterType(new Guid("0549A3DF-1FD4-487A-B06B-8C572DFFFBEB"), allTypes["System.Security.PermissionTokenKeyComparer"]);
     148      RegisterType(new Guid("94BB9853-8D25-4DD8-A915-FEF2EFF538BC"), allTypes["System.Resources.FastResourceComparer"]);
     149      RegisterType(new Guid("65D2DE74-8BDF-4C74-9005-81A2C3991DC5"), allTypes["System.Collections.CompatibleComparer"]);
     150      RegisterType(new Guid("075827F4-07D9-4E50-9D00-C9FF3E7DCF9A"), allTypes["System.Collections.IEqualityComparer"]);
     151      RegisterType(new Guid("3DA30D50-2337-4487-AECD-F2DB3ECED834"), allTypes["System.Collections.StructuralEqualityComparer"]);
     152      RegisterType(new Guid("C8BF5C03-1614-46AC-8730-2F231CAD4232"), allTypes["System.Collections.Generic.EqualityComparer`1"]);
     153      RegisterType(new Guid("FB247FE0-9203-4196-B4D3-71AB18CD12C5"), allTypes["System.Collections.Generic.GenericEqualityComparer`1"]);
     154      RegisterType(new Guid("06443E04-FB1D-41E1-BAE2-1AB3728BDCC9"), allTypes["System.Collections.Generic.NullableEqualityComparer`1"]);
     155      RegisterType(new Guid("D9029E74-C511-4D28-B8C5-D0E299EC45A5"), allTypes["System.Collections.Generic.ObjectEqualityComparer`1"]);
     156      RegisterType(new Guid("C6D867E2-3CD2-4C59-8BA6-F18F00DDB997"), allTypes["System.Collections.Generic.ByteEqualityComparer"]);
     157      RegisterType(new Guid("02F8D180-BABE-4073-82E0-7FE77814F53D"), allTypes["System.Collections.Generic.EnumEqualityComparer`1"]);
     158      RegisterType(new Guid("8A19DA46-FE80-4776-9DB4-B17E6182D104"), allTypes["System.Collections.Generic.SByteEnumEqualityComparer`1"]);
     159      RegisterType(new Guid("F6F6EFB9-B631-4ACC-9326-F492A6A63011"), allTypes["System.Collections.Generic.ShortEnumEqualityComparer`1"]);
     160      RegisterType(new Guid("D3D279FE-169E-46B6-93AE-589BB4F24A4D"), allTypes["System.Collections.Generic.LongEnumEqualityComparer`1"]);
     161      RegisterType(new Guid("BA0AB604-C052-4E08-8F9E-A5D8098F16A6"), allTypes["System.Collections.Generic.RandomizedStringEqualityComparer"]);
     162      RegisterType(new Guid("00C8C940-63D9-43FF-99BA-9C69301BF043"), allTypes["System.Collections.Generic.RandomizedObjectEqualityComparer"]);
     163      RegisterType(new Guid("DAF22757-7FCC-49AC-B148-F3DD7E9E0A3B"), allTypes["System.Collections.Generic.IEqualityComparer`1"]);
     164
    168165
    169166      //var registeredTypes = type2Guid.Keys.ToArray();
    … …  
    198195    }
    199196
    200     //private void AddBaseTypesRec(Type t) {
     197    //private void AddBaseTypesRec(MemberSelection t) {
    201198    //  foreach (var interfaceType in t.GetInterfaces()) {
    202199    //    RegisterTypeAndFullName(interfaceType);
    … …  
    215212      }
    216213    }
    217     //    public void RegisterType(Guid guid, Type type) {
    218     //      lock (locker) {
    219     //        guid2Type.Add(guid, type);
    220     //        type2Guid.Add(type, guid);
    221     //      }
    222     //    }
    223     //public void RegisterTypeAndFullName(Type type) {
     214    public void RegisterType(Guid guid, Type type) {
     215      lock (locker) {
     216        guid2Type.Add(guid, type);
     217        type2Guid.Add(type, guid);
     218      }
     219    }
     220    //public void RegisterTypeAndFullName(MemberSelection type) {
    224221    //  lock (locker) {
    225222    //    var key = type.AssemblyQualifiedName ?? type.Name;
    … …  
    242239      return transformer2Guid[transformer];
    243240    }
    244     //public Type GetType(string guid) {
    245     //  return guid2Type[guid];
    246     //}
    247     //public string GetGuid(Type type) {
    248     //  return type2Guid[type];
    249     //}
     241    public Type GetType(Guid guid) {
     242      return guid2Type[guid];
     243    }
     244    public Guid GetGuid(Type type) {
     245      return type2Guid[type];
     246    }
    250247    public TypeInfo GetTypeInfo(Type type) {
    251248      lock (locker) {

  • branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

    r14549 r14711  
    3333    public Type Type { get; private set; }
    3434    public ITransformer Transformer { get; private set; }
    35     public StorableClassAttribute StorableClassAttribute { get; private set; }
     35    public StorableTypeAttribute StorableTypeAttribute { get; private set; }
    3636    public IEnumerable<ComponentInfo> Fields { get; private set; }
    3737    public IEnumerable<ComponentInfo> Properties { get; private set; }
    … …  
    5757    private void Reflect() {
    5858      var type = Type;
    59       StorableClassAttribute = StorableClassAttribute.GetStorableClassAttribute(type);
    60       if (StorableClassAttribute != null) {
     59      StorableTypeAttribute = StorableTypeAttribute.GetStorableTypeAttribute(type);
     60      if (StorableTypeAttribute != null) {
    6161        // traverse type hierarchy from base type to sub types
    6262        Stack<Type> types = new Stack<Type>();
    … …  
    7272        while (types.Count > 0) {
    7373          type = types.Pop();
    74           if (StorableClassAttribute.Type != StorableClassType.AllProperties) {
     74          if (StorableTypeAttribute.MemberSelection != StorableMemberSelection.AllProperties) {
    7575            var fieldInfos = type.GetFields(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic)
    7676                                 .Where(x => !x.Name.StartsWith("<") && !x.Name.EndsWith("k__BackingField")); // exclude backing fields
    77             if (StorableClassAttribute.Type == StorableClassType.MarkedOnly)
     77            if (StorableTypeAttribute.MemberSelection == StorableMemberSelection.MarkedOnly)
    7878              fieldInfos = fieldInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
    7979            foreach (var field in fieldInfos) {
    … …  
    8484          }
    8585
    86           if (StorableClassAttribute.Type != StorableClassType.AllFields) {
     86          if (StorableTypeAttribute.MemberSelection != StorableMemberSelection.AllFields) {
    8787            var propertyInfos = type.GetProperties(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.NonPublic).
    8888                        Where(x => x.GetIndexParameters().Length == 0);  // exclude indexed properties
    89             if (StorableClassAttribute.Type == StorableClassType.MarkedOnly)
     89            if (StorableTypeAttribute.MemberSelection == StorableMemberSelection.MarkedOnly)
    9090              propertyInfos = propertyInfos.Where(x => StorableAttribute.IsStorable(x)).ToArray();
    9191            foreach (var property in propertyInfos) {

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

    r14594 r14711  
    3030  internal sealed class StorableClassBoxTransformer : BoxTransformer<object> {
    3131    public override bool CanTransformType(Type type) {
    32       return StorableClassAttribute.IsStorableClass(type) || type.BaseType != null && CanTransformType(type.BaseType);
     32      return StorableTypeAttribute.IsStorableType(type) && !type.IsValueType || // don't transform structs
     33        type.BaseType != null && CanTransformType(type.BaseType);
    3334    }
    3435

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

    r14594 r14711  
    3232using Google.ProtocolBuffers;
    3333using HeuristicLab.Persistence.Core;
     34using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3435
    3536namespace HeuristicLab.Persistence {
    … …  
    548549      foreach (var t in components) {
    549550        string name = mapper.GetString(t.Key);
    550         MemberInfo[] mis = type.GetMember(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
     551        MemberInfo[] mis = type.GetMember(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);       
    551552        if (mis.Length != 1)
    552553          throw new Exception("ambiguous struct member name " + name);
    553554        MemberInfo mi = mis[0];
     555        if(StorableAttribute.IsStorable(mi))
     556          throw new PersistenceException("Don't use stroable attributes for structs as all fields are serialized automatically.");
    554557        if (mi.MemberType == MemberTypes.Field)
    555558          ((FieldInfo)mi).SetValue(obj, mapper.GetObject(t.Value));
    … …  
    916919        var comparer = propertyInfo.GetValue(value);
    917920        var comparerType = comparer.GetType();
    918         if (Default.CompositeSerializers.Storable.StorableClassAttribute.IsStorableClass(comparerType))
     921        if (Default.CompositeSerializers.Storable.StorableTypeAttribute.IsStorableType(comparerType))
    919922          uIntArrayBox.AddValues(mapper.GetBoxId(comparer));
    920923        else if (comparerType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).Any())
    … …  
    986989
    987990      var comparerType = comparer.GetType();
    988       if (Default.CompositeSerializers.Storable.StorableClassAttribute.IsStorableClass(comparerType))
     991      if (Default.CompositeSerializers.Storable.StorableTypeAttribute.IsStorableType(comparerType))
    989992        dictionaryBox.SetComparerId(mapper.GetBoxId(comparer));
    990993      else if (comparerType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).Any())
Note: See TracChangeset for help on using the changeset viewer.