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

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

Location:

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

Files:

• HiveExperimentClient.cs (modified) (7 diffs)
• HiveJobClient.cs (modified) (5 diffs)
• HiveJobDownloader.cs (modified) (1 diff)

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

@@ -495 +495 @@
       jobResultPoller.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobResultPoller_ExceptionOccured);
       jobResultPoller.JobResultsReceived += new EventHandler<EventArgs<IEnumerable<LightweightJob>>>(jobResultPoller_JobResultReceived);
-      jobResultPoller.PollingStarted += new EventHandler(jobResultPoller_PollingStarted);
-      jobResultPoller.PollingFinished += new EventHandler(jobResultPoller_PollingFinished);
       jobResultPoller.IsPollingChanged += new EventHandler(jobResultPoller_IsPollingChanged);
     }
@@ -502 +500 @@
       jobResultPoller.ExceptionOccured -= new EventHandler<EventArgs<Exception>>(jobResultPoller_ExceptionOccured);
       jobResultPoller.JobResultsReceived -= new EventHandler<EventArgs<IEnumerable<LightweightJob>>>(jobResultPoller_JobResultReceived);
-      jobResultPoller.PollingStarted -= new EventHandler(jobResultPoller_PollingStarted);
-      jobResultPoller.PollingFinished -= new EventHandler(jobResultPoller_PollingFinished);
       jobResultPoller.IsPollingChanged -= new EventHandler(jobResultPoller_IsPollingChanged);
     }
     private void jobResultPoller_IsPollingChanged(object sender, EventArgs e) {
       this.IsPollingResults = jobResultPoller.IsPolling;
-    }
-    private void jobResultPoller_PollingFinished(object sender, EventArgs e) {
-      LogMessage("Polling results finished");
-    }
-    private void jobResultPoller_PollingStarted(object sender, EventArgs e) {
-      LogMessage("Polling results started");
     }
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightJob>> e) {
@@ -527 +517 @@
             OptimizerJob optimizerJob = LoadOptimizerJob(hj.Job.Id);
             if (optimizerJob == null) {
-              // something bad happened to this job. set to finished to allow the rest beeing downloaded
-              //hj.IsFinishedOptimizerDownloaded = true;
+              // something bad happened to this job. bad job, BAAAD job!
             } else {
               // if the job is paused, download but don't integrate into parent optimizer (to avoid Prepare)
               if (hj.Job.State == JobState.Paused) {
-                
+                hj.OptimizerJob = optimizerJob;
               } else {
                 if (lightweightJob.ParentJobId.HasValue) {
                   HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(lightweightJob.ParentJobId.Value);
                   parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.Job.Id);
-                } else {
-                  //this.HiveJob.IsFinishedOptimizerDownloaded = true;
                 }
               }
@@ -554 +541 @@
 
     private bool AllJobsFinished() {
-      //return HiveJob.GetAllHiveJobs().All(hj => hj.IsFinishedOptimizerDownloaded);
       return HiveJob.GetAllHiveJobs().All(j => j.Job.State == JobState.Finished
                                             || j.Job.State == JobState.Aborted
@@ -623 +609 @@
         this.HiveJob = allHiveJobs[this.rootJobId];
 
-
-        //// download them first
-        //IDictionary<Guid, Job> allJobs = new Dictionary<Guid, Job>();
-        //IDictionary<Guid, JobData> allJobDatas = new Dictionary<Guid, JobData>();
-        //foreach (LightweightJob lightweightJob in allResults) {
-        //  jobCount++;
-        //  progress.Status = string.Format("Downloading {0} of {1} jobs...", jobCount, totalJobCount);
-        //  allJobs.Add(lightweightJob.Id, service.GetJob(lightweightJob.Id));
-        //  allJobDatas.Add(lightweightJob.Id, service.GetJobData(lightweightJob.Id));
-        //  progress.ProgressValue = (double)jobCount / totalJobCount;
-        //}
-
-        //jobCount = 1;
-        //progress.Status = string.Format("Deserializing {0} of {1} jobs... ({2} kb)", jobCount, totalJobCount, allJobDatas[this.rootJobId].Data.Count() / 1024);
-        //this.HiveJob = new HiveJob(allJobs[this.rootJobId], allJobDatas[this.rootJobId], false);
-        //allJobDatas.Remove(this.rootJobId); // reduce memory footprint
-        //allJobs.Remove(this.rootJobId);
-        //progress.ProgressValue = (double)jobCount / totalJobCount;
-
-
         if (this.HiveJob.Job.DateFinished.HasValue && this.HiveJob.Job.DateCreated.HasValue) {
           this.ExecutionTime = this.HiveJob.Job.DateFinished.Value - this.HiveJob.Job.DateCreated.Value;
@@ -656 +622 @@
 
         // build child-job tree
-        //LoadChildResults(service, this.HiveJob, allResults, allJobs, allJobDatas, progress, totalJobCount, ref jobCount);
         BuildHiveJobTree(this.HiveJob, allJobs, allHiveJobs);
         StartResultPolling();
@@ -739 +704 @@
       return pluginDatas;
     }
-
-    /// <summary>
-    /// Gets the Ids of all plugins needed for executing the job.
-    /// All loaded plugins are assumed to be necessary.
-    /// If a plugin with the same name and version is already online, it is used. Otherwise the local plugin is uploaded.
-    /// If useLocalPlugins is true, all local plugins are uploaded regardless of the existence of the same plugin online.
-    /// </summary>
-    //public static List<Guid> GetPluginsNeededIds(bool useLocalPlugins) {
-    //  IEnumerable<IPluginDescription> localPlugins = ApplicationManager.Manager.Plugins;
-    //  List<Guid> pluginsNeededIds = new List<Guid>();
-
-    //  using (var service = ServiceLocator.Instance.GetService()) {
-    //    IEnumerable<Plugin> onlinePlugins = service.Obj.GetPlugins();
-
-    //    foreach (IPluginDescription localPlugin in localPlugins) {
-    //      Plugin found = onlinePlugins.Where(onlinePlugin => onlinePlugin.Name == localPlugin.Name && onlinePlugin.Version == localPlugin.Version).SingleOrDefault();
-    //      if (!useLocalPlugins && found != null) {
-    //        // plugin is available online; reuse
-    //        pluginsNeededIds.Add(found.Id);
-    //      } else {
-    //        // upload the plugin
-    //        Plugin p = new Plugin() { Name = localPlugin.Name, Version = localPlugin.Version, IsLocal = useLocalPlugins };
-    //        List<PluginData> pluginDatas = new List<PluginData>();
-
-    //        foreach (IPluginFile pf in localPlugin.Files) {
-    //          PluginData pluginData = new PluginData();
-
-    //          pluginData.Data = File.ReadAllBytes(pf.Name);
-    //          pluginDatas.Add(pluginData);
-    //        }
-    //        pluginsNeededIds.Add(service.Obj.AddPlugin(p, pluginDatas));
-    //      }
-    //    }
-    //  }
-    //  return pluginsNeededIds;
-    //}
     #endregion
 

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;
+      });
     }
   }

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

@@ -88 +88 @@
         HiveJob hiveJob = new HiveJob(job, jobData, false);
         jobData.Data = null; // reduce memory consumption.
-        hiveJob.OptimizerJob.Prepare(); // reduce memory consumption.
         hiveJob.Job = job;
         return hiveJob;