Changeset 2042 for branches/Operator Architecture Refactoring/HeuristicLab.Core/3.3/CloneableBase.cs

Timestamp:

06/15/09 02:18:42 (15 years ago)

Author:

swagner

Message:

Refactoring of the operator architecture (#95)

File:

• branches/Operator Architecture Refactoring/HeuristicLab.Core/3.3/CloneableBase.cs (modified) (2 diffs)

branches/Operator Architecture Refactoring/HeuristicLab.Core/3.3/CloneableBase.cs

@@ -31 +31 @@
   /// </summary>
   public abstract class CloneableBase : ICloneable {
-    /// <summary>
-    /// Gets a unique id (memory address) of the current instance. The id is used to
-    /// detect, if an object has already been cloned or not.
-    /// </summary>
-    public long Id {
-      get {
-        GCHandle handle = new GCHandle();
-        handle.Target = this;
-        return GCHandle.ToIntPtr(handle).ToInt64();
-      }
-    }
-
-    /// <summary>
-    /// Clones the current instance (deep clone).
-    /// </summary>
-    /// <remarks>Uses the <see cref="Auxiliary.Clone"/> method of the class <see cref="Auxiliary"/>.</remarks>
-    /// <returns>The clone.</returns>
     public object Clone() {
-      return Auxiliary.Clone(this, new Dictionary<long, object>());
+      return Clone(new Cloner());
     }
     /// <summary>
@@ -57 +40 @@
     /// <param name="clonedObjects">All already cloned objects.</param>
     /// <returns>The clone.</returns>
-    public virtual object Clone(IDictionary<long, object> clonedObjects) {
+    public virtual ICloneable Clone(ICloner cloner) {
       CloneableBase clone = (CloneableBase)Activator.CreateInstance(this.GetType());
-      clonedObjects.Add(clone.Id, clone);
+      cloner.AddClonedObject(this, clone);
       return clone;
     }