Changeset 4796 for branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive

Timestamp:

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

Author:

cneumuel

Message:

#1233 applied new cloning mechanism

Location:

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3

Files:

• Exceptions/ServiceClientFactoryException.cs (added)
• HeuristicLab.Clients.Hive-3.3.csproj (modified) (1 diff)
• HiveExperiment/HiveClient.cs (modified) (4 diffs)
• HiveExperiment/HiveExperimentClient.cs (modified) (4 diffs)
• HiveExperiment/HiveJobClient.cs (modified) (10 diffs)
• Jobs/OptimizerJob.cs (modified) (5 diffs)
• ServiceClients/ServiceClientFactoryException.cs (deleted)

branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -88 +88 @@
     <Compile Include="PersistenceUtil.cs" />
     <Compile Include="ServiceClients\ServiceClientFactory.cs" />
-    <Compile Include="ServiceClients\ServiceClientFactoryException.cs" />
+    <Compile Include="Exceptions\ServiceClientFactoryException.cs" />
     <Compile Include="ServiceLocator.cs" />
     <Compile Include="Properties\Settings.Designer.cs">

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

@@ -31 +31 @@
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
   using HeuristicLab.Common;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
   [Item("Hive Client", "Connects to Hive and lists all submitted experiments by the current user.")]
@@ -67 +68 @@
     }
 
+    public HiveClient() { }
+    protected HiveClient(HiveClient original, Cloner cloner)
+      : base(original, cloner) {
+      this.hiveExperiments = cloner.Clone(original.hiveExperiments);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new HiveClient(this, cloner);
+    }
+
     private void RegisterHiveExperimentsEvent() {
       if (hiveExperiments != null) {
@@ -77 +87 @@
         hiveExperiments.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<HiveExperimentClient>>(hiveExperiments_ItemsRemoved);
       }
-    }
-
-    public HiveClient() {
-      
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      HiveClient clone = (HiveClient)base.Clone(cloner);
-      clone.hiveExperiments = (ItemList<HiveExperimentClient>)cloner.Clone(this.hiveExperiments);
-      return clone;
     }
 
@@ -135 +135 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    
+
     void hiveExperiments_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<HiveExperimentClient>> e) {
       if (!currentlyUpdating) {

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

@@ -113 +113 @@
     private JobResultPoller jobResultPoller;
 
+
     public HiveExperimentClient()
       : base(itemName, itemDescription) {
@@ -120 +121 @@
       InitTimer();
     }
-
     public HiveExperimentClient(DT.HiveExperiment hiveExperimentDto)
       : this() {
       UpdateFromDto(hiveExperimentDto);
     }
+    protected HiveExperimentClient(HiveExperimentClient original, Cloner cloner)
+      : base(original, cloner) {
+      this.resourceIds = original.resourceIds;
+      this.executionState = original.executionState;
+      this.executionTime = original.executionTime;
+      this.log = cloner.Clone(original.log);
+      this.lastUpdateTime = original.lastUpdateTime;
+      this.rootJobId = original.rootJobId;
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new HiveExperimentClient(this, cloner);
+    }
+
 
     public void UpdateFromDto(DT.HiveExperiment hiveExperimentDto) {
@@ -142 +155 @@
         RootJobId = this.rootJobId
       };
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      LogMessage("I am beeing cloned");
-      HiveExperimentClient clone = (HiveExperimentClient)base.Clone(cloner);
-      clone.resourceIds = this.resourceIds;
-      clone.executionState = this.executionState;
-      clone.executionTime = this.executionTime;
-      clone.log = (ILog)cloner.Clone(log);
-      clone.lastUpdateTime = this.lastUpdateTime;
-      clone.rootJobId = this.rootJobId;
-      return clone;
     }
 
@@ -417 +418 @@
       }
       if (HiveJob != null) {
-        jobResultPoller = new JobResultPoller(HiveJob, ApplicationConstants.RESULT_POLLING_INTERVAL);
+        jobResultPoller = new JobResultPoller(HiveJob, ApplicationConstants.ResultPollingInterval);
         RegisterResultPollingEvents();
       }

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

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>.