Changeset 2526 for trunk/sources/HeuristicLab.Operators/3.3

Timestamp:

11/23/09 16:43:34 (15 years ago)

Author:

swagner

Message:

Refactored cloning (#806)

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• CombinedOperator.cs (modified) (1 diff)
• DelegatingOperator.cs (modified) (1 diff)
• VariableInjector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators/3.3/CombinedOperator.cs

@@ -87 +87 @@
     /// (System.Collections.Generic.IDictionary<System.Guid, object>)"/> 
     /// of base class <see cref="DelegatingOperator"/>.<br/>
-    /// Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="CombinedOperator"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      CombinedOperator clone = (CombinedOperator)base.Clone(clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      CombinedOperator clone = (CombinedOperator)base.Clone(cloner);
       clone.myDescription = Description;
-      clone.myOperatorGraph = (IOperatorGraph)Auxiliary.Clone(OperatorGraph, clonedObjects);
+      clone.myOperatorGraph = (IOperatorGraph)cloner.Clone(OperatorGraph);
       return clone;
     }

trunk/sources/HeuristicLab.Operators/3.3/DelegatingOperator.cs

@@ -31 +31 @@
   /// </summary>
   public abstract class DelegatingOperator : OperatorBase {
+    private Guid myGuid;
+    protected Guid Guid {
+      get { return myGuid; }
+    }
+
+    protected DelegatingOperator()
+      : base() {
+      myGuid = Guid.NewGuid();
+    }
+
+    public override IItem Clone(ICloner cloner) {
+      DelegatingOperator clone = (DelegatingOperator)base.Clone(cloner);
+      clone.myGuid = Guid;
+      return clone;
+    }
+
     /// <summary>
     /// Executes the specified operator in the given <paramref name="scope"/>.

trunk/sources/HeuristicLab.Operators/3.3/VariableInjector.cs

@@ -53 +53 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone performed with <see cref="Auxiliary.Clone"/> of helper class
+    /// <remarks>Deep clone performed with <see cref="cloner.Clone"/> of helper class
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="VariableInjector"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       VariableInjector clone = new VariableInjector();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.Name = Name;
       foreach (IVariable variable in Variables)
-        clone.AddVariable((IVariable)Auxiliary.Clone(variable, clonedObjects));
+        clone.AddVariable((IVariable)cloner.Clone(variable));
       return clone;
     }