Changeset 1360

Timestamp:

03/19/09 12:31:19 (16 years ago)

Author:

epitzer

Message:

Scrap Storable-based cloning & reorganize namespaces. (#506)

Location:

branches/New Persistence Exploration/Persistence

Files:

• Persistence/ArrayFormatters.cs (deleted)
• Persistence/Core (added)
• Persistence/Core/DataMemberAccessor.cs (added)
• Persistence/Core/DeSerializer.cs (added)
• Persistence/Core/PersistenceConfiguration.cs (added)
• Persistence/Core/Serializer.cs (added)
• Persistence/Core/StorableAttribute.cs (added)
• Persistence/DeSerializer.cs (deleted)
• Persistence/Decomposers.cs (deleted)
• Persistence/Default (added)
• Persistence/Default/Decomposers.cs (added)
• Persistence/Default/EnumerableFormatters.cs (added)
• Persistence/Default/NumberArrayFormatters.cs (added)
• Persistence/Default/PrimitiveFormatters.cs (added)
• Persistence/Default/XmlFormatter.cs (added)
• Persistence/Default/XmlParser.cs (added)
• Persistence/EnumerableFormatters.cs (deleted)
• Persistence/HeuristicLab.Persistence.csproj (modified) (1 diff)
• Persistence/Interfaces/IDecomposer.cs (modified) (1 diff)
• Persistence/Interfaces/IFormatter.cs (modified) (1 diff)
• Persistence/PersistenceConfiguration.cs (deleted)
• Persistence/PrimitiveFormatters.cs (deleted)
• Persistence/Serializer.cs (deleted)
• Persistence/StorableAttribute.cs (deleted)
• Persistence/XmlFormatter.cs (deleted)
• Persistence/XmlParser.cs (deleted)
• Test/NewSerializationTest.cs (modified) (3 diffs)
• Test/StorableAttributeTests.cs (modified) (1 diff)

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

@@ -55 +55 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ArrayFormatters.cs" />
-    <Compile Include="EnumerableFormatters.cs" />
+    <Compile Include="Default\NumberArrayFormatters.cs" />
+    <Compile Include="Core\DataMemberAccessor.cs" />
+    <Compile Include="Default\EnumerableFormatters.cs" />
     <Compile Include="HeuristicLabPersistencePlugin.cs" />
-    <Compile Include="DeSerializer.cs" />
+    <Compile Include="Core\DeSerializer.cs" />
     <Compile Include="Interfaces\IDecomposer.cs" />
     <Compile Include="Interfaces\IFormatter.cs" />
-    <Compile Include="PersistenceConfiguration.cs" />
+    <Compile Include="Core\PersistenceConfiguration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Serializer.cs" />
-    <Compile Include="Decomposers.cs" />
-    <Compile Include="PrimitiveFormatters.cs" />
+    <Compile Include="Core\Serializer.cs" />
+    <Compile Include="Default\Decomposers.cs" />
+    <Compile Include="Default\PrimitiveFormatters.cs" />
     <Compile Include="Interfaces\Tokens.cs" />
     <Compile Include="Util.cs" />
-    <Compile Include="StorableAttribute.cs" />
-    <Compile Include="XmlFormatter.cs" />
-    <Compile Include="XmlParser.cs" />
+    <Compile Include="Core\StorableAttribute.cs" />
+    <Compile Include="Default\XmlFormatter.cs" />
+    <Compile Include="Default\XmlParser.cs" />
   </ItemGroup>
   <PropertyGroup>

branches/New Persistence Exploration/Persistence/Persistence/Interfaces/IDecomposer.cs

@@ -5 +5 @@
 
   public interface IDecomposer {
-    bool CanSerialize(Type type);
-    IEnumerable Serialize(object obj);
-    object DeSerialize(IEnumerable objects, Type type);
+    bool CanDecompose(Type type);
+    IEnumerable DeCompose(object obj);
+    object Compose(IEnumerable objects, Type type);
   }
 

branches/New Persistence Exploration/Persistence/Persistence/Interfaces/IFormatter.cs

@@ -10 +10 @@
     Type Type { get; }
     IFormat Format { get; }
-    object Serialize(object o);
-    object DeSerialize(object o);
+    object DoFormat(object o);
+    object Parse(object o);
   }
 

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

@@ -3 +3 @@
 using System.Collections.Generic;
 using System.IO;
+using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Interfaces;
 
@@ -172 +173 @@
         XmlParser.ParseTypeCache(new StreamReader("test-types.xml")),
         ConfigurationService.Instance.GetDefaultConfig(XmlFormat.Instance));        
-      object o = deSerializer.DeSerialize(parser);
-      Root t = CloningFactory.DefaultClone(r);
+      object o = deSerializer.DeSerialize(parser);      
       Console.Out.WriteLine(Util.AutoFormat(o, true));      
     }
@@ -193 +193 @@
         XmlParser.ParseTypeCache(new StreamReader("test-types.xml")),
         ConfigurationService.Instance.GetDefaultConfig(XmlFormat.Instance));        
-      object o = deSerializer.DeSerialize(parser);
-      Manager n = CloningFactory.DefaultClone(m);
+      object o = deSerializer.DeSerialize(parser);      
       Console.Out.WriteLine(Util.AutoFormat(o, true));      
-    }
-
-    public static void SpeedTest() {
-      StorableObject storable = new StorableObject();
-      CloneableObject cloneable = new CloneableObject();
-      Console.Write("initializing...");
-      storable.Init();
-      cloneable.Init();
-      Console.WriteLine("done");
-      List<StorableObject> storableClones = new List<StorableObject>();
-      List<CloneableObject> clonableClones = new List<CloneableObject>();
-      CloningFactory cloningFactory = new CloningFactory();
-      for (int i = 0; i < 100000; i++) {
-        Console.Write("cloning storable.. ");
-        storableClones.Add(cloningFactory.Clone(storable));
-        Console.WriteLine();
-        Console.Write("cloning cloneable.. ");
-        clonableClones.Add((CloneableObject)cloneable.Clone());
-        Console.WriteLine();
-      }
-    }
-
-    public static void SpeedTest2() {
-      Root r = new Root();
-      r.selfReferences = new List<Root> {r, r};
-      r.c = new Custom {r = r};
-      r.dict.Add("one", 1);
-      r.dict.Add("two", 2);
-      r.dict.Add("three", 3);
-
-      CloneableRoot cr = new CloneableRoot();
-      cr.selfReferences = new List<CloneableRoot> {cr, cr};
-      cr.c = new CloneableCustom {r = cr};
-      cr.dict.Add("one", 1);
-      cr.dict.Add("two", 2);
-      cr.dict.Add("three", 3);      
-      List<Root> storableClones = new List<Root>();
-      List<CloneableRoot> clonableClones = new List<CloneableRoot>();      
-      CloningFactory cloningFactory = new CloningFactory();
-
-      DateTime start = DateTime.Now;
-      Console.Write("cloning storable.. ");
-      for (int i = 0; i < 100000; i++) {       
-        storableClones.Add(cloningFactory.Clone(r));                        
-      }
-      Console.WriteLine(new TimeSpan(DateTime.Now.Ticks - start.Ticks));
-
-      start = DateTime.Now;
-      Console.Write("cloning storable again.. ");
-      for (int i = 0; i < 100000; i++) {
-        storableClones.Add(cloningFactory.Clone(r));
-      }
-      Console.WriteLine(new TimeSpan(DateTime.Now.Ticks - start.Ticks));
-
-      start = DateTime.Now;
-      Console.Write("cloning cloneable.. ");
-      for (int i = 0; i < 100000; i++) {        
-        clonableClones.Add((CloneableRoot)cr.Clone(new Dictionary<object, object>()));
-      }
-      Console.WriteLine(new TimeSpan(DateTime.Now.Ticks - start.Ticks));
-      clonableClones.Clear();
-      
-    }
+    }    
 
     public class Base {

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Core;
 
 namespace HeuristicLab.Persistence.Test {