Changeset 6200 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs

Timestamp:

05/16/11 00:18:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• stability improvements for HiveEngine

File:

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

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

@@ -86 +86 @@
           itemJob = value;
           RegisterItemJobEvents();
-          OnJobItemChanged();
+          OnItemJobChanged();
           IsFinishedJobDownloaded = true;
         }
@@ -166 +166 @@
     protected virtual void RegisterItemJobEvents() {
       if (ItemJob != null) {
-        ItemJob.ComputeInParallelChanged += new EventHandler(JobItem_ComputeInParallelChanged);
-        ItemJob.ToStringChanged += new EventHandler(JobItem_ToStringChanged);
+        ItemJob.ComputeInParallelChanged += new EventHandler(ItemJob_ComputeInParallelChanged);
+        ItemJob.ToStringChanged += new EventHandler(ItemJob_ToStringChanged);
       }
     }
     protected virtual void DergisterItemJobEvents() {
       if (ItemJob != null) {
-        ItemJob.ComputeInParallelChanged -= new EventHandler(JobItem_ComputeInParallelChanged);
-        ItemJob.ToStringChanged -= new EventHandler(JobItem_ToStringChanged);
+        ItemJob.ComputeInParallelChanged -= new EventHandler(ItemJob_ComputeInParallelChanged);
+        ItemJob.ToStringChanged -= new EventHandler(ItemJob_ToStringChanged);
       }
     }
@@ -188 +188 @@
     }
 
-    protected virtual void JobItem_ToStringChanged(object sender, EventArgs e) {
+    protected virtual void ItemJob_ToStringChanged(object sender, EventArgs e) {
       this.OnToStringChanged();
     }
 
-    protected virtual void JobItem_ComputeInParallelChanged(object sender, EventArgs e) {
+    protected virtual void ItemJob_ComputeInParallelChanged(object sender, EventArgs e) {
       if (ItemJob != null && syncJobsWithOptimizers) {
         this.UpdateChildHiveJobs();
@@ -203 +203 @@
 
     public override string ToString() {
-      if (itemJob != null) {
+      if (itemJob != null && itemJob.Item != null) {
         return itemJob.ToString();
       } else {
-        return base.ToString();
+        return Job.Id.ToString();
       }
     }
@@ -262 +262 @@
     }
 
-    public event EventHandler JobItemChanged;
-    private void OnJobItemChanged() {
-      JobItem_ComputeInParallelChanged(this, EventArgs.Empty);
-      var handler = JobItemChanged;
+    public event EventHandler ItemJobChanged;
+    private void OnItemJobChanged() {
+      ItemJob_ComputeInParallelChanged(this, EventArgs.Empty);
+      var handler = ItemJobChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -410 +410 @@
     public virtual void IntegrateChild(ItemJob job, Guid childJobId) { }
 
+    /// <summary>
+    /// Delete ItemJob
+    /// </summary>
+    public void ClearData() {
+      this.ItemJob.Item = null;
+    }
   }