Changeset 4796 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobClient.cs

Timestamp:

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

Author:

cneumuel

Message:

#1233 applied new cloning mechanism

File:

• branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobClient.cs (modified) (10 diffs)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HiveExperiment/HiveJobClient.cs

@@ -33 +33 @@
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
+
   public class HiveJob : Item {
     private static object locker = new object();
@@ -53 +53 @@
     }
 
-    [Storable]
     private Job job;
     public Job Job {
@@ -67 +66 @@
     }
 
-    [Storable]
     private OptimizerJob optimizerJob;
     public OptimizerJob OptimizerJob {
@@ -87 +85 @@
     }
 
-    [Storable]
     private ItemList<HiveJob> childHiveJobs;
     public ReadOnlyItemList<HiveJob> ChildHiveJobs {
@@ -93 +90 @@
     }
 
-    [Storable]
     private bool isFinishedOptimizerDownloaded;
     public bool IsFinishedOptimizerDownloaded {
@@ -105 +101 @@
     }
 
-    [Storable]
     private bool syncJobsWithOptimizers = true;
 
@@ -138 +133 @@
     public HiveJob(IOptimizer optimizer)
       : this() {
-        this.OptimizerJob = new OptimizerJob(optimizer);
+      this.OptimizerJob = new OptimizerJob(optimizer);
     }
 
@@ -147 +142 @@
       this.OptimizerJob = PersistenceUtil.Deserialize<OptimizerJob>(serializedJob.Data);
       this.syncJobsWithOptimizers = true;
+    }
+
+    protected HiveJob(HiveJob original, Cloner cloner)
+      : base(original, cloner) {
+      this.Job = cloner.Clone(original.job);
+      this.OptimizerJob = cloner.Clone(original.OptimizerJob);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new HiveJob(this, cloner);
     }
 
@@ -212 +216 @@
       }
     }
-        
+
     void batchRun_AlgorithmChanged(object sender, EventArgs e) {
       if (syncJobsWithOptimizers) {
@@ -484 +488 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      LogMessage("I am beeing cloned");
-      HiveJob clone = (HiveJob)base.Clone(cloner);
-      clone.job = (Job)cloner.Clone(this.job);
-      clone.optimizerJob = (OptimizerJob)cloner.Clone(this.optimizerJob);
-      return clone;
-    }
-
     /// <summary>
     /// Returns a list of HiveJobs including this and all its child-jobs recursively