Changeset 3945

Timestamp:

06/24/10 11:17:04 (14 years ago)

Author:

epitzer

Message:

Remove casts in number array serializer and add handling of lower bounds (#1138)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/NumberArray2XmlSerializerBase.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Persistence.Auxiliary;
+using HeuristicLab.Tracing;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -41 +43 @@
       int[] lengths = new int[a.Rank];
       int[] lowerBounds = new int[a.Rank];
-      StringBuilder sb = new StringBuilder(a.Rank * 3);
+      StringBuilder sb = new StringBuilder(3 + a.Rank * 3);
       sb.Append(a.Rank);
-      int capacity = 1;
+      int nElements = 1;
       for (int i = 0; i < a.Rank; i++) {
         sb.Append(Separator);
         sb.Append(a.GetLength(i));
         lengths[i] = a.GetLength(i);
-        capacity *= lengths[i];
-      }
-      sb.EnsureCapacity(capacity * 3);
+        nElements *= lengths[i];
+      }      
+      sb.EnsureCapacity(sb.Length + nElements * 3);
       for (int i = 0; i < a.Rank; i++) {
         sb.Append(Separator);
@@ -69 +71 @@
           }
         }
-      }
+      }      
       return new XmlString(sb.ToString());
     }
@@ -75 +77 @@
     public override T Parse(XmlString x) {
       try {
-        IEnumerator values = x.Data.GetSplitEnumerator(Separator);
+        IEnumerator<string> values = x.Data.GetSplitEnumerator(Separator);
         values.MoveNext();
-        int rank = int.Parse((string)values.Current);
+        int rank = int.Parse(values.Current);
         int[] lengths = new int[rank];
         for (int i = 0; i < rank; i++) {
           values.MoveNext();
-          lengths[i] = int.Parse((string)values.Current);
+          lengths[i] = int.Parse(values.Current);
         }
         int[] lowerBounds = new int[rank];
         for (int i = 0; i < rank; i++) {
           values.MoveNext();
-          lowerBounds[i] = int.Parse((string)values.Current);
+          lowerBounds[i] = int.Parse(values.Current);
         }
         Array a = Array.CreateInstance(this.SourceType.GetElementType(), lengths, lowerBounds);
         int[] positions = (int[])lowerBounds.Clone();
-        while (values.MoveNext()) {
-          a.SetValue(ParseValue((string)values.Current), positions);
+        while (values.MoveNext()) {          
+          a.SetValue(ParseValue(values.Current), positions);
           positions[0] += 1;
           for (int i = 0; i < rank - 1; i++) {
-            if (positions[i] >= lengths[i]) {
-              positions[i] = 0;
+            if (positions[i] >= lowerBounds[i] + lengths[i]) {
+              positions[i] = lowerBounds[i];
               positions[i + 1] += 1;
             } else {