Changeset 5712 for branches/DataAnalysis Refactoring/HeuristicLab.Persistence

Timestamp:

03/16/11 14:47:32 (14 years ago)

Author:

mkommend

Message:

#1418: Fixed persistence of SymbolicExpressionGrammars.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3

Files:

• Default/CompositeSerializers/TupleSerializer.cs (copied) (copied from trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs) (3 diffs)
• HeuristicLab.Persistence-3.3.csproj (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

@@ -63 +63 @@
     public IEnumerable<Tag> CreateMetaInfo(object obj) {
       Type t = obj.GetType();
-      for (int i = 1; i<=t.GetGenericArguments().Length; i++) {
+      for (int i = 1; i <= t.GetGenericArguments().Length; i++) {
         string name = string.Format("Item{0}", i);
         yield return new Tag(name, t.GetProperty(name).GetValue(obj, null));
@@ -79 +79 @@
     static TupleSerializer() {
       foreach (MethodInfo mi in typeof(Tuple).GetMethods(public_static).Where(mi => mi.Name == "Create")) {
-        CreateMethods[mi.GetGenericArguments().Length-1] = mi;
+        CreateMethods[mi.GetGenericArguments().Length - 1] = mi;
       }
     }
@@ -85 +85 @@
     public object CreateInstance(Type type, IEnumerable<Tag> metaInfo) {
       var values = metaInfo.Select(t => t.Value).ToArray();
-      MethodInfo createMethod = CreateMethods[values.Length-1].MakeGenericMethod(values.Select(v => v.GetType()).ToArray());
+
+      MethodInfo createMethod = CreateMethods[values.Length - 1].MakeGenericMethod(type.GetGenericArguments());
       return createMethod.Invoke(null, values.ToArray());
     }

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -142 +142 @@
     <Compile Include="Default\CompositeSerializers\CompactNumberArray2StringSerializer.cs" />
     <Compile Include="Default\CompositeSerializers\ConcreteDictionarySerializer.cs" />
+    <Compile Include="Default\CompositeSerializers\TupleSerializer.cs" />
     <Compile Include="Default\CompositeSerializers\HashSetSerializer.cs" />
     <Compile Include="Default\CompositeSerializers\DictionarySerializer.cs" />

branches/DataAnalysis Refactoring/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1243 +1243 @@
     }
 
+    [TestMethod]
+    public void TupleTest() {
+      var t1 = Tuple.Create(1);
+      var t2 = Tuple.Create('1', "2");
+      var t3 = Tuple.Create(3.0, 3f, 5);
+      var t4 = Tuple.Create(Tuple.Create(1, 2, 3), Tuple.Create(4, 5, 6), Tuple.Create(8, 9, 10));
+      var tuple = Tuple.Create(t1, t2, t3, t4);
+      XmlGenerator.Serialize(tuple, tempFile);
+      var newTuple = XmlParser.Deserialize<Tuple<Tuple<int>, Tuple<char, string>, Tuple<double, float, int>, Tuple<Tuple<int, int, int>, Tuple<int, int, int>, Tuple<int, int, int>>>>(tempFile);
+      Assert.AreEqual(tuple, newTuple);
+    }
+