Changeset 6721 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableHiveExperiment.cs

Timestamp:

09/08/11 13:41:25 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed Job to Task

File:

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

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableHiveExperiment.cs

@@ -225 +225 @@
     }
     #endregion
-    
+
     #region JobResultPoller Events
 
@@ -248 +248 @@
     private void RegisterResultPollingEvents() {
       jobResultPoller.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobResultPoller_ExceptionOccured);
-      jobResultPoller.JobResultsReceived += new EventHandler<EventArgs<IEnumerable<LightweightJob>>>(jobResultPoller_JobResultReceived);
+      jobResultPoller.JobResultsReceived += new EventHandler<EventArgs<IEnumerable<LightweightTask>>>(jobResultPoller_JobResultReceived);
       jobResultPoller.IsPollingChanged += new EventHandler(jobResultPoller_IsPollingChanged);
     }
     private void DeregisterResultPollingEvents() {
       jobResultPoller.ExceptionOccured -= new EventHandler<EventArgs<Exception>>(jobResultPoller_ExceptionOccured);
-      jobResultPoller.JobResultsReceived -= new EventHandler<EventArgs<IEnumerable<LightweightJob>>>(jobResultPoller_JobResultReceived);
+      jobResultPoller.JobResultsReceived -= new EventHandler<EventArgs<IEnumerable<LightweightTask>>>(jobResultPoller_JobResultReceived);
       jobResultPoller.IsPollingChanged -= new EventHandler(jobResultPoller_IsPollingChanged);
     }
@@ -262 +262 @@
       }
     }
-    private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightJob>> e) {
-      foreach (LightweightJob lightweightJob in e.Value) {
+    private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightTask>> e) {
+      foreach (LightweightTask lightweightJob in e.Value) {
         HiveJob hiveJob = GetHiveJobById(lightweightJob.Id);
         if (hiveJob != null) {
           // lastJobDataUpdate equals DateTime.MinValue right after it was uploaded. When the first results are polled, this value is updated
-          if (hiveJob.Job.State == JobState.Offline && lightweightJob.State != JobState.Finished && lightweightJob.State != JobState.Failed && lightweightJob.State != JobState.Aborted) {
+          if (hiveJob.Job.State == TaskState.Offline && lightweightJob.State != TaskState.Finished && lightweightJob.State != TaskState.Failed && lightweightJob.State != TaskState.Aborted) {
             hiveJob.Job.LastJobDataUpdate = lightweightJob.LastJobDataUpdate;
           }
@@ -289 +289 @@
                 // if the job is paused, download but don't integrate into parent optimizer (to avoid Prepare)
 
-                if (localJob.State == JobState.Paused) {
+                if (localJob.State == TaskState.Paused) {
                   localHiveJob.ItemJob = itemJob;
                 } else {
-                  if (localJob.ParentJobId.HasValue) {
-                    HiveJob parentHiveJob = GetHiveJobById(localJob.ParentJobId.Value);
+                  if (localJob.ParentTaskId.HasValue) {
+                    HiveJob parentHiveJob = GetHiveJobById(localJob.ParentTaskId.Value);
                     parentHiveJob.IntegrateChild(itemJob, localJob.Id);
                   } else {
@@ -327 +327 @@
       var jobs = this.GetAllHiveJobs();
       hiveExperiment.JobCount = jobs.Count();
-      hiveExperiment.CalculatingCount = jobs.Count(j => j.Job.State == JobState.Calculating);
-      hiveExperiment.FinishedCount = jobs.Count(j => j.Job.State == JobState.Finished);
+      hiveExperiment.CalculatingCount = jobs.Count(j => j.Job.State == TaskState.Calculating);
+      hiveExperiment.FinishedCount = jobs.Count(j => j.Job.State == TaskState.Finished);
       OnJobStatisticsChanged();
     }
 
     public bool AllJobsFinished() {
-      return this.GetAllHiveJobs().All(j => (j.Job.State == JobState.Finished
-                                                   || j.Job.State == JobState.Aborted
-                                                   || j.Job.State == JobState.Failed)
+      return this.GetAllHiveJobs().All(j => (j.Job.State == TaskState.Finished
+                                                   || j.Job.State == TaskState.Aborted
+                                                   || j.Job.State == TaskState.Failed)
                                                    && j.IsFinishedJobDownloaded);
     }