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

Timestamp:

06/27/11 15:20:23 (13 years ago)

Author:

cneumuel

Message:

#1233

• finished experiment sharing
• added role for executing privileged jobs
• refreshing experiments in experimentManager does not delete already downloaded jobs
• moved some properties from HiveExperiment into RefreshableHiveExperiment

File:

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

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

@@ -92 +92 @@
     }
 
+    public bool IsAllowedPrivileged { get; set; }
+
     #region constructors and cloning
     public HiveEngine() {
@@ -97 +99 @@
       this.Priority = 0;
       this.log = new ThreadSafeLog(this.log);
+      this.IsAllowedPrivileged = ServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
     }
 
@@ -249 +252 @@
           var engineHiveJob = new EngineHiveJob(jobs[i], parentScopeClone);
           engineHiveJob.Job.Priority = this.Priority;
-          hiveExperiment.HiveJobs.Add(engineHiveJob);
+          refreshableHiveExperiment.HiveJobs.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)
@@ -261 +264 @@
         while (!refreshableHiveExperiment.AllJobsFinished()) {
           Thread.Sleep(2000);
-          this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(hiveExperiments.Sum(x => x.HiveExperiment.ExecutionTime.TotalMilliseconds));
+          this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(hiveExperiments.Sum(x => x.ExecutionTime.TotalMilliseconds));
           cancellationToken.ThrowIfCancellationRequested();
         }
-        log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableHiveExperiment.ToString(), refreshableHiveExperiment.HiveExperiment.ExecutionTime));
-
-        var failedJobs = hiveExperiment.HiveJobs.Where(x => x.Job.State == JobState.Failed);
+        log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableHiveExperiment.ToString(), refreshableHiveExperiment.ExecutionTime));
+
+        var failedJobs = refreshableHiveExperiment.HiveJobs.Where(x => x.Job.State == JobState.Failed);
         if (failedJobs.Count() > 0) {
           throw new HiveEngineException("Job failed: " + failedJobs.First().Job.StateLog.Last().Exception);
@@ -273 +276 @@
         // get scopes
         int j = 0;
-        foreach (var hiveJob in hiveExperiment.HiveJobs) {
+        foreach (var hiveJob in refreshableHiveExperiment.HiveJobs) {
           var scope = ((IAtomicOperation)((EngineJob)hiveJob.ItemJob).InitialOperation).Scope;
           scopes[j++] = scope;
@@ -299 +302 @@
         hiveExperiment.IsPrivileged = this.IsPrivileged;
         var refreshableHiveExperiment = new RefreshableHiveExperiment(hiveExperiment);
-        refreshableHiveExperiment.IsControllable = false;
+        refreshableHiveExperiment.IsDownloadable = false; // download happens automatically so disable button
         hiveExperiments.Add(refreshableHiveExperiment);
         return refreshableHiveExperiment;
@@ -312 +315 @@
 
     private void ClearData(RefreshableHiveExperiment refreshableHiveExperiment) {
-      var jobs = refreshableHiveExperiment.HiveExperiment.GetAllHiveJobs();
+      var jobs = refreshableHiveExperiment.GetAllHiveJobs();
       foreach (var job in jobs) {
         job.ClearData();