Changeset 5793 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

Timestamp:

03/22/11 15:54:58 (13 years ago)

Author:

cneumuel

Message:

#1233

• implemented correct downloading of paused jobs. its now also possible to change parameters and resume a algorithm
• removed Prepare() calls in ExperimentManager and in slave, as it prevents corrent resuming of paused jobs
• made events in ItemTreeView be invoked in the correct thread
• reduced log output in ExperimentManager

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

@@ -70 +70 @@
     public OptimizerJob OptimizerJob {
       get { return optimizerJob; }
-      private set {
+      internal set {
         if (optimizerJob != null && syncJobsWithOptimizers) {
           this.childHiveJobs.Clear();
@@ -289 +289 @@
       syncJobsWithOptimizers = false;
       if (this.OptimizerJob != null && hiveJob.OptimizerJob != null) {
+        // if job is in state Paused, it has to preserve its ResultCollection, which is cleared when a optimizer is added to an experiment
+        OptimizerJob optimizerJobClone = null;
+        if (hiveJob.Job.State == JobState.Paused) {
+          optimizerJobClone = (OptimizerJob)hiveJob.OptimizerJob.Clone();
+        }
+
         if (this.OptimizerJob.Optimizer is Optimization.Experiment) {
           if (!this.OptimizerJob.OptimizerAsExperiment.Optimizers.Contains(hiveJob.OptimizerJob.Optimizer)) {
@@ -295 +301 @@
         } else if (this.OptimizerJob.Optimizer is Optimization.BatchRun) {
           UpdateOptimizerInBatchRun(this.OptimizerJob.OptimizerAsBatchRun, hiveJob.OptimizerJob);
+        }
+
+        if (hiveJob.Job.State == JobState.Paused) {
+          hiveJob.OptimizerJob = optimizerJobClone;
         }
       }
@@ -524 +534 @@
     private void OnOptimizerJobChanged() {
       OptimizerJob_ComputeInParallelChanged(this, EventArgs.Empty);
-      var handler = JobChanged;
+      var handler = OptimizerJobChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -649 +659 @@
 
     public void Restart() {
-      ServiceLocator.Instance.CallHiveService(s => s.RestartJob(this.job.Id));
+      ServiceLocator.Instance.CallHiveService(service => {
+        JobData jobData = new JobData();
+        jobData.JobId = this.job.Id;
+        jobData.Data = PersistenceUtil.Serialize(this.optimizerJob);
+        service.UpdateJobData(this.Job, jobData);
+        service.RestartJob(this.job.Id);
+        Job job = service.GetJob(this.job.Id);
+        this.job.LastJobDataUpdate = job.LastJobDataUpdate;
+      });
     }
   }