Changeset 4722 for trunk/sources/HeuristicLab.Optimization/3.3/Run.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/Run.cs (modified) (3 diffs)

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

@@ -38 +38 @@
     [StorableConstructor]
     private Run(bool deserializing) : base(deserializing) { }
+    private Run(Run original, Cloner cloner)
+      : base(original, cloner) {
+      color = original.color;
+      algorithm = cloner.Clone(original.algorithm);
+
+      parameters = new Dictionary<string, IItem>();
+      foreach (string key in original.parameters.Keys)
+        parameters.Add(key, cloner.Clone(original.parameters[key]));
+
+      results = new Dictionary<string, IItem>();
+      foreach (string key in original.results.Keys)
+        results.Add(key, cloner.Clone(original.results[key]));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Run(this, cloner);
+    }
+
     public Run()
       : base() {
@@ -81 +98 @@
     }
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       if (color == Color.Empty) color = Color.Black;
     }
@@ -128 +145 @@
         handler(this, EventArgs.Empty);
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      Run clone = (Run)base.Clone(cloner);
-      clone.color = this.color;
-      clone.algorithm = (IAlgorithm)cloner.Clone(algorithm);
-      foreach (string key in parameters.Keys)
-        clone.parameters.Add(key, (IItem)cloner.Clone(parameters[key]));
-      foreach (string key in results.Keys)
-        clone.results.Add(key, (IItem)cloner.Clone(results[key]));
-      return clone;
-    }
   }
 }