Changeset 6006 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

Timestamp:

04/12/11 13:43:05 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed relationship between Job and HiveExperiment. There is no more HiveExperiment.RootJobId, instead there is Job.HiveExperimentId.
• One HiveExperiment can now have multiple Experiments.
• TreeView supports multiple root nodes
• HiveEngine creates a HiveExperiment for each set of jobs, so jobs cannot be without an parent experiment anymore (no more loose jobs)
• updated ExperimentManager binaries

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs (modified) (18 diffs)

branches/HeuristicLab.Hive-3.4/sources

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperiment.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Clients.Hive {
-
+  [StorableClass]
   public partial class HiveExperiment : IDeepCloneable, IContent, IProgressReporter {
     private JobResultPoller jobResultPoller;
 
+    [Storable]
     private bool useLocalPlugins;
     public bool UseLocalPlugins {
@@ -40 +42 @@
     }
 
+    [Storable]
     private ExecutionState executionState;
     public ExecutionState ExecutionState {
@@ -51 +54 @@
     }
 
+    [Storable]
     private TimeSpan executionTime;
     public TimeSpan ExecutionTime {
@@ -62 +66 @@
     }
 
-    private HiveJob hiveJob;
-    public HiveJob HiveJob {
-      get { return hiveJob; }
+    [Storable]
+    private ItemCollection<HiveJob> hiveJobs;
+    public ItemCollection<HiveJob> HiveJobs {
+      get { return hiveJobs; }
       set {
-        DeregisterHiveJobEvents();
-        if (hiveJob != value) {
-          hiveJob = value;
-          RegisterHiveJobEvents();
-          OnHiveJobChanged();
-        }
-      }
-    }
-
+        DeregisterHiveJobsEvents();
+        if (hiveJobs != value) {
+          hiveJobs = value;
+          RegisterHiveJobsEvents();
+          OnHiveJobsChanged();
+        }
+      }
+    }
+
+    [Storable]
     private bool isProgressing;
     public bool IsProgressing {
@@ -87 +93 @@
 
     /** include jobs when refreshing **/
+    [Storable]
     private bool includeJobs;
     public bool IncludeJobs {
@@ -93 +100 @@
     }
 
+    [Storable]
     private bool refreshAutomatically;
     public bool RefreshAutomatically {
@@ -109 +117 @@
     }
 
+    [Storable]
     private IProgress progress;
     public IProgress Progress {
@@ -124 +133 @@
     protected HiveExperiment(HiveExperiment original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      this.RootJobId = original.RootJobId;
       this.OwnerUserId = original.OwnerUserId;
       this.DateCreated = original.DateCreated;
@@ -158 +166 @@
     }
 
-    public event EventHandler HiveJobChanged;
-    private void OnHiveJobChanged() {
+    public event EventHandler HiveJobsChanged;
+    private void OnHiveJobsChanged() {
       if (jobResultPoller != null && jobResultPoller.IsPolling) {
         jobResultPoller.Stop();
         DeregisterResultPollingEvents();
       }
-      if (HiveJob != null && HiveJob.Job.Id != Guid.Empty) {
+      if (HiveJobs != null && HiveJobs.Count > 0 && GetAllHiveJobs().All(x => x.Job.Id != Guid.Empty)) {
         if (this.RefreshAutomatically)
           StartResultPolling();
       }
-      EventHandler handler = HiveJobChanged;
+      EventHandler handler = HiveJobsChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -185 +193 @@
     #endregion
 
-    private void RegisterHiveJobEvents() {
-      if (HiveJob != null) {
-        HiveJob.JobStateChanged += new EventHandler(HiveJob_JobStateChanged);
-      }
-    }
-
-    private void DeregisterHiveJobEvents() {
-      if (HiveJob != null) {
-        HiveJob.JobStateChanged -= new EventHandler(HiveJob_JobStateChanged);
-      }
+    private void RegisterHiveJobsEvents() {
+      //if (HiveJobs != null) {
+      //  HiveJobs.JobStateChanged += new EventHandler(HiveJob_JobStateChanged);
+      //}
+    }
+
+    private void DeregisterHiveJobsEvents() {
+      //if (HiveJobs != null) {
+      //  HiveJobs.JobStateChanged -= new EventHandler(HiveJob_JobStateChanged);
+      //}
     }
 
     private void HiveJob_JobStateChanged(object sender, EventArgs e) {
-      if (this.HiveJob != null) {
-        this.RootJobId = HiveJob.Job.Id;
-      }
-    }
-
-    public Experiment GetExperiment() {
-      if (this.HiveJob != null) {
-        return HiveJob.OptimizerJob.OptimizerAsExperiment;
+      //if (this.HiveJobs != null) {
+      //  this.RootJobId = HiveJobs.Job.Id;
+      //}
+    }
+
+    public Experiment GetExperiment(int idx) {
+      if (this.HiveJobs != null) {
+        var hj = HiveJobs.ElementAtOrDefault(idx);
+        if (hj != null)
+          return hj.OptimizerJob.OptimizerAsExperiment;
       }
       return null;
     }
 
+    public void AddExperiment(Experiment experiment) {
+      if (this.HiveJobs == null) 
+        this.HiveJobs = new ItemCollection<HiveJob>();
+      this.HiveJobs.Add(new HiveJob(experiment));
+    }
+
     public void SetExperiment(Experiment experiment) {
-      this.HiveJob = new HiveJob(experiment);
+      if (this.HiveJobs == null)
+        this.HiveJobs = new ItemCollection<HiveJob>();
+      else
+        this.HiveJobs.Clear();
+      this.HiveJobs.Add(new HiveJob(experiment));
     }
 
@@ -225 +245 @@
     public void StartResultPolling() {
       if (jobResultPoller == null) {
-        jobResultPoller = new JobResultPoller(HiveJob, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
+        jobResultPoller = new JobResultPoller(HiveJobs, /*ApplicationConstants.ResultPollingInterval*/new TimeSpan(0, 0, 5)); //TODO: find a better place for ApplicationConstants
         RegisterResultPollingEvents();
       }
@@ -235 +255 @@
 
     public void StopResultPolling() {
-      if (jobResultPoller.IsPolling) {
+      if (jobResultPoller != null && jobResultPoller.IsPolling) {
         jobResultPoller.Stop();
       }
@@ -256 +276 @@
     private void jobResultPoller_JobResultReceived(object sender, EventArgs<IEnumerable<LightweightJob>> e) {
       foreach (LightweightJob lightweightJob in e.Value) {
-        HiveJob hj = hiveJob.GetHiveJobByJobId(lightweightJob.Id);
+        HiveJob hj = GetHiveJobById(lightweightJob.Id);
         if (hj != null) {
           DateTime lastJobDataUpdate = hj.Job.LastJobDataUpdate;
@@ -272 +292 @@
               } else {
                 if (lightweightJob.ParentJobId.HasValue) {
-                  HiveJob parentHiveJob = HiveJob.GetHiveJobByJobId(lightweightJob.ParentJobId.Value);
+                  HiveJob parentHiveJob = GetHiveJobById(lightweightJob.ParentJobId.Value);
                   parentHiveJob.UpdateChildOptimizer(optimizerJob, hj.Job.Id);
                 }
@@ -290 +310 @@
     }
 
+    public HiveJob GetHiveJobById(Guid jobId) {
+      foreach (HiveJob job in HiveJobs) {
+        HiveJob hj = job.GetHiveJobByJobId(jobId);
+        if (hj != null)
+          return hj;
+      }
+      return null;
+    }
+
     private void UpdateStats() {
-      var jobs = HiveJob.GetAllHiveJobs();
+      var jobs = GetAllHiveJobs();
       this.JobCount = jobs.Count();
       this.CalculatingCount = jobs.Count(j => j.Job.State == JobState.Calculating);
@@ -297 +326 @@
     }
 
-    private bool AllJobsFinished() {
-      return HiveJob.GetAllHiveJobs().All(j => j.Job.State == JobState.Finished
+    public IEnumerable<HiveJob> GetAllHiveJobs() {
+      var jobs = new List<HiveJob>();
+      foreach (HiveJob job in HiveJobs) {
+        jobs.AddRange(job.GetAllHiveJobs());
+      }
+      return jobs;
+    }
+
+    public bool AllJobsFinished() {
+      return GetAllHiveJobs().All(j => j.Job.State == JobState.Finished
                                             || j.Job.State == JobState.Aborted
                                             || j.Job.State == JobState.Failed);
@@ -308 +345 @@
 
     public void UpdateTotalExecutionTime() {
-      this.ExecutionTime = TimeSpan.FromMilliseconds(HiveJob.GetAllHiveJobs().Sum(x => x.Job.ExecutionTime.HasValue ? x.Job.ExecutionTime.Value.TotalMilliseconds : 0));
+      this.ExecutionTime = TimeSpan.FromMilliseconds(GetAllHiveJobs().Sum(x => x.Job.ExecutionTime.HasValue ? x.Job.ExecutionTime.Value.TotalMilliseconds : 0));
     }
     #endregion
@@ -320 +357 @@
       }
     }
+
+    public bool IsFinished() {
+      return HiveJobs != null
+        && HiveJobs.All(x => x.Job.DateFinished.HasValue && x.Job.DateCreated.HasValue);
+    }
   }
 }

@@ -4 +4 @@
 PrecompiledWeb
 CreateEventLogSources
+WindowsFormsTestProject