Changeset 4170 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

Timestamp:

08/06/10 09:20:18 (14 years ago)

Author:

cneumuel

Message:

refactoring of Result-Polling of HiveExperiment, polling is now much faster and code is cleaner (1092#)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs (modified) (7 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

@@ -21 +21 @@
     public override Image ItemImage {
       get {
-        if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-        else if (jobDto.State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-        else if (jobDto.State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
-        else if (jobDto.State == State.Abort) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
-        else if (jobDto.State == State.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
-        else if (jobDto.State == State.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        if (State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
+        else if (State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
+        else if (State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
+        else if (State == State.Abort) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else if (State == State.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
+        else if (State == State.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
       }
@@ -33 +33 @@
     [Storable]
     private JobDto jobDto;
+    /// <summary>
+    /// Some static information about the job. Don't use State-Information out of there
+    /// </summary>
     public JobDto JobDto {
       get { return jobDto; }
@@ -46 +49 @@
 
     [Storable]
+    private JobResult jobResult;
+    public JobResult JobResult {
+      private get { return jobResult; }
+      set {
+        if (jobResult != value) {
+          jobResult = value;
+          OnJobStateChanged();
+          OnToStringChanged();
+          OnItemImageChanged();
+        }
+      }
+    }
+
+    public State State {
+      get { return jobResult != null ? JobResult.State : JobDto.State; }
+    }
+
+    public double? Percentage {
+      get { return jobResult != null ? JobResult.Percentage : JobDto.Percentage; }
+    }
+
+    public string Exception {
+      get { return jobResult != null ? JobResult.Exception : JobDto.Exception; }
+    }
+
+    public DateTime? DateCalculated {
+      get { return jobResult != null ? JobResult.DateCalculated : JobDto.DateCalculated; }
+    }
+
+    public DateTime? DateFinished {
+      get { return jobResult != null ? JobResult.DateFinished : JobDto.DateFinished; }
+    }
+    
+    [Storable]
     private ResponseObject<SerializedJob> latestSnapshot;
     public ResponseObject<SerializedJob> LatestSnapshot {
@@ -52 +89 @@
         if (latestSnapshot != value) {
           latestSnapshot = value;
-          latestSnapshotTime = DateTime.Now;
+          if (value != null) {
+            latestSnapshotTime = DateTime.Now;
+          }
           SnapshotRequestedState = Experiment.SnapshotRequestedState.Idle;
           OnLatestSnapshotChanged();
@@ -114 +153 @@
     }
 
+    public event EventHandler JobStateChanged;
+    private void OnJobStateChanged() {
+      LogMessage("JobStateChanged");
+      EventHandler handler = JobStateChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
     public void LogMessage(string message) {
       lock (locker) {
@@ -128 +174 @@
       clone.log = (ILog)cloner.Clone(this.log);
       clone.optimizer = (IOptimizer)cloner.Clone(this.optimizer);
+      clone.jobResult = (JobResult)cloner.Clone(this.jobResult);
       return clone;
     }
@@ -142 +189 @@
     }
 
+
   }
 }