Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers

Timestamp:

07/18/14 12:35:00 (11 years ago)

Author:

ascheibe

Message:

reverted last commit

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ConcreteDictionarySerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs (modified) (5 diffs)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableAttribute.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAttribute.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassType.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableConstructorAttribute.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (14 diffs)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs (modified) (1 diff)

branches/HiveStatistics/sources

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ConcreteDictionarySerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -78 +78 @@
     /// </returns>
     public bool CanSerialize(Type type) {
-      return numberSerializerMap.ContainsKey(Nullable.GetUnderlyingType(type) ?? type);
+      return numberSerializerMap.ContainsKey(type);
     }
 
@@ -90 +90 @@
     /// </returns>
     public string JustifyRejection(Type type) {
-      return string.Format("not a (nullable) number type (one of {0})",
+      return string.Format("not a number type (one of {0})",
         string.Join(", ", numberSerializers.Select(n => n.SourceType.Name).ToArray()));
     }
@@ -100 +100 @@
     /// <returns></returns>
     public string Format(object obj) {
-      if (obj == null) return "null";
-      Type type = obj.GetType();
-      return ((XmlString)numberSerializerMap[Nullable.GetUnderlyingType(type) ?? type].Format(obj)).Data;
+      return ((XmlString)numberSerializerMap[obj.GetType()].Format(obj)).Data;
     }
 
@@ -112 +110 @@
     /// <returns></returns>
     public object Parse(string stringValue, Type type) {
-      if (stringValue == "null") return null;
       try {
-        return numberSerializerMap[Nullable.GetUnderlyingType(type) ?? type].Parse(new XmlString(stringValue));
+        return numberSerializerMap[type].Parse(new XmlString(stringValue));
       }
       catch (FormatException e) {

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableClassType.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableConstructorAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableMemberInfo.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableReflection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -47 +47 @@
       hookCache = new Dictionary<HookDesignator, List<StorableReflection.Hook>>();
     }
-
     [StorableConstructor]
     private StorableSerializer(bool deserializing) : this() { }
@@ -69 +68 @@
     /// </returns>
     public bool CanSerialize(Type type) {
-      var markedStorable = StorableReflection.HasStorableClassAttribute(type);
+      bool markedStorable = StorableReflection.HasStorableClassAttribute(type);
       if (GetConstructor(type) == null)
         if (markedStorable)
@@ -92 +91 @@
     /// </returns>
     public string JustifyRejection(Type type) {
-      var sb = new StringBuilder();
+      StringBuilder sb = new StringBuilder();
       if (GetConstructor(type) == null)
         sb.Append("class has no default constructor and no [StorableConstructor]");
@@ -118 +117 @@
     /// <returns>An enumerable of <see cref="Tag"/>s.</returns>
     public IEnumerable<Tag> Decompose(object obj) {
-      return from accessor in GetStorableAccessors(obj.GetType())
-             where accessor.Get != null
-             select new Tag(accessor.Name, accessor.Get(obj));
+      foreach (var accessor in GetStorableAccessors(obj.GetType())) {
+        if (accessor.Get != null)
+          yield return new Tag(accessor.Name, accessor.Get(obj));
+      }
     }
 
@@ -147 +147 @@
     public void Populate(object instance, IEnumerable<Tag> objects, Type type) {
       var memberDict = new Dictionary<string, Tag>();
-      var iter = objects.GetEnumerator();
+      IEnumerator<Tag> iter = objects.GetEnumerator();
       while (iter.MoveNext()) {
         memberDict.Add(iter.Current.Name, iter.Current);
@@ -170 +170 @@
       BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
-    private sealed class HookDesignator : Tuple<Type, HookType> {
-      public HookDesignator(Type type, HookType hookType) : base(type, hookType) { }
+    private static readonly object[] emptyArgs = new object[] { };
+    private static readonly object[] trueArgs = new object[] { true };
+
+    private sealed class HookDesignator {
+      public Type Type { get; private set; }
+      public HookType HookType { get; private set; }
+      public HookDesignator() { }
+      public HookDesignator(Type type, HookType hookType) {
+        Type = type;
+        HookType = HookType;
+      }
     }
 
@@ -182 +191 @@
     #region caches
 
-    private readonly AccessorListCache accessorListCache;
-    private readonly AccessorCache accessorCache;
-    private readonly Dictionary<Type, Constructor> constructorCache;
-    private readonly Dictionary<HookDesignator, List<StorableReflection.Hook>> hookCache;
+    private AccessorListCache accessorListCache;
+    private AccessorCache accessorCache;
+    private Dictionary<Type, Constructor> constructorCache;
+    private Dictionary<HookDesignator, List<StorableReflection.Hook>> hookCache;
 
     #endregion
@@ -197 +206 @@
         var storableMembers = StorableReflection
           .GenerateStorableMembers(type)
-          .Select(GetMemberAccessor)
-          .ToList();
+          .Select(mi => GetMemberAccessor(mi));
         accessorListCache[type] = storableMembers;
         return storableMembers;
@@ -208 +216 @@
         if (accessorCache.ContainsKey(mi.MemberInfo))
           return new DataMemberAccessor(accessorCache[mi.MemberInfo], mi.DisentangledName, mi.DefaultValue);
-        var dma = new DataMemberAccessor(mi.MemberInfo, mi.DisentangledName, mi.DefaultValue);
+        DataMemberAccessor dma = new DataMemberAccessor(mi.MemberInfo, mi.DisentangledName, mi.DefaultValue);
         accessorCache[mi.MemberInfo] = dma;
         return dma;
@@ -218 +226 @@
         if (constructorCache.ContainsKey(type))
           return constructorCache[type];
-        var c = FindStorableConstructor(type) ?? GetDefaultConstructor(type);
+        Constructor c = FindStorableConstructor(type) ?? GetDefaultConstructor(type);
         constructorCache.Add(type, c);
         return c;
@@ -225 +233 @@
 
     private Constructor GetDefaultConstructor(Type type) {
-      var ci = type.GetConstructor(ALL_CONSTRUCTORS, null, Type.EmptyTypes, null);
+      ConstructorInfo ci = type.GetConstructor(ALL_CONSTRUCTORS, null, Type.EmptyTypes, null);
       if (ci == null)
         return null;
-      var dm = new DynamicMethod("", typeof(object), null, type, true);
-      var ilgen = dm.GetILGenerator();
+      DynamicMethod dm = new DynamicMethod("", typeof(object), null, type, true);
+      ILGenerator ilgen = dm.GetILGenerator();
       ilgen.Emit(OpCodes.Newobj, ci);
       ilgen.Emit(OpCodes.Ret);
@@ -236 +244 @@
 
     private Constructor FindStorableConstructor(Type type) {
-      foreach (var ci in type
-        .GetConstructors(ALL_CONSTRUCTORS)
-        .Where(ci => ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0)) {
-        if (ci.GetParameters().Length != 1 ||
-            ci.GetParameters()[0].ParameterType != typeof(bool))
-          throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
-        var dm = new DynamicMethod("", typeof(object), null, type, true);
-        var ilgen = dm.GetILGenerator();
-        ilgen.Emit(OpCodes.Ldc_I4_1); // load true
-        ilgen.Emit(OpCodes.Newobj, ci);
-        ilgen.Emit(OpCodes.Ret);
-        return (Constructor)dm.CreateDelegate(typeof(Constructor));
+      foreach (ConstructorInfo ci in type.GetConstructors(ALL_CONSTRUCTORS)) {
+        if (ci.GetCustomAttributes(typeof(StorableConstructorAttribute), false).Length > 0) {
+          if (ci.GetParameters().Length != 1 ||
+              ci.GetParameters()[0].ParameterType != typeof(bool))
+            throw new PersistenceException("StorableConstructor must have exactly one argument of type bool");
+          DynamicMethod dm = new DynamicMethod("", typeof(object), null, type, true);
+          ILGenerator ilgen = dm.GetILGenerator();
+          ilgen.Emit(OpCodes.Ldc_I4_1); // load true
+          ilgen.Emit(OpCodes.Newobj, ci);
+          ilgen.Emit(OpCodes.Ret);
+          return (Constructor)dm.CreateDelegate(typeof(Constructor));
+        }
       }
       return null;
@@ -254 +262 @@
     private void InvokeHook(HookType hookType, object obj) {
       if (obj == null)
-        throw new ArgumentNullException("obj");
-      foreach (var hook in GetHooks(hookType, obj.GetType())) {
+        throw new ArgumentNullException("Cannot invoke hooks on null");
+      foreach (StorableReflection.Hook hook in GetHooks(hookType, obj.GetType())) {
         hook(obj);
       }

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll