Changeset 1644 for trunk

Timestamp:

04/23/09 17:41:55 (16 years ago)

Author:

epitzer

Message:

support for default disabled decomposers, re-activate number2string decomposer with negative priority. (#548)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Core/ConfigurationService.cs (modified) (2 diffs)
• 3.3/Default/Decomposers/CompactNumberArray2StringDecomposer.cs (modified) (1 diff)
• 3.3/Default/Decomposers/Number2StringConverter.cs (modified) (3 diffs)
• 3.3/Default/Decomposers/NumberEnumerable2StringDecomposer.cs (modified) (1 diff)
• UnitTests/UseCases.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

@@ -1 +1 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Collections.Generic;
 using System.Reflection;
@@ -159 +160 @@
           format.SerialDataType.VersionInvariantName()));
       }
-      return new Configuration(format, formatterConfig, Decomposers);
+      return new Configuration(format, formatterConfig, Decomposers.Where((d) => d.Priority > 0));
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/CompactNumberArray2StringDecomposer.cs

@@ -17 +17 @@
     }
 
-    private static readonly Number2StringConverter numberConverter =
-      new Number2StringConverter();
+    private static readonly Number2StringDecomposer numberConverter =
+      new Number2StringDecomposer();
 
     public bool CanDecompose(Type type) {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/Number2StringConverter.cs

@@ -9 +9 @@
 namespace HeuristicLab.Persistence.Default.Decomposers {
 
-  public class Number2StringConverter {
+  public class Number2StringDecomposer : IDecomposer {
 
     private static readonly List<Type> numberTypes =
@@ -29 +29 @@
     private static readonly Dictionary<Type, MethodInfo> numberParsers;
 
-    static Number2StringConverter() {
+    static Number2StringDecomposer() {
       numberParsers = new Dictionary<Type, MethodInfo>();
       foreach (var type in numberTypes) {
@@ -65 +65 @@
     }
 
+
+    #region IDecomposer Members
+
+    public int Priority {
+      get { return -100; }
+    }
+
+    public IEnumerable<Tag> CreateMetaInfo(object obj) {
+      yield return new Tag(Format(obj));
+    }
+
+    public IEnumerable<Tag> Decompose(object obj) {
+      // numbers are composed just of meta info
+      return new Tag[] { };
+    }
+
+    public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
+      var it = metaInfo.GetEnumerator();
+      try {
+        it.MoveNext();
+        return Parse((string)it.Current.Value, type);
+      } catch (InvalidOperationException e) {
+        throw new PersistenceException(
+          String.Format("Insufficient meta information to reconstruct number of type {0}.",
+          type.VersionInvariantName()), e);
+      } catch (InvalidCastException e) {
+        throw new PersistenceException("Invalid meta information element type", e);
+      }
+    }
+
+    public void Populate(object instance, IEnumerable<Tag> tags, Type type) {
+      // numbers are composed just of meta info, no need to populate
+    }
+
+    #endregion
   }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/NumberEnumerable2StringDecomposer.cs

@@ -17 +17 @@
     }
 
-    private static readonly Number2StringConverter numberConverter =
-      new Number2StringConverter();
+    private static readonly Number2StringDecomposer numberConverter =
+      new Number2StringDecomposer();
 
     private static readonly Dictionary<Type, Type> interfaceCache = new Dictionary<Type, Type>();

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -11 +11 @@
 using System.Reflection;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Default.Xml.Primitive;
+using HeuristicLab.Persistence.Default.Decomposers;
 
 namespace HeuristicLab.Persistence.UnitTest {
@@ -312 +315 @@
     }
 
+    [TestMethod]
+    public void Number2StringDecomposer() {
+      PrimitivesTest sdt = new PrimitivesTest();
+      XmlGenerator.Serialize(sdt, tempFile,
+        new Configuration(new XmlFormat(),
+          new Dictionary<Type, IFormatter> { { typeof(string), new String2XmlFormatter() } },
+          new List<IDecomposer> { new Number2StringDecomposer() }));
+      object o = XmlParser.DeSerialize(tempFile);      
+      Assert.AreEqual(
+        DebugStringGenerator.Serialize(sdt),
+        DebugStringGenerator.Serialize(o));
+    }
+
 
     [ClassInitialize]