Changeset 6743 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

Timestamp:

09/12/11 18:04:25 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed a bug in the Slave UI
• finished renaming Webservice and Dao methods to be consistent with Job/Task naming
• some cosmetic changes and project dependencies cleanups

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (6 diffs)

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

@@ -252 +252 @@
           var engineHiveJob = new EngineHiveTask(jobs[i], parentScopeClone);
           engineHiveJob.Task.Priority = this.Priority;
-          refreshableJob.HiveJobs.Add(engineHiveJob);
+          refreshableJob.HiveTasks.Add(engineHiveJob);
 
           // shuffle random variable to avoid the same random sequence in each operation; todo: does not yet work (it cannot find the random variable)
@@ -259 +259 @@
             random.Reset(random.Next());
         }
-        HiveClient.StartExperiment((e) => { log.LogException(e); }, refreshableJob, cancellationToken);
+        HiveClient.StartJob((e) => { log.LogException(e); }, refreshableJob, cancellationToken);
 
         // do polling until experiment is finished and all jobs are downloaded
@@ -269 +269 @@
         log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableJob.ToString(), refreshableJob.ExecutionTime));
 
-        var failedJobs = refreshableJob.HiveJobs.Where(x => x.Task.State == TaskState.Failed);
+        var failedJobs = refreshableJob.HiveTasks.Where(x => x.Task.State == TaskState.Failed);
         if (failedJobs.Count() > 0) {
           throw new HiveEngineException("Task failed: " + failedJobs.First().Task.StateLog.Last().Exception);
@@ -276 +276 @@
         // get scopes
         int j = 0;
-        foreach (var hiveJob in refreshableJob.HiveJobs) {
+        foreach (var hiveJob in refreshableJob.HiveTasks) {
           var scope = ((IAtomicOperation)((EngineTask)hiveJob.ItemTask).InitialOperation).Scope;
           scopes[j++] = scope;
@@ -315 +315 @@
 
     private void ClearData(RefreshableJob refreshableJob) {
-      var jobs = refreshableJob.GetAllHiveJobs();
+      var jobs = refreshableJob.GetAllHiveTasks();
       foreach (var job in jobs) {
         job.ClearData();
@@ -321 +321 @@
     }
 
-    private void DeleteHiveExperiment(Guid hiveExperimentId) {
+    private void DeleteHiveExperiment(Guid jobId) {
       HiveClient.TryAndRepeat(() => {
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(hiveExperimentId));
+        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(jobId));
       }, 5, string.Format("Could not delete jobs"));
     }