Changeset 3376 for trunk/sources/HeuristicLab.Core

Timestamp:

04/16/10 19:15:09 (14 years ago)

Author:

swagner

Message:

Moved interfaces and classes for deep cloning from HeuristicLab.Core to HeuristicLab.Common (#975).

Location:

trunk/sources/HeuristicLab.Core/3.3

Files:

• Engine.cs (modified) (1 diff)
• ExecutionContext.cs (modified) (2 diffs)
• HeuristicLab.Core-3.3.csproj (modified) (3 diffs)
• Interfaces/IExecutionContext.cs (modified) (1 diff)
• Interfaces/IOperation.cs (modified) (1 diff)
• Item.cs (modified) (4 diffs)
• ItemArray.cs (modified) (1 diff)
• ItemCollection.cs (modified) (1 diff)
• ItemList.cs (modified) (1 diff)
• ItemSet.cs (modified) (1 diff)
• OperationCollection.cs (modified) (2 diffs)
• ParameterizedNamedItem.cs (modified) (1 diff)
• Scope.cs (modified) (1 diff)
• ScopeList.cs (modified) (1 diff)
• VariableCollection.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Engine.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Threading;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Core/3.3/ExecutionContext.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core {
   [StorableClass]
-  public sealed class ExecutionContext : DeepCloneable, IExecutionContext, IAtomicOperation {
+  public sealed class ExecutionContext : IDeepCloneable, IExecutionContext, IAtomicOperation {
     [Storable]
     private IParameterizedItem parameterizedItem;
@@ -62 +63 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+    public IDeepCloneable Clone(Cloner cloner) {
       ExecutionContext clone = new ExecutionContext();
       cloner.RegisterClonedObject(this, clone);

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -100 +100 @@
   <ItemGroup>
     <Compile Include="Attributes\ItemAttribute.cs" />
-    <Compile Include="Cloner.cs" />
     <Compile Include="Attributes\CreatableAttribute.cs" />
     <None Include="HeuristicLabCorePlugin.cs.frame" />
@@ -120 +119 @@
     <Compile Include="Interfaces\ILookupParameter.cs" />
     <Compile Include="ItemArray.cs" />
-    <Compile Include="DeepCloneable.cs" />
     <Compile Include="Engine.cs" />
     <Compile Include="Interfaces\IScope.cs" />
@@ -141 +139 @@
     <Compile Include="VariableCollection.cs" />
     <Compile Include="ScopeList.cs" />
-    <Compile Include="Interfaces\IDeepCloneable.cs" />
     <Compile Include="NamedItemCollection.cs" />
     <Compile Include="Interfaces\INamedItem.cs" />

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperation.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+
 namespace HeuristicLab.Core {
   /// <summary>

trunk/sources/HeuristicLab.Core/3.3/Item.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +31 @@
   [StorableClass]
   [Item("Item", "Base class for all HeuristicLab items.")]
-  public abstract class Item : DeepCloneable, IItem {
+  public abstract class Item : IDeepCloneable, IItem {
     public virtual string ItemName {
       get { return ItemAttribute.GetName(this.GetType()); }
@@ -58 +59 @@
     }
     [StorableConstructor]
-    protected Item(bool deserializing) : base(deserializing) { }
+    protected Item(bool deserializing) { }
 
+
+    /// <summary>
+    /// Creates a deep clone of this instance.
+    /// </summary>
+    /// <remarks>
+    /// This method is the entry point for creating a deep clone of a whole object graph.
+    /// </remarks>
+    /// <returns>A clone of this instance.</returns>
+    public object Clone() {
+      return Clone(new Cloner());
+    }
 
     /// <summary>
@@ -66 +78 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="Variable"/>.</returns>
-    public override IDeepCloneable Clone(Cloner cloner) {
-      Item clone = (Item)base.Clone(cloner);
+    public virtual IDeepCloneable Clone(Cloner cloner) {
+      Item clone = (Item)Activator.CreateInstance(this.GetType());
+      cloner.RegisterClonedObject(this, clone);
       clone.readOnlyView = readOnlyView;
       return clone;

trunk/sources/HeuristicLab.Core/3.3/ItemArray.cs

@@ -28 +28 @@
 using System.Drawing;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Collections;

trunk/sources/HeuristicLab.Core/3.3/ItemCollection.cs

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Core/3.3/ItemList.cs

@@ -28 +28 @@
 using System.Drawing;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Collections;
-
 
 namespace HeuristicLab.Core {

trunk/sources/HeuristicLab.Core/3.3/ItemSet.cs

@@ -28 +28 @@
 using System.Drawing;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Collections;
-
 
 namespace HeuristicLab.Core {

trunk/sources/HeuristicLab.Core/3.3/OperationCollection.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Core {
   [StorableClass]
-  public sealed class OperationCollection : DeepCloneable, IList<IOperation>, IOperation {
+  public sealed class OperationCollection : IDeepCloneable, IList<IOperation>, IOperation {
     [Storable]
     private IList<IOperation> operations;
@@ -50 +52 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      OperationCollection clone = (OperationCollection)base.Clone(cloner);
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+    public IDeepCloneable Clone(Cloner cloner) {
+      OperationCollection clone = (OperationCollection)Activator.CreateInstance(this.GetType());
+      cloner.RegisterClonedObject(this, clone);
       clone.operations = new List<IOperation>(this.Select(x => (IOperation)cloner.Clone(x)));
       clone.parallel = parallel;

trunk/sources/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -23 +23 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Core/3.3/Scope.cs

@@ -21 +21 @@
 
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Core/3.3/ScopeList.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Core/3.3/VariableCollection.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;