Changeset 4813

Timestamp:

11/16/10 14:48:34 (14 years ago)

Author:

cneumuel

Message:

#1260

• minor bug fixes.
• updated to latest trunk

Location:

branches/HeuristicLab.Hive.ExperimentManager

Files:

• Bin/HeuristicLab.DataAccess-3.3.dll (modified) (previous)
• Bin/HeuristicLab.Hive.Contracts-3.3.dll (modified) (previous)
• Bin/HeuristicLab.Hive.JobBase-3.3.dll (modified) (previous)
• Bin/HeuristicLab.Hive.Tracing-3.3.dll (modified) (previous)
• HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs (modified) (5 diffs)
• HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs (modified) (11 diffs)

branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager/3.3/HiveExperiment.cs

@@ -72 +72 @@
       get { return log; }
     }
-    
+
     private string resourceIds;
     public string ResourceIds {
@@ -83 +83 @@
       }
     }
-    
+
     private bool isPollingResults;
     public bool IsPollingResults {
@@ -465 +465 @@
             LogMessage(hj.JobDto.Id, "Downloading optimizer for job");
             OptimizerJob optimizerJob = LoadOptimizerJob(hj.JobDto.Id);
-            if (jobResult.ParentJobId.HasValue) {
-              HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(jobResult.ParentJobId.Value);
-              parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.JobDto.Id);
+            if (optimizerJob == null) {
+              // something bad happened to this job. set to finished to allow the rest beeing downloaded
+              hj.IsFinishedOptimizerDownloaded = true;
             } else {
-              this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              if (jobResult.ParentJobId.HasValue) {
+                HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(jobResult.ParentJobId.Value);
+                parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.JobDto.Id);
+              } else {
+                this.HiveJob.IsFinishedOptimizerDownloaded = true;
+              }
             }
           }
@@ -584 +589 @@
         jobCount++;
         progress.Status = string.Format("Deserializing {0} of {1} jobs ({2} kb)...", jobCount, totalJobCount, allSerializedJobs[jobResult.Id].SerializedJobData.Count() / 1024);
-        OptimizerJob optimizerJob = SerializedJob.Deserialize<OptimizerJob>(allSerializedJobs[jobResult.Id].SerializedJobData);
+        OptimizerJob optimizerJob = null;
+        try {
+          optimizerJob = SerializedJob.Deserialize<OptimizerJob>(allSerializedJobs[jobResult.Id].SerializedJobData);
+        }
+        catch {
+          optimizerJob = null;
+        }
         progress.ProgressValue = (double)jobCount / totalJobCount;
         HiveJob childHiveJob = new HiveJob(optimizerJob, false);
@@ -598 +609 @@
       using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
         ResponseObject<SerializedJob> serializedJob = service.Obj.GetLastSerializedResult(jobId);
-        return SerializedJob.Deserialize<OptimizerJob>(serializedJob.Obj.SerializedJobData);
+        try {
+          return SerializedJob.Deserialize<OptimizerJob>(serializedJob.Obj.SerializedJobData);
+        }
+        catch {
+          return null;
+        }
       }
     }

branches/HeuristicLab.Hive.ExperimentManager/HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs

@@ -31 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure.Manager;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Hive.ExperimentManager {
@@ -79 +81 @@
           DergisterOptimizerEvents();
           job = value;
-          if (job.ExecutionState == ExecutionState.Stopped) {
+          if (job != null && job.ExecutionState == ExecutionState.Stopped) {
             IsFinishedOptimizerDownloaded = true;
           }
@@ -142 +144 @@
       this.syncJobsWithOptimizers = autoCreateChildHiveJobs;
       this.JobDto = serializedJob.JobInfo;
-      this.Job = SerializedJob.Deserialize<OptimizerJob>(serializedJob.SerializedJobData);
+      try {
+        this.Job = SerializedJob.Deserialize<OptimizerJob>(serializedJob.SerializedJobData);
+      }
+      catch {
+        this.Job = null;
+      }
       this.syncJobsWithOptimizers = true;
     }
@@ -163 +170 @@
     /// </summary>
     private void UpdateChildHiveJobs() {
-      if (Job != null && syncJobsWithOptimizers) {
+      if (Job != null && Job.Optimizer != null && syncJobsWithOptimizers) {
         if (Job.Optimizer is Optimization.Experiment) {
           Optimization.Experiment experiment = (Optimization.Experiment)Job.Optimizer;
@@ -184 +191 @@
 
     private void RegisterOptimizerEvents() {
-      if (Job != null) {
+      if (Job != null && Job.Optimizer != null) {
         if (Job.Optimizer is Optimization.Experiment) {
           Optimization.Experiment experiment = Job.OptimizerAsExperiment;
@@ -288 +295 @@
       this.childHiveJobs.Add(hiveJob);
       syncJobsWithOptimizers = false;
-      if (this.Job.Optimizer is Optimization.Experiment) {
-        if (!this.Job.OptimizerAsExperiment.Optimizers.Contains(hiveJob.Job.Optimizer)) {
-          UpdateOptimizerInExperiment(this.Job.OptimizerAsExperiment, hiveJob.Job);
-        }
-      } else if (this.Job.Optimizer is Optimization.BatchRun) {
-        UpdateOptimizerInBatchRun(this.Job.OptimizerAsBatchRun, hiveJob.Job);
+      if (this.Job != null && hiveJob.Job != null) {
+        if (this.Job.Optimizer is Optimization.Experiment) {
+          if (!this.Job.OptimizerAsExperiment.Optimizers.Contains(hiveJob.Job.Optimizer)) {
+            UpdateOptimizerInExperiment(this.Job.OptimizerAsExperiment, hiveJob.Job);
+          }
+        } else if (this.Job.Optimizer is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.Job.OptimizerAsBatchRun, hiveJob.Job);
+        }
       }
       syncJobsWithOptimizers = true;
@@ -308 +317 @@
       bool childIsFinishedOptimizerDownloaded = false;
 
-      if (this.Job.Optimizer is Optimization.Experiment) {
-        UpdateOptimizerInExperiment(this.Job.OptimizerAsExperiment, optimizerJob);
-        childIsFinishedOptimizerDownloaded = true;
-      } else if (this.Job.Optimizer is Optimization.BatchRun) {
-        UpdateOptimizerInBatchRun(this.Job.OptimizerAsBatchRun, optimizerJob);
-        if (this.Job.OptimizerAsBatchRun.Repetitions == this.Job.Optimizer.Runs.Count) {
+      if (this.Job != null && this.Job.Optimizer != null) {
+        if (this.Job.Optimizer is Optimization.Experiment) {
+          UpdateOptimizerInExperiment(this.Job.OptimizerAsExperiment, optimizerJob);
           childIsFinishedOptimizerDownloaded = true;
-        }
-      } else {
-        childIsFinishedOptimizerDownloaded = optimizerJob.Optimizer.ExecutionState == ExecutionState.Stopped;
+        } else if (this.Job.Optimizer is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.Job.OptimizerAsBatchRun, optimizerJob);
+          if (this.Job.OptimizerAsBatchRun.Repetitions == this.Job.Optimizer.Runs.Count) {
+            childIsFinishedOptimizerDownloaded = true;
+          }
+        } else {
+          childIsFinishedOptimizerDownloaded = optimizerJob.Optimizer.ExecutionState == ExecutionState.Stopped;
+        }
       }
 
@@ -374 +385 @@
     /// </summary>
     internal void SetIndexInParentOptimizerList(HiveJob parentHiveJob) {
-      if (parentHiveJob != null) {
+      if (parentHiveJob != null && parentHiveJob.Job != null && parentHiveJob.Job.Optimizer != null) {
         if (parentHiveJob.Job.Optimizer is Optimization.Experiment) {
           this.Job.IndexInParentOptimizerList = parentHiveJob.Job.OptimizerAsExperiment.Optimizers.IndexOf(this.Job.Optimizer);
@@ -389 +400 @@
 
     public override string ToString() {
-      if (jobDto != null) {
+      if (job != null) {
         return job.ToString();
       } else {
@@ -420 +431 @@
     /// </param>
     public SerializedJob GetAsSerializedJob(bool withoutChildOptimizers) {
+      if (this.job == null || this.job.Optimizer == null)
+        return null;
+
       byte[] jobByteArray;
       if (withoutChildOptimizers && this.Job.Optimizer is Optimization.Experiment) {
@@ -450 +464 @@
     /// </summary>
     private void UpdateRequiredPlugins() {
-      this.JobDto.PluginsNeeded = HivePluginInfoDto.FindPluginsNeeded(job.GetType());
+      if (job != null) {
+        //this.JobDto.PluginsNeeded = HivePluginInfoDto.FindPluginsNeeded(job);
+        this.JobDto.PluginsNeeded = ApplicationManager.Manager.Plugins.Select(x => new HivePluginInfoDto { Name = x.Name, Version = x.Version }).ToList();
+      }
     }