Changeset 3811

Timestamp:

05/14/10 21:23:51 (15 years ago)

Author:

epitzer

Message:

correct and speed-up serialization for number enumerables (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/CompositeSerializers/Number2StringSerializer.cs (modified) (6 diffs)
• Tests/UseCases.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

@@ -30 +30 @@
 using System.Text;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Default.Xml.Primitive;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Persistence.Default.CompositeSerializers {
@@ -44 +46 @@
   public sealed class Number2StringSerializer : ICompositeSerializer {
 
-    private static readonly List<Type> numberTypes =
-      new List<Type> {
-        typeof(bool),
-        typeof(byte),
-        typeof(sbyte),
-        typeof(short),
-        typeof(ushort),
-        typeof(int),
-        typeof(uint),
-        typeof(long),
-        typeof(ulong),
-        typeof(float),
-        typeof(double),
-        typeof(decimal),
-      };
-
-    private static readonly Dictionary<Type, MethodInfo> numberParsers;
+    private static readonly Dictionary<Type, IPrimitiveSerializer> numberSerializerMap;
+    private static readonly List<IPrimitiveSerializer> numberSerializers = new List<IPrimitiveSerializer> {
+      new Bool2XmlSerializer(),
+      new Byte2XmlSerializer(),
+      new SByte2XmlSerializer(),
+      new Short2XmlSerializer(),
+      new UShort2XmlSerializer(),
+      new Int2XmlSerializer(),
+      new UInt2XmlSerializer(),
+      new Long2XmlSerializer(),
+      new ULong2XmlSerializer(),
+      new Float2XmlSerializer(),
+      new Double2XmlSerializer(),
+      new Decimal2XmlSerializer(),
+    };
 
     static Number2StringSerializer() {
-      numberParsers = new Dictionary<Type, MethodInfo>();
-      foreach (var type in numberTypes) {
-        numberParsers[type] = type
-          .GetMethod("Parse", BindingFlags.Static | BindingFlags.Public,
-                     null, new[] { typeof(string) }, null);
+      numberSerializerMap = new Dictionary<Type,IPrimitiveSerializer>();
+      foreach (var s in numberSerializers) {
+        numberSerializerMap[s.SourceType] = s;
       }
     }
@@ -79 +77 @@
     /// </returns>
     public bool CanSerialize(Type type) {
-      return numberParsers.ContainsKey(type);
+      return numberSerializerMap.ContainsKey(type);
     }
 
@@ -92 +90 @@
     public string JustifyRejection(Type type) {
       return string.Format("not a number type (one of {0})",
-        string.Join(", ", numberTypes.Select(n => n.Name).ToArray()));
+        string.Join(", ", numberSerializers.Select(n => n.SourceType.Name).ToArray()));
     }
 
@@ -101 +99 @@
     /// <returns></returns>
     public string Format(object obj) {
-      if (obj.GetType() == typeof(float))
-        return ((float)obj).ToString("r", CultureInfo.InvariantCulture);
-      if (obj.GetType() == typeof(double))
-        return ((double)obj).ToString("r", CultureInfo.InvariantCulture);
-      if (obj.GetType() == typeof(decimal))
-        return ((decimal)obj).ToString("r", CultureInfo.InvariantCulture);
-      return obj.ToString();
+      return ((XmlString)numberSerializerMap[obj.GetType()].Format(obj)).Data;
     }
 
@@ -118 +110 @@
     public object Parse(string stringValue, Type type) {
       try {
-        return numberParsers[type]
-          .Invoke(null,
-              BindingFlags.Static | BindingFlags.PutRefDispProperty,
-                    null, new[] { stringValue }, CultureInfo.InvariantCulture);
+        return numberSerializerMap[type].Parse(new XmlString(stringValue));
       } catch (FormatException e) {
         throw new PersistenceException("Invalid element data during number parsing.", e);

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1041 +1041 @@
       }
     }
+
+    [TestMethod]
+    public void TestSpecialNumbers() {
+      List<double> specials = new List<double>() { 1.0 / 0, -1.0 / 0, 0.0 / 0 };
+      Assert.IsTrue(double.IsPositiveInfinity(specials[0]));
+      Assert.IsTrue(double.IsNegativeInfinity(specials[1]));
+      Assert.IsTrue(double.IsNaN(specials[2]));
+      XmlGenerator.Serialize(specials, tempFile);
+      List<double> newSpecials = XmlParser.Deserialize<List<double>>(tempFile);
+      Assert.IsTrue(double.IsPositiveInfinity(newSpecials[0]));
+      Assert.IsTrue(double.IsNegativeInfinity(newSpecials[1]));
+      Assert.IsTrue(double.IsNaN(newSpecials[2]));
+    }