Changeset 1363 for branches/New Persistence Exploration/Persistence

Timestamp:

03/19/09 14:19:58 (16 years ago)

Author:

epitzer

Message:

Convenience method for XML serialization and de-serizliation. (#506)

Location:

branches/New Persistence Exploration/Persistence

Files:

• Persistence/Default/Xml/XmlGenerator.cs (modified) (4 diffs)
• Persistence/Default/Xml/XmlParser.cs (modified) (1 diff)
• Persistence/HeuristicLab.Persistence.csproj (modified) (1 diff)
• Test/NewSerializationTest.cs (modified) (1 diff)

branches/New Persistence Exploration/Persistence/Persistence/Default/Xml/XmlGenerator.cs

@@ -4 +4 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core;
+using System.IO;
 
 namespace HeuristicLab.Persistence.Default.Xml {
@@ -36 +37 @@
     private enum NodeType { Start, End, Inline } ;
 
-    private static string FormatNode(string name, Dictionary<string, object> attributes, NodeType type) {
+    private static string FormatNode(string name,
+        Dictionary<string, object> attributes,
+        NodeType type) {
+      return FormatNode(name, attributes, type, " ");
+    }
+
+    private static string FormatNode(string name,
+        Dictionary<string, object> attributes,
+        NodeType type, string space) {
       StringBuilder sb = new StringBuilder();
       sb.Append('<');
@@ -44 +53 @@
       foreach (var attribute in attributes) {
         if (attribute.Value != null && !string.IsNullOrEmpty(attribute.Value.ToString())) {
-          sb.Append(' ');
+          sb.Append(space);
           sb.Append(attribute.Key);
           sb.Append("=\"");
@@ -112 +121 @@
       yield return "<" + XmlStrings.TYPECACHE + ">";
       foreach (var mapping in typeCache)
-        yield return FormatNode(XmlStrings.TYPE, mapping.GetDict(), NodeType.Inline);                                
+        yield return "  " + FormatNode(
+          XmlStrings.TYPE,
+          mapping.GetDict(),
+          NodeType.Inline,
+          "\n    ");
       yield return "</" + XmlStrings.TYPECACHE + ">";
     }
+
+    public static void Serialize(object o, string basename) {      
+      Serialize(o, basename, ConfigurationService.Instance.GetDefaultConfig(XmlFormat.Instance));
+    }
+
+    public static void Serialize(object o, string basename, Configuration configuration) {
+    Serializer s = new Serializer(o, configuration);
+      XmlGenerator xmlGenerator = new XmlGenerator();
+      StreamWriter writer = new StreamWriter(basename + ".xml");
+      foreach (ISerializationToken token in s) {
+        string line = xmlGenerator.Format(token);
+        writer.Write(line);
+        Console.Out.Write(line);
+      }
+      writer.Close();
+      writer = new StreamWriter(basename + "-types.xml");
+      foreach (string line in xmlGenerator.Format(s.TypeCache)) {
+        writer.WriteLine(line);
+        Console.Out.WriteLine(line);
+      }
+      writer.Close();      
+    }
+
   }
 }

branches/New Persistence Exploration/Persistence/Persistence/Default/Xml/XmlParser.cs

@@ -104 +104 @@
       return typeCache;
     }
+
+    public static object DeSerialize(string basename) {
+      DeSerializer deSerializer = new DeSerializer(
+        ParseTypeCache(new StreamReader(basename + "-types.xml")));
+      XmlParser parser = new XmlParser(new StreamReader("test.xml"));
+      return deSerializer.DeSerialize(parser);      
+    }
   }  
 }

branches/New Persistence Exploration/Persistence/Persistence/HeuristicLab.Persistence.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Persistence</RootNamespace>
-    <AssemblyName>Persistence</AssemblyName>
+    <RootNamespace>HeuristicLab.Persistence</RootNamespace>
+    <AssemblyName>HeuristicLab.Persistence</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

branches/New Persistence Exploration/Persistence/Test/NewSerializationTest.cs

@@ -154 +154 @@
       r.dict.Add("two", 2);
       r.dict.Add("three", 3);
-      Serializer s = new Serializer(r, ConfigurationService.Instance.GetDefaultConfig(XmlFormat.Instance));        
-      XmlGenerator xmlGenerator = new XmlGenerator();
-      StreamWriter writer = new StreamWriter("test.xml");
-      foreach (ISerializationToken token in s) {
-        string line = xmlGenerator.Format(token);
-        writer.Write(line);
-        Console.Out.Write(line);
-      }
-      writer.Close();
-      writer = new StreamWriter("test-types.xml");
-      foreach (string line in xmlGenerator.Format(s.TypeCache)) {
-        writer.WriteLine(line);
-        Console.Out.WriteLine(line);
-      }
-      writer.Close();
-      
-      XmlParser parser = new XmlParser(new StreamReader("test.xml"));
-      DeSerializer deSerializer = new DeSerializer(
-        XmlParser.ParseTypeCache(new StreamReader("test-types.xml")));        
-      object o = deSerializer.DeSerialize(parser);      
+      XmlGenerator.Serialize(r, "test");            
+      object o = XmlParser.DeSerialize("test");
       Console.Out.WriteLine(Util.AutoFormat(o, true));      
     }