Changeset 1958 for trunk/sources/HeuristicLab.Persistence

Timestamp:

05/29/09 14:56:51 (15 years ago)

Author:

epitzer

Message:

Updated handling of floating and fixed point numbers, faster and more accurate serialization and parsing. (#646)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/Xml/Compact/DoubleArray2XmlSerializer.cs (modified) (2 diffs)
• Default/Xml/Compact/DoubleList2XmlSerializer.cs (modified) (2 diffs)
• Default/Xml/Primitive/Decimal2XmlSerializer.cs (modified) (1 diff)
• Default/Xml/Primitive/DecimalNumber2XmlSerializerBase.cs (deleted)
• Default/Xml/Primitive/Double2XmlSerializer.cs (modified) (1 diff)
• Default/Xml/Primitive/Float2XmlSerializer.cs (modified) (1 diff)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)

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

@@ -1 +1 @@
 using System;
 using HeuristicLab.Persistence.Core;
-using System.Globalization;
+using HeuristicLab.Persistence.Default.Xml.Primitive;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -8 +8 @@
 
     protected override string FormatValue(object o) {
-      return ((double)o).ToString("r", CultureInfo.InvariantCulture);
+      return Double2XmlSerializer.FormatG17((double)o);
     }
 
     protected override object ParseValue(string o) {
-      if (o == CultureInfo.InvariantCulture.NumberFormat.NaNSymbol)
-        return double.NaN;
-      return double.Parse(o, CultureInfo.InvariantCulture);
+      return Double2XmlSerializer.ParseG17(o);
     }
   }

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

@@ -3 +3 @@
 using System;
 using HeuristicLab.Persistence.Core;
-using System.Globalization;
+using HeuristicLab.Persistence.Default.Xml.Primitive;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {
@@ -18 +18 @@
 
     protected override string FormatValue(object o) {
-      return ((double)o).ToString("r", CultureInfo.InvariantCulture);
+      return Double2XmlSerializer.FormatG17((double)o);
     }
 
     protected override object ParseValue(string o) {
-      if (o == CultureInfo.InvariantCulture.NumberFormat.NaNSymbol)
-        return double.NaN;
-      return double.Parse(o, CultureInfo.InvariantCulture);
+      return Double2XmlSerializer.ParseG17(o);
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Decimal2XmlSerializer.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
 
-  public class Decimal2XmlSerializer : DecimalNumber2XmlSerializerBase<decimal> { }
+  public class Decimal2XmlSerializer : PrimitiveXmlSerializerBase<decimal> {
 
+    public static decimal ParseG30(string s) {
+      decimal d;
+      if (decimal.TryParse(s,
+        NumberStyles.AllowDecimalPoint |
+        NumberStyles.AllowExponent |
+        NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out d))
+        return d;
+      throw new FormatException(
+        String.Format("Invalid decimal G30 number format \"{0}\" could not be parsed", s));
+    }
+
+    public static string FormatG30(decimal d) {
+      return d.ToString("g30", CultureInfo.InvariantCulture);
+    }
+
+    public override XmlString Format(decimal d) {
+      return new XmlString(FormatG30(d));
+    }
+
+    public override decimal Parse(XmlString t) {
+      return ParseG30(t.Data);
+    }
+  }
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Double2XmlSerializer.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
 
-  public class Double2XmlSerializer : DecimalNumber2XmlSerializerBase<double> { }
+  public class Double2XmlSerializer : PrimitiveXmlSerializerBase<double> {
+
+    public static double ParseG17(string s) {
+      double d;
+      if (double.TryParse(s,
+        NumberStyles.AllowDecimalPoint |
+        NumberStyles.AllowExponent |
+        NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out d))
+        return d;
+      throw new FormatException(
+        String.Format("Invalid G17 number format \"{0}\" could not be parsed", s));
+    }
+
+    public static string FormatG17(double d) {
+      return d.ToString("g17", CultureInfo.InvariantCulture);
+    }
+
+    public override XmlString Format(double d) {
+      return new XmlString(FormatG17(d));
+    }
+
+    public override double Parse(XmlString t) {
+      return ParseG17(t.Data);
+    }
+  }
+
+  
+  
 
 }

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Float2XmlSerializer.cs

@@ -7 +7 @@
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {
 
-  public class Float2XmlSerializer : DecimalNumber2XmlSerializerBase<float> { }
+  public class Float2XmlSerializer : PrimitiveXmlSerializerBase<float> {
 
+    public static float ParseG8(string s) {
+      float f;
+      if (float.TryParse(s,
+        NumberStyles.AllowDecimalPoint |
+        NumberStyles.AllowExponent |
+        NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out f))
+        return f;
+      throw new FormatException(
+        String.Format("Invalid float G8 number format \"{0}\" could not be parsed", s));
+    }
+
+    public static string FormatG8(float f) {
+      return f.ToString("g8", CultureInfo.InvariantCulture);
+    }
+
+    public override XmlString Format(float f) {
+      return new XmlString(FormatG8(f));
+    }
+
+    public override float Parse(XmlString t) {
+      return ParseG8(t.Data);
+    }
+  }
 }

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -151 +151 @@
     <Compile Include="Default\Xml\Primitive\DateTime2XmlSerializer.cs" />
     <Compile Include="Default\Xml\Primitive\Decimal2XmlSerializer.cs" />
-    <Compile Include="Default\Xml\Primitive\DecimalNumber2XmlSerializerBase.cs" />
     <Compile Include="Default\Xml\Primitive\Double2XmlSerializer.cs" />
     <Compile Include="Default\Xml\Primitive\Float2XmlSerializer.cs" />