Changeset 4796 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs/OptimizerJob.cs

Timestamp:

11/15/10 14:27:27 (14 years ago)

Author:

cneumuel

Message:

#1233 applied new cloning mechanism

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs/OptimizerJob.cs (modified) (5 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/Jobs/OptimizerJob.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Clients.Hive.Jobs {
+  [Item("Optimizer Job", "Represents Job which executes a IOptimizer object.")]
   [StorableClass]
-  public class OptimizerJob : IJob {
+  public class OptimizerJob : DeepCloneable, IJob {
     [Storable]
     protected IOptimizer optimizer;
@@ -70 +71 @@
     }
 
-
     [Storable]
     private bool collectChildJobs;
@@ -81 +81 @@
       this.log = new Log();
     }
-
     public OptimizerJob(IOptimizer optimizer)
       : this() {
@@ -93 +92 @@
         this.ComputeInParallel = false;
       }
+    }
+    [StorableConstructor]
+    protected OptimizerJob(bool deserializing) { }
+    protected OptimizerJob(OptimizerJob original, Cloner cloner)
+      : base(original, cloner) {
+      this.Optimizer = cloner.Clone(original.Optimizer);
+      this.log = cloner.Clone(original.Log);
+      this.ComputeInParallel = original.ComputeInParallel;
+      this.IndexInParentOptimizerList = original.IndexInParentOptimizerList;
+      this.CollectChildJobs = original.CollectChildJobs;
+      this.RegisterEvents();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OptimizerJob(this, cloner);
     }
 
@@ -310 +323 @@
     #endregion
 
-    #region IDeepCloneable Members
-
-    public IDeepCloneable Clone(Cloner cloner) {
-      OptimizerJob clone = (OptimizerJob)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.Optimizer = (IOptimizer)cloner.Clone(this.Optimizer);
-      clone.log = (ILog)cloner.Clone(this.Log);
-      clone.ComputeInParallel = this.ComputeInParallel;
-      clone.IndexInParentOptimizerList = this.IndexInParentOptimizerList;
-      clone.CollectChildJobs = this.CollectChildJobs;
-      clone.RegisterEvents();
-      return clone;
-    }
-
-    #endregion
-
-    #region ICloneable Members
-
-    public object Clone() {
-      return Clone(new Cloner());
-    }
-
-    #endregion
-
     /// <summary>
     /// Gets the string representation of the current instance in the format: <c>Name: [null|Value]</c>.