Changeset 2526 for trunk/sources/HeuristicLab.Core/3.3/EngineBase.cs

Timestamp:

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

Author:

swagner

Message:

Refactored cloning (#806)

File:

• trunk/sources/HeuristicLab.Core/3.3/EngineBase.cs (modified) (1 diff)

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

@@ -127 +127 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// <remarks>Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already clone objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="EngineBase"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      EngineBase clone = (EngineBase)base.Clone(clonedObjects);
-      clone.myOperatorGraph = (IOperatorGraph)Auxiliary.Clone(OperatorGraph, clonedObjects);
-      clone.myGlobalScope = (IScope)Auxiliary.Clone(GlobalScope, clonedObjects);
+    public override IItem Clone(ICloner cloner) {
+      EngineBase clone = (EngineBase)base.Clone(cloner);
+      clone.myOperatorGraph = (IOperatorGraph)cloner.Clone(OperatorGraph);
+      clone.myGlobalScope = (IScope)cloner.Clone(GlobalScope);
       clone.myExecutionTime = ExecutionTime;
       IOperation[] operations = new IOperation[ExecutionStack.Count];
       ExecutionStack.CopyTo(operations, 0);
       for (int i = operations.Length - 1; i >= 0; i--)
-        clone.myExecutionStack.Push((IOperation)Auxiliary.Clone(operations[i], clonedObjects));
+        clone.myExecutionStack.Push((IOperation)cloner.Clone(operations[i]));
       clone.myRunning = Running;
       clone.myCanceled = Canceled;