Changeset 1463

Timestamp:

03/30/09 12:51:34 (15 years ago)

Author:

epitzer

Message:

Properly fill arrays with non-zero lower bounds (#561)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.Test/NewSerializationTest.cs (modified) (2 diffs)
• HeuristicLab.Persistence/Default/Decomposers/ArrayDecomposer.cs (modified) (2 diffs)

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

@@ -188 +188 @@
 
     public static void Test4() {
-      ArrayList[] arrayListArray = new ArrayList[3];
+      ArrayList[] arrayListArray = new ArrayList[4];
       arrayListArray[0] = new ArrayList();
       arrayListArray[0].Add(arrayListArray);
@@ -197 +197 @@
       arrayListArray[2].Add(arrayListArray);
       arrayListArray[2].Add(arrayListArray);
+      Array a = Array.CreateInstance(
+                              typeof(object),
+                              new[] { 1, 2 }, new[] { 3, 4 });
+      arrayListArray[2].Add(a);
       XmlGenerator.Serialize(arrayListArray, "test4");
       object o = XmlParser.DeSerialize("test4");

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

@@ -43 +43 @@
         e.MoveNext();
         lowerBounds[i] = (int)e.Current.Value;
-      }
-      Array a = Array.CreateInstance(t.GetElementType(), lengths, lowerBounds);      
-      int[] positions = new int[rank];
+      }      
+      Array a = Array.CreateInstance(t.GetElementType(), lengths, lowerBounds);
+      int[] positions = (int[])lowerBounds.Clone();
       while (e.MoveNext()) {
         int[] currentPositions = positions;
@@ -51 +51 @@
         positions[0] += 1;
         for (int i = 0; i < rank-1; i++) {
-          if (positions[i] >= lengths[i]) {
-            positions[i] = 0;
+          if (positions[i] >= lengths[i]+lowerBounds[i]) {
+            positions[i] = lowerBounds[i];
             positions[i + 1] += 1;
           } else {