Changeset 1313 for branches/New Persistence Exploration/Persistence

Timestamp:

03/09/09 12:42:49 (16 years ago)

Author:

epitzer

Message:

Serialization of multi dimensional arrays. (#506)

File:

• branches/New Persistence Exploration/Persistence/Persistence/CompoundSerializers.cs (modified) (2 diffs)

branches/New Persistence Exploration/Persistence/Persistence/CompoundSerializers.cs

@@ -38 +38 @@
   public class ArraySerializer : ICustomSerializer {
 
-    public bool CanSerialize(Type type) {
+    public bool CanSerialize(Type type) {      
       return type.IsArray;
     }
 
     public IEnumerable Serialize(object array) {
+      Array a = (Array)array;
+      yield return a.Rank;
+      for (int i = 0; i < a.Rank; i++) {
+        yield return a.GetLength(i);
+      }
       foreach (object o in (Array)array) {
         yield return o;
@@ -49 +54 @@
 
     public object DeSerialize(IEnumerable elements, Type t) {
-      List<object> allElements = new List<object>();
-      foreach (object obj in elements) {
-        allElements.Add(obj);
+      IEnumerator e = elements.GetEnumerator();
+      e.MoveNext();
+      int rank = (int)e.Current;
+      int[] lengths = new int[rank];
+      for (int i = 0; i < rank; i++) {
+        e.MoveNext();
+        lengths[i] = (int)e.Current;
       }
-      Array array =
-        Array.CreateInstance(t.GetElementType(), allElements.Count);
-      for (int i = 0; i < array.Length; i++) {
-        array.SetValue(allElements[i], i);
+      Array a = Array.CreateInstance(t.GetElementType(), lengths);      
+      int[] positions = new int[rank];
+      while (e.MoveNext()) {
+        a.SetValue(e.Current, positions);
+        positions[0] += 1;
+        for (int i = 0; i < rank-1; i++) {
+          if (positions[i] >= lengths[i]) {
+            positions[i] = 0;
+            positions[i + 1] += 1;
+          } else {
+            break;
+          }
+        }
       }
-      return array;
+      return a;
     }