Changeset 6200 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/RefreshableHiveExperiment.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/RefreshableHiveExperiment.cs (modified) (15 diffs)

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

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Hive;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-  [StorableClass]
   public class RefreshableHiveExperiment : IHiveItem, IDeepCloneable, IContent, IProgressReporter {
     private JobResultPoller jobResultPoller;
@@ -37 +35 @@
     private static object locker = new object();
 
-    [Storable]
     private HiveExperiment hiveExperiment;
     public HiveExperiment HiveExperiment {
@@ -55 +52 @@
 
     /** include jobs when refreshing **/
-    [Storable]
     private bool includeJobs;
     public bool IncludeJobs {
@@ -62 +58 @@
     }
 
-    [Storable]
     private bool refreshAutomatically;
     public bool RefreshAutomatically {
@@ -83 +78 @@
     }
 
-    [Storable]
     private bool isControllable = true;
     public bool IsControllable {
@@ -95 +89 @@
     }
 
-    [Storable]
     private ILog log;
     public ILog Log {
@@ -120 +113 @@
       cloner.RegisterClonedObject(original, this);
       this.HiveExperiment = original.HiveExperiment;
-      this.RefreshAutomatically = original.RefreshAutomatically;
       this.IncludeJobs = original.IncludeJobs;
       this.IsControllable = original.IsControllable;
       this.Log = cloner.Clone(original.Log);
+      this.RefreshAutomatically = false; // do not start results polling automatically
     }
     public IDeepCloneable Clone(Cloner cloner) {
@@ -196 +189 @@
 
               if (exception != null) {
-                var ex = new ConcurrentJobDownloaderException("Downloading job failed.", exception);
+                var ex = new ConcurrentJobDownloaderException("Downloading job failed", exception);
                 LogException(ex);
                 localHiveJob.IsDownloading = false;
@@ -206 +199 @@
               } else {
                 // if the job is paused, download but don't integrate into parent optimizer (to avoid Prepare)
-
 
                 if (localJob.State == JobState.Paused) {
@@ -231 +223 @@
       }
       UpdateTotalExecutionTime();
-      UpdateStats();
+      UpdateStatistics();
     }
 
@@ -237 +229 @@
     private void LogException(Exception exception) {
       lock (logLocker) {
-        log.LogException(exception);
+        this.log.LogException(exception);
       }
     }
@@ -243 +235 @@
     private void LogMessage(string message) {
       lock (logLocker) {
-        log.LogMessage(message);
+        this.log.LogMessage(message);
       }
     }
@@ -256 +248 @@
     }
 
-    private void UpdateStats() {
+    private void UpdateStatistics() {
       var jobs = hiveExperiment.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);
+      OnJobStatisticsChanged();
     }
 
@@ -269 +262 @@
                                                    && j.IsFinishedJobDownloaded);
     }
-
-    //public bool AllJobsFinishedAndDownloaded() {
-    //  return this.AllJobsFinished() && hiveExperiment.GetAllHiveJobs().All(j => j.JobItem.;
-    //}
 
     private void jobResultPoller_ExceptionOccured(object sender, EventArgs<Exception> e) {
@@ -359 +348 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    public event EventHandler JobStatisticsChanged;
+    private void OnJobStatisticsChanged() {
+      var handler = JobStatisticsChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion