Changeset 4665 for branches/CloningRefactoring/HeuristicLab.Optimization/3.3/Experiment.cs

Timestamp:

10/29/10 16:58:29 (14 years ago)

Author:

mkommend

Message:

Refactored Optimization (ticket #922).

File:

• branches/CloningRefactoring/HeuristicLab.Optimization/3.3/Experiment.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -128 +128 @@
       stopPending = false;
     }
-
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+    protected Experiment(Experiment original, Cloner cloner)
+      : base(original, cloner) {
+      executionState = original.executionState;
+      executionTime = original.executionTime;
+      optimizers = cloner.Clone(original.optimizers);
+      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 Experiment(this, cloner);
+    }
+
     private void Initialize() {
       RegisterOptimizersEvents();
@@ -135 +151 @@
         RegisterOptimizerEvents(optimizer);
       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));
-      Experiment clone = (Experiment)base.Clone(cloner);
-      clone.executionState = executionState;
-      clone.executionTime = executionTime;
-      clone.optimizers = (OptimizerList)cloner.Clone(optimizers);
-      clone.runs = (RunCollection)cloner.Clone(runs);
-      clone.stopPending = stopPending;
-      clone.Initialize();
-      return clone;
     }