Changeset 6111

Timestamp:

05/03/11 17:14:02 (14 years ago)

Author:

cneumuel

Message:

#1233

• improved the way jobs are downloaded by ExperimentManager and HiveEngine

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive/3.4/ExperimentManager/ExperimentManagerClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/JobDownloader.cs (added)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/JobResultPoller.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.4/ExperimentManager/OptimizerHiveJob.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/Jobs/EngineJob.cs (added)
• HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs (modified) (4 diffs)
• HeuristicLab.HiveEngine/3.4/HeuristicLab.HiveEngine-3.4.csproj (modified) (1 diff)
• HeuristicLab.HiveEngine/3.4/HiveEngine.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using System.Threading;
 using HeuristicLab.Clients.Hive.ExperimentManager;
-using HeuristicLab.Clients.Hive.Jobs;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Hive;
 using HeuristicLab.PluginInfrastructure;
 
@@ -373 +373 @@
     }
 
-    public static OptimizerJob LoadOptimizerJob(Guid jobId) {
+    public static ItemJob LoadItemJob(Guid jobId) {
       JobData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));
       try {
-        return PersistenceUtil.Deserialize<OptimizerJob>(jobData.Data);
+        return PersistenceUtil.Deserialize<ItemJob>(jobData.Data);
       }
       catch {

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

@@ -344 +344 @@
       }
     }
+
+    public virtual void IntegrateChild(ItemJob job, Guid childJobId) { }
   }
 

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Clients.Hive {
-  internal class JobResultPoller {
+  public class JobResultPoller {
     private bool stopRequested { get; set; }
     private AutoResetEvent waitHandle;
     private Thread thread;
 
-    private IEnumerable<HiveJob> hiveJobs;
-    public IEnumerable<HiveJob> HiveJobs {
-      get { return hiveJobs; }
-      set { hiveJobs = value; }
+    private Guid hiveExperimentId;
+    public Guid HiveExperimentId {
+      get { return hiveExperimentId; }
+      set { hiveExperimentId = value; }
     }
 
@@ -54 +54 @@
     }
 
-    public JobResultPoller(IEnumerable<HiveJob> hiveJobs, TimeSpan interval) {
+    public JobResultPoller(Guid hiveExperimentId, TimeSpan interval) {
       this.isPolling = false;
-      this.hiveJobs = hiveJobs;
+      this.hiveExperimentId = hiveExperimentId;
       this.interval = interval;
     }
@@ -75 +75 @@
     }
 
-    public void RunPolling() {
+    private void RunPolling() {
       try {
         waitHandle = new AutoResetEvent(false);
@@ -94 +94 @@
     }
 
-    private void FetchJobResults() {
-      ServiceLocator.Instance.CallHiveService(service => {
+    public IEnumerable<LightweightJob> FetchJobResults() {
+      return ServiceLocator.Instance.CallHiveService(service => {
         var responses = new List<LightweightJob>();
-        foreach (HiveJob hiveJob in HiveJobs) {
-          responses.AddRange(service.GetLightweightChildJobs(hiveJob.Job.Id, true, true));
-        }
+        responses.AddRange(service.GetLightweightExperimentJobs(hiveExperimentId));
         OnJobResultsReceived(responses);
+        return responses;
       });
     }

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

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HeuristicLab.Hive;
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
@@ -169 +170 @@
     ///   add the runs from the optimizerJob to the batchrun and replace the Optimizer
     /// </summary>
-    public void UpdateChildOptimizer(OptimizerJob optimizerJob, Guid childJobId) {
+    public override void IntegrateChild(ItemJob job, Guid childJobId) {
+      var optimizerJob = (OptimizerJob)job;
       syncJobsWithOptimizers = false; // don't sync with optimizers during this method
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -120 +120 @@
     <Compile Include="Exceptions\JobResultPollingException.cs" />
     <Compile Include="Exceptions\OptimizerNotFoundException.cs" />
+    <Compile Include="ExperimentManager\JobDownloader.cs" />
     <Compile Include="ExperimentManager\ExperimentManagerClient.cs" />
     <Compile Include="ExperimentManager\HiveJobDownloader.cs" />
@@ -130 +131 @@
     <Compile Include="Exceptions\ResourceNotFoundException.cs" />
     <Compile Include="IServiceLocator.cs" />
+    <Compile Include="Jobs\EngineJob.cs" />
     <Compile Include="Jobs\OptimizerJob.cs" />
     <Compile Include="HeuristicLabClientsHivePlugin.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

@@ -131 +131 @@
       Item.NameChanged += new EventHandler(optimizer_NameChanged);
       Item.NameChanging += new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
+      Item.ExecutionStateChanged += new EventHandler(optimizer_ExecutionStateChanged);
+      Item.ExecutionTimeChanged += new EventHandler(optimizer_ExecutionTimeChanged);
+      Item.Started += new EventHandler(optimizer_Started);
     }
 
@@ -140 +143 @@
       Item.NameChanged -= new EventHandler(optimizer_NameChanged);
       Item.NameChanging -= new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
+      Item.ExecutionStateChanged -= new EventHandler(optimizer_ExecutionStateChanged);
+      Item.ExecutionTimeChanged -= new EventHandler(optimizer_ExecutionTimeChanged);
+      Item.Started -= new EventHandler(optimizer_Started);      
       base.DeregisterItemEvents();
     }
@@ -159 +165 @@
     }
 
+    protected virtual void optimizer_Started(object sender, EventArgs e) {
+      OnJobStarted();
+    }
+
     protected virtual void optimizer_Stopped(object sender, EventArgs e) {
       OnJobStopped();
@@ -165 +175 @@
     protected virtual void optimizer_Paused(object sender, EventArgs e) {
       OnJobPaused();
+    }
+
+    protected virtual void optimizer_ExecutionTimeChanged(object sender, EventArgs e) {
+      OnExecutionTimeChanged();
+    }
+
+    protected virtual void optimizer_ExecutionStateChanged(object sender, EventArgs e) {
+      OnExecutionStateChanged();
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HeuristicLab.HiveEngine-3.4.csproj

@@ -150 +150 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="EngineJob.cs" />
     <Compile Include="HeuristicLabHiveEnginePlugin.cs" />
     <Compile Include="Exceptions\ScopeMergeException.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -226 +226 @@
       object locker = new object();
       IDictionary<Guid, int> jobIndices = new Dictionary<Guid, int>();
-      var hiveExperiment = new HiveExperiment();;
+      var hiveExperiment = new HiveExperiment();
 
       try {
@@ -240 +240 @@
         hiveExperiment.ResourceNames = this.ResourceNames;
         hiveExperiment.Id = ServiceLocator.Instance.CallHiveService(s => s.AddHiveExperiment(hiveExperiment));
-        hiveExperiments.Add(new RefreshableHiveExperiment(hiveExperiment));
+        var refreshableHiveExperiment = new RefreshableHiveExperiment(hiveExperiment);
+        hiveExperiments.Add(refreshableHiveExperiment);
 
         // create upload-tasks
@@ -283 +284 @@
         }, cancellationToken, TaskCreationOptions.PreferFairness);
         processUploadedJobsTask.Start();
+
+        refreshableHiveExperiment.RefreshAutomatically = true;
+        
+        while (!refreshableHiveExperiment.AllJobsFinished()) {
+          Thread.Sleep(1000);
+          // update time
+          // handle cancellation
+        }
+
+
 
         // poll job-statuses and create tasks for those which are finished