Changeset 16396

Timestamp:

12/18/18 17:07:52 (5 years ago)

Author:

jkarder

Message:

#2520: worked on new persistence

• improved EnumerableBoxTransformer
• fixed output path

Location:

branches/PersistenceReintegration

Files:

• HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/3.5.0/HeuristicLab.ProtobufCS/HeuristicLab.Protobuf-3.5.0.csproj (modified) (1 diff)
• HeuristicLab.Persistence/4.0/Transformers/Transformers.cs (modified) (2 diffs)

branches/PersistenceReintegration/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/3.5.0/HeuristicLab.ProtobufCS/HeuristicLab.Protobuf-3.5.0.csproj

@@ -25 +25 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Transformers/Transformers.cs

@@ -436 +436 @@
       }
 
-      foreach (var item in (IEnumerable)value)
-        uints.Add(mapper.GetBoxId(item));
+      if (type.IsGenericType) {
+        var genericType = type.GetGenericArguments().Single();
+        if (genericType.IsPrimitive) {
+          if (genericType == typeof(bool)) {
+          } else if (genericType == typeof(bool)) {
+            box.Bools.AddRange(((IEnumerable<bool>)value).ToArray());
+          } else if (genericType == typeof(int)) {
+            box.Ints.AddRange(((IEnumerable<int>)value).ToArray());
+          } else if (genericType == typeof(uint)) {
+            box.UInts.AddRange(((IEnumerable<uint>)value).ToArray());
+          } else if (genericType == typeof(long)) {
+            box.Longs.AddRange(((IEnumerable<long>)value).ToArray());
+          } else if (genericType == typeof(ulong)) {
+            box.ULongs.AddRange(((IEnumerable<ulong>)value).ToArray());
+          } else if (genericType == typeof(float)) {
+            box.Floats.AddRange(((IEnumerable<float>)value).ToArray());
+          } else if (genericType == typeof(double)) {
+            box.Doubles.AddRange(((IEnumerable<double>)value).ToArray());
+          } else if (genericType == typeof(byte)) {
+            box.Bytes = ByteString.CopyFrom(((IEnumerable<byte>)value).ToArray());
+          } else {
+            foreach (var item in (IEnumerable)value)
+              uints.Add(mapper.GetBoxId(item));
+          }
+        } else {
+          foreach (var item in (IEnumerable)value)
+            uints.Add(mapper.GetBoxId(item));
+        }
+      } else {
+        foreach (var item in (IEnumerable)value)
+          uints.Add(mapper.GetBoxId(item));
+      }
     }
 
@@ -446 +476 @@
     public override void FillFromBox(object obj, Box box, Mapper mapper) {
       var uints = box.UInts;
-      var elements = uints.Select(mapper.GetObject);
+
+      List<object> elements = null;
+
       var type = obj.GetType();
-
+      if (type.IsGenericType) {
+        var genericType = type.GetGenericArguments().Single();
+        if (genericType.IsPrimitive) {
+          if (genericType == typeof(bool)) {
+          } else if (genericType == typeof(bool)) {
+            elements = box.Bools.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(int)) {
+            elements = box.Ints.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(uint)) {
+            elements = box.UInts.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(long)) {
+            elements = box.Longs.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(ulong)) {
+            elements = box.ULongs.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(float)) {
+            elements = box.Floats.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(double)) {
+            elements = box.Doubles.Select(x => (object)x).ToList();
+          } else if (genericType == typeof(byte)) {
+            elements = box.Bytes.Select(x => (object)x).ToList();
+          } else {
+            elements = uints.Select(mapper.GetObject).ToList();
+          }
+        } else elements = uints.Select(mapper.GetObject).ToList();
+      } else elements = uints.Select(mapper.GetObject).ToList();
       string methodName = string.Empty;
       if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Stack<>) || type == typeof(Stack)) {
-        elements = elements.Reverse();
+        elements.Reverse();
         methodName = "Push";
       } else if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Queue<>) || type == typeof(Queue)) {