Changeset 4722 for trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.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.Optimization/3.3/BatchRun.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -167 +167 @@
       stopPending = false;
     }
-
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
+    private BatchRun(BatchRun original, Cloner cloner)
+      : base(original, cloner) {
+      executionState = original.executionState;
+      executionTime = original.executionTime;
+      algorithm = cloner.Clone(original.algorithm);
+      repetitions = original.repetitions;
+      repetitionsCounter = original.repetitionsCounter;
+      runs = cloner.Clone(original.runs);
+      stopPending = original.stopPending;
+      Initialize();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
+      return new BatchRun(this, cloner);
+    }
+
     private void Initialize() {
       if (algorithm != null) RegisterAlgorithmEvents();
       if (runs != null) RegisterRunsEvents();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
-      BatchRun clone = (BatchRun)base.Clone(cloner);
-      clone.executionState = executionState;
-      clone.executionTime = executionTime;
-      clone.algorithm = (IAlgorithm)cloner.Clone(algorithm);
-      clone.repetitions = repetitions;
-      clone.repetitionsCounter = repetitionsCounter;
-      clone.runs = (RunCollection)cloner.Clone(runs);
-      clone.stopPending = stopPending;
-      clone.Initialize();
-      return clone;
     }