Changeset 4722 for trunk/sources/HeuristicLab.Core/3.3/Engine.cs

Timestamp:

11/06/10 01:56:04 (13 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Engine.cs (modified) (2 diffs)

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

@@ -46 +46 @@
     private System.Timers.Timer timer;
 
+    [StorableConstructor]
+    protected Engine(bool deserializing)
+      : base(deserializing) {
+      pausePending = stopPending = false;
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+    }
+    protected Engine(Engine original, Cloner cloner)
+      : base(original, cloner) {
+      if (original.ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
+      log = cloner.Clone(original.log);
+      executionStack = new Stack<IOperation>();
+      IOperation[] contexts = original.executionStack.ToArray();
+      for (int i = contexts.Length - 1; i >= 0; i--)
+        executionStack.Push(cloner.Clone(contexts[i]));
+      pausePending = original.pausePending;
+      stopPending = original.stopPending;
+      timer = new System.Timers.Timer(100);
+      timer.AutoReset = true;
+      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
+    }
     protected Engine()
       : base() {
@@ -54 +76 @@
       timer.AutoReset = true;
       timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
-    }
-    [StorableConstructor]
-    protected Engine(bool deserializing)
-      : base(deserializing) {
-      pausePending = stopPending = false;
-      timer = new System.Timers.Timer(100);
-      timer.AutoReset = true;
-      timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Elapsed);
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
-      Engine clone = (Engine)base.Clone(cloner);
-      clone.log = (ILog)cloner.Clone(log);
-      IOperation[] contexts = executionStack.ToArray();
-      for (int i = contexts.Length - 1; i >= 0; i--)
-        clone.executionStack.Push((IOperation)cloner.Clone(contexts[i]));
-      clone.pausePending = pausePending;
-      clone.stopPending = stopPending;
-      return clone;
     }