Changeset 4806

Timestamp:

11/16/10 02:43:21 (14 years ago)

Author:

swagner

Message:

Added storable constructors in HeuristicLab.Persistence plugin (#922)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Auxiliary/TypeName.cs (modified) (1 diff)
• Core/Configuration.cs (modified) (1 diff)
• Core/FormatBase.cs (modified) (1 diff)
• Default/CompositeSerializers/ArraySerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs (modified) (2 diffs)
• Default/CompositeSerializers/DictionarySerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/EnumSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/EnumerableSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/KeyValuePairSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/Number2StringSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/StackSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/Storable/StorableSerializer.cs (modified) (2 diffs)
• Default/CompositeSerializers/StructSerializer.cs (modified) (1 diff)
• Default/CompositeSerializers/TypeSerializer.cs (modified) (1 diff)
• Default/DebugString/DebugString.cs (modified) (1 diff)
• Default/DebugString/DebugStringFormat.cs (modified) (1 diff)
• Default/Xml/XmlFormat.cs (modified) (1 diff)
• Default/Xml/XmlString.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

@@ -96 +96 @@
 
 
-
+    [StorableConstructor]
+    protected TypeName(bool deserializing) { }
     /// <summary>
     /// Initializes a new instance of the <see cref="TypeName"/> class.

trunk/sources/HeuristicLab.Persistence/3.3/Core/Configuration.cs

@@ -50 +50 @@
 
     [StorableConstructor]
-    private Configuration(bool isDeserializing) {
+    protected Configuration(bool isDeserializing) {
       compositeSerializerCache = new Dictionary<Type, ICompositeSerializer>();
       if (isDeserializing)

trunk/sources/HeuristicLab.Persistence/3.3/Core/FormatBase.cs

@@ -37 +37 @@
     /// <value>The format's name.</value>
     public abstract string Name { get; }
-    
+
     /// <summary>
     /// Datatype that describes the atoms used for serialization serialization.
     /// </summary>
     public Type SerialDataType { get { return typeof(SerialDataFormat); } }
+
+    [StorableConstructor]
+    protected FormatBase(bool deserializing) { }
+    protected FormatBase() { }
 
     /// <summary>

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

@@ -30 +30 @@
   [StorableClass]
   internal sealed class ArraySerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private ArraySerializer(bool deserializing) { }
+    public ArraySerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

@@ -80 +80 @@
       }
     }
+
+    [StorableConstructor]
+    private CompactNumberArray2StringSerializer(bool deserializing) { }
+    public CompactNumberArray2StringSerializer() { }
 
     public const int SPLIT_THRESHOLD = 1024 * 1024;
@@ -183 +187 @@
         }
         return a;
-      } catch (InvalidOperationException e) {
+      }
+      catch (InvalidOperationException e) {
         throw new PersistenceException("Insuffictient data to deserialize compact array", e);
-      } catch (InvalidCastException e) {
+      }
+      catch (InvalidCastException e) {
         throw new PersistenceException("Invalid element data during compact array deserialization", e);
       }

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

@@ -32 +32 @@
   [StorableClass]
   internal sealed class DictionarySerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private DictionarySerializer(bool deserializing) { }
+    public DictionarySerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

@@ -30 +30 @@
   [StorableClass]
   internal sealed class EnumSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private EnumSerializer(bool deserializing) { }
+    public EnumSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

@@ -33 +33 @@
   [StorableClass]
   internal sealed class EnumerableSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private EnumerableSerializer(bool deserializing) { }
+    public EnumerableSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

@@ -32 +32 @@
   [StorableClass]
   internal sealed class KeyValuePairSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private KeyValuePairSerializer(bool deserializing) { }
+    public KeyValuePairSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

@@ -42 +42 @@
   [StorableClass]
   public sealed class Number2StringSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private Number2StringSerializer(bool deserializing) { }
+    public Number2StringSerializer() { }
 
     private static readonly Dictionary<Type, IPrimitiveSerializer> numberSerializerMap;

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

@@ -33 +33 @@
   [StorableClass]
   internal sealed class NumberEnumerable2StringSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private NumberEnumerable2StringSerializer(bool deserializing) { }
+    public NumberEnumerable2StringSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

@@ -32 +32 @@
   [StorableClass]
   internal sealed class StackSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private StackSerializer(bool deserializing) { }
+    public StackSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

@@ -47 +47 @@
       hookCache = new Dictionary<HookDesignator, List<StorableReflection.Hook>>();
     }
+    [StorableConstructor]
+    private StorableSerializer(bool deserializing) : this() { }
 
     #region ICompositeSerializer implementation
@@ -129 +131 @@
       try {
         return GetConstructor(type)();
-      } catch (TargetInvocationException x) {
+      }
+      catch (TargetInvocationException x) {
         throw new PersistenceException(
           "Could not instantiate storable object: Encountered exception during constructor call",

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

@@ -31 +31 @@
   [StorableClass]
   internal sealed class StructSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private StructSerializer(bool deserializing) { }
+    public StructSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

@@ -31 +31 @@
   [StorableClass]
   internal sealed class TypeSerializer : ICompositeSerializer {
+
+    [StorableConstructor]
+    private TypeSerializer(bool deserializing) { }
+    public TypeSerializer() { }
 
     public int Priority {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/DebugString.cs

@@ -38 +38 @@
     public string Data { get; set; }
 
+    [StorableConstructor]
+    protected DebugString(bool deserializing) { }
     private DebugString() { }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/DebugStringFormat.cs

@@ -35 +35 @@
     /// <value>The format's name.</value>
     public override string Name { get { return "DebugString"; } }
+
+    [StorableConstructor]
+    protected DebugStringFormat(bool deserializing) : base(deserializing) { }
+    public DebugStringFormat() { }
   }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

@@ -36 +36 @@
     /// <value>The format's name.</value>
     public override string Name { get { return "XML"; } }
+
+    [StorableConstructor]
+    protected XmlFormat(bool deserializing) : base(deserializing) { }
+    public XmlFormat() { }
   }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

@@ -40 +40 @@
     public string Data { get; private set; }
 
+    [StorableConstructor]
+    protected XmlString(bool deserializing) { }
     private XmlString() { }