Changeset 6111 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

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/HeuristicLab.HiveEngine/3.4

Files:

• HeuristicLab.HiveEngine-3.4.csproj (modified) (1 diff)
• HiveEngine.cs (modified) (3 diffs)

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