Changeset 1518

Timestamp:

04/07/09 11:34:49 (16 years ago)

Author:

epitzer

Message:

Make serialization order of array components explicit (in all array decomposers) (#574)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.Test/NewSerializationTest.cs (modified) (2 diffs)
• HeuristicLab.Persistence/Default/Decomposers/ArrayDecomposer.cs (modified) (1 diff)
• HeuristicLab.Persistence/Default/Decomposers/X2StringDecomposer.cs (modified) (1 diff)
• HeuristicLab.Persistence/Default/Xml/Compact/NumberArray2XmlFormatters.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence.Test/NewSerializationTest.cs

@@ -243 +243 @@
     }
 
-    public class Base {
-      [Storable] private int baseInt = 3;      
-    }
-
-    public class Derived: Base {
-      [Storable] private int derivedInt = 5;
+    public static void Test6() {
+      string[,] mDimString = new string[,] {
+        {"ora", "et", "labora"},
+        {"Beten", "und", "Arbeiten"}
+      };
+      XmlGenerator.Serialize(mDimString, "test6.zip");
+      object o = XmlParser.DeSerialize("test6.zip");
+      Console.WriteLine(ViewOnlyGenerator.Serialize(mDimString));
+      Console.WriteLine(ViewOnlyGenerator.Serialize(o));
     }
 
@@ -259 +262 @@
       Test4();
       Test5();
+      Test6();
       //SpeedTest();
       //SpeedTest2();

trunk/sources/HeuristicLab.Persistence/Default/Decomposers/ArrayDecomposer.cs

@@ -15 +15 @@
       Array a = (Array)array;      
       yield return new Tag("rank", a.Rank);
+      int[] lengths = new int[a.Rank];
+      int[] lowerBounds = new int[a.Rank];
       for (int i = 0; i < a.Rank; i++) {
+        lengths[i] = a.GetLength(i);
         yield return new Tag("length_" + i, a.GetLength(i));
       }
       for (int i = 0; i < a.Rank; i++) {
+        lowerBounds[i] = a.GetLowerBound(i);
         yield return new Tag("lowerBound_" + i, a.GetLowerBound(i));
       }
-      foreach (object o in (Array)array) {
-        yield return new Tag(null, o);
+      int[] positions = (int[])lowerBounds.Clone();
+      while (positions[a.Rank - 1] < lengths[a.Rank - 1] + lowerBounds[a.Rank - 1]) {
+        yield return new Tag(a.GetValue(positions));
+        positions[0] += 1;
+        for (int i = 0; i < a.Rank - 1; i++) {
+          if (positions[i] >= lowerBounds[i] + lengths[i]) {
+            positions[i] = lowerBounds[i];
+            positions[i + 1] += 1;
+          } else {
+            break;
+          }
+        }
       }
     }

trunk/sources/HeuristicLab.Persistence/Default/Decomposers/X2StringDecomposer.cs

@@ -111 +111 @@
     public IEnumerable<Tag> DeCompose(object obj) {
       Array a = (Array) obj;
+      int[] lengths = new int[a.Rank];
+      int[] lowerBounds = new int[a.Rank];
       StringBuilder sb = new StringBuilder();
-      sb.Append(a.Rank).Append(';');      
-      for ( int i = 0; i<a.Rank; i++ )
+      sb.Append(a.Rank).Append(';');
+      for (int i = 0; i < a.Rank; i++) {
         sb.Append(a.GetLength(i)).Append(';');
-      for ( int i = 0; i<a.Rank; i++)
+        lengths[i] = a.GetLength(i);
+      }
+      for (int i = 0; i < a.Rank; i++) {
         sb.Append(a.GetLowerBound(i)).Append(';');
-      foreach (var number in a) {        
-        sb.Append(numberDecomposer.Format(number)).Append(';');
+        lowerBounds[i] = a.GetLowerBound(i);
+      }
+      int[] positions = (int[])lowerBounds.Clone();
+      while (positions[a.Rank - 1] < lengths[a.Rank - 1] + lowerBounds[a.Rank - 1]) {
+        sb.Append(numberDecomposer.Format(a.GetValue(positions))).Append(';');
+        positions[0] += 1;
+        for (int i = 0; i < a.Rank - 1; i++) {
+          if (positions[i] >= lengths[i] + lowerBounds[i]) {
+            positions[i] = lowerBounds[i];
+            positions[i + 1] += 1;
+          } else {
+            break;
+          }
+        }
       }
       yield return new Tag("compact array", sb.ToString());

trunk/sources/HeuristicLab.Persistence/Default/Xml/Compact/NumberArray2XmlFormatters.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System;
+using HeuristicLab.Persistence.Default.ViewOnly;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -16 +17 @@
     public object DoFormat(object obj) {
       Array a = (Array)obj;
+      int[] lengths = new int[a.Rank];
+      int[] lowerBounds = new int[a.Rank];
       StringBuilder sb = new StringBuilder();
       sb.Append(a.Rank);
@@ -21 +24 @@
         sb.Append(Separator);
         sb.Append(a.GetLength(i));
+        lengths[i] = a.GetLength(i);
       }
       for (int i = 0; i < a.Rank; i++) {
         sb.Append(Separator);
         sb.Append(a.GetLowerBound(i));
+        lowerBounds[i] = a.GetLowerBound(i);
       }
-      foreach (object o in a) {
+      int[] positions = (int[])lowerBounds.Clone();
+      while (positions[a.Rank - 1] < lengths[a.Rank - 1] + lowerBounds[a.Rank - 1]) {
+        Console.WriteLine(ViewOnlyGenerator.Serialize(positions));
         sb.Append(Separator);
-        sb.Append(formatValue(o));
-      }
+        sb.Append(formatValue(a.GetValue(positions)));
+        positions[0] += 1;
+        for (int i = 0; i < a.Rank - 1; i++) {
+          if (positions[i] >= lengths[i] + lowerBounds[i]) {
+            positions[i] = lowerBounds[i];
+            positions[i + 1] += 1;
+          } else {
+            break;
+          }
+        }
+      }      
       return sb.ToString();
     }