Changeset 13367 for branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core

Timestamp:

11/24/15 16:59:57 (9 years ago)

Author:

swagner

Message:

#2520: Worked on new persistence implementation

Location:

branches/PersistenceOverhaul/HeuristicLab.Persistence/4.0/Core

Files:

• ProtoBufSerializer.cs (modified) (1 diff)
• StaticCache.cs (modified) (5 diffs)
• Transformer.cs (modified) (1 diff)
• TransformerAttribute.cs (modified) (2 diffs)

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

@@ -29 +29 @@
 
     protected override Bundle DeserializeBundle(Stream stream) {
-      return Bundle.ParseFrom(stream);
+      return Bundle.ParseFrom(stream, Mapper.StaticCache.GetExtensionRegistry());
     }
   }

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

@@ -36 +36 @@
     private Dictionary<Type, Guid> type2Guid;
     private Dictionary<Type, TypeInfo> typeInfos;
+    private ExtensionRegistry extensionRegistry;
 
     internal StaticCache() {
@@ -47 +48 @@
         type2Guid = new Dictionary<Type, Guid>();
         typeInfos = new Dictionary<Type, TypeInfo>();
+        extensionRegistry = ExtensionRegistry.CreateInstance();
 
-        foreach (var transformer in ApplicationManager.Manager.GetInstances<ITransformer>().OrderBy(x => x.Order)) {
+        foreach (var transformer in ApplicationManager.Manager.GetInstances<ITransformer>().OrderBy(x => x.Priority)) {
           guid2Transformer.Add(transformer.Guid, transformer);
           transformer2Guid.Add(transformer, transformer.Guid);
@@ -71 +73 @@
             RegisterType(StorableClassAttribute.GetStorableClassAttribute(t).Guid, t);
         }
+
+        RegisterExtension(BoolBox.Bool);
+        RegisterExtension(IntBox.Int);
+        RegisterExtension(LongBox.Long);
+        RegisterExtension(UnsignedIntBox.UnsignedInt);
+        RegisterExtension(UnsignedLongBox.UnsignedLong);
+        RegisterExtension(FloatBox.Float);
+        RegisterExtension(DoubleBox.Double);
+        RegisterExtension(StringBox.String);
+        RegisterExtension(BytesBox.Bytes);
+        RegisterExtension(BoolArrayBox.BoolArray);
+        RegisterExtension(IntArrayBox.IntArray);
+        RegisterExtension(MatrixBox.Matrix);
+        RegisterExtension(BoolMatrixBox.BoolMatrix);
+        RegisterExtension(IntMatrixBox.IntMatrix);
+        RegisterExtension(DictionaryBox.Dictionary);
       }
     }
@@ -79 +97 @@
         type2Guid.Add(type, guid);
       }
+    }
+    public void RegisterExtension<TExtension>(GeneratedExtensionBase<TExtension> extension) {
+      extensionRegistry.Add(extension);
     }
 
@@ -104 +125 @@
       }
     }
+    public ExtensionRegistry GetExtensionRegistry() {
+      return extensionRegistry;
+    }
   }
 }

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

@@ -25 +25 @@
   public abstract class Transformer : ITransformer {
     public Guid Guid { get; private set; }
-    public uint Id { get; private set; }
-    public uint Order { get; private set; }
+    public uint Priority { get; private set; }
 
     protected Transformer() {
       Guid = TransformerAttribute.GetGuid(this.GetType());
-      Order = TransformerAttribute.GetOrder(this.GetType());
-      Id = 0;
-    }
-
-    public void Initialize(uint id) {
-      Id = id;
+      Priority = TransformerAttribute.GetPriority(this.GetType());
     }
 

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

@@ -26 +26 @@
   public sealed class TransformerAttribute : Attribute {
     public Guid Guid { get; private set; }
-    public uint Order { get; private set; }
+    public uint Priority { get; private set; }
 
-    public TransformerAttribute(string guid, uint order) {
+    public TransformerAttribute(string guid, uint priority) {
       Guid = new Guid(guid);
-      Order = order;
+      Priority = priority;
     }
 
@@ -42 +42 @@
       return GetTransformerAttribute(type).Guid;
     }
-    public static uint GetOrder(Type type) {
-      return GetTransformerAttribute(type).Order;
+    public static uint GetPriority(Type type) {
+      return GetTransformerAttribute(type).Priority;
     }
   }