Changeset 3937 for trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact

Timestamp:

06/21/10 18:46:04 (14 years ago)

Author:

epitzer

Message:

Estimate or calculate StringBuffer sizes in advance, use iterator over string splits instead of arrays. (#1138)

Location:

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

Files:

• DoubleList2XmlSerializer.cs (modified) (3 diffs)
• NumberArray2XmlSerializerBase.cs (modified) (4 diffs)
• NumberEnumeration2XmlSerializerBase.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.Xml.Primitive;
 using System.Text;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -32 +33 @@
   internal sealed class DoubleList2XmlSerializer : CompactXmlSerializerBase<List<double>> {
 
-    private static readonly char[] separators = new char[] { ';' };
-
     public override XmlString Format(List<double> list) {
-      StringBuilder sb = new StringBuilder();
+      StringBuilder sb = new StringBuilder(list.Count * 3);
       foreach (var d in list) {
         sb.Append(Double2XmlSerializer.FormatG17(d)).Append(';');
@@ -44 +43 @@
     public override List<double> Parse(XmlString data) {
       try {
-        var values = data.Data.Split(separators, StringSplitOptions.RemoveEmptyEntries);
-        List<double> list = new List<double>(values.Length);
-        foreach (var value in values) {
+        List<double> list = new List<double>();
+        foreach (var value in data.Data.EnumerateSplit(';')) {
           list.Add(Double2XmlSerializer.ParseG17(value));
         }

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

@@ -26 +26 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -32 +33 @@
   internal abstract class NumberArray2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : class {
 
-    protected virtual string Separator { get { return ";"; } }
+    protected virtual char Separator { get { return ';'; } }
     protected abstract string FormatValue(object o);
     protected abstract object ParseValue(string o);
@@ -40 +41 @@
       int[] lengths = new int[a.Rank];
       int[] lowerBounds = new int[a.Rank];
-      StringBuilder sb = new StringBuilder();
+      StringBuilder sb = new StringBuilder(a.Rank * 3);
       sb.Append(a.Rank);
+      int capacity = 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);
       for (int i = 0; i < a.Rank; i++) {
         sb.Append(Separator);
@@ -71 +75 @@
     public override T Parse(XmlString x) {
       try {
-        IEnumerator values =
-          x.Data.Split(new[] { Separator },
-          StringSplitOptions.RemoveEmptyEntries).GetEnumerator();
+        IEnumerator values = x.Data.GetSplitEnumerator(Separator);
         values.MoveNext();
         int rank = int.Parse((string)values.Current);

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

@@ -26 +26 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -32 +33 @@
   internal abstract class NumberEnumeration2XmlSerializerBase<T> : CompactXmlSerializerBase<T> where T : IEnumerable {
 
-    protected virtual string Separator { get { return ";"; } }
+    protected virtual char Separator { get { return ';'; } }
     protected abstract void Add(IEnumerable enumeration, object o);
     protected abstract IEnumerable Instantiate();
@@ -50 +51 @@
       try {
         IEnumerable enumeration = Instantiate();
-        string[] values = x.Data.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
-        foreach (var value in values) {
+        foreach (var value in x.Data.EnumerateSplit(Separator)) {
           Add(enumeration, ParseValue(value));
         }