Changeset 16173 for addons/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3

Timestamp:

09/21/18 16:00:50 (6 years ago)

Author:

jkarder

Message:

#2839:

• fixed compilation errors in HiveEngine
• minor changes

File:

• addons/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (11 diffs)

addons/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -45 +45 @@
 
     [Storable]
-    public string ResourceNames { get; set; }
+    public Guid ProjectId { get; set; }
+
+    [Storable]
+    public IEnumerable<Guid> ResourceIds { get; set; }
 
     [Storable]
@@ -94 +97 @@
     #region constructors and cloning
     public HiveEngine() {
-      this.ResourceNames = "HEAL";
+      this.ProjectId = Guid.Empty;
+      this.ResourceIds = new List<Guid>();
       this.Priority = 0;
       this.log = new ThreadSafeLog();
@@ -103 +107 @@
     protected HiveEngine(HiveEngine original, Cloner cloner)
       : base(original, cloner) {
-      this.ResourceNames = original.ResourceNames;
+      this.ProjectId = original.ProjectId;
+      this.ResourceIds = original.ResourceIds.ToList();
       this.currentOperator = cloner.Clone(original.currentOperator);
       this.priority = original.priority;
@@ -145 +150 @@
         firstRun = false;
       }
+
+      if (ProjectId == Guid.Empty)
+        throw new ArgumentException("Cannot run HiveEngine. No project has been specified.");
+
+      if (!ResourceIds.Any())
+        throw new ArgumentException("Cannot run HiveEngine. No resources have been specified.");
 
       while (executionStack.Count > 0) {
@@ -175 +186 @@
                 }
               }
-            }
-            catch {
+            } catch {
               executionStack.Push(coll); throw;
             }
@@ -187 +197 @@
           try {
             next = operation.Operator.Execute((IExecutionContext)operation, cancellationToken);
-          }
-          catch (Exception ex) {
+          } catch (Exception ex) {
             executionStack.Push(operation);
             if (ex is OperationCanceledException) throw ex;
@@ -217 +226 @@
         }
         return FindRandomParameter(ec.Parent);
-      }
-      catch { return null; }
+      } catch { return null; }
     }
 
@@ -256 +264 @@
             random.Reset(random.Next());
         }
+
         HiveClient.StartJob((e) => { log.LogException(e); }, refreshableJob, cancellationToken);
 
         // do polling until experiment is finished and all jobs are downloaded
         while (!refreshableJob.IsFinished()) {
+          if (!refreshableJob.RefreshAutomatically && refreshableJob.Id != Guid.Empty)
+            refreshableJob.RefreshAutomatically = true;
+
           Thread.Sleep(2000);
+
           this.ExecutionTimeOnHive = TimeSpan.FromMilliseconds(jobs.Sum(x => x.ExecutionTime.TotalMilliseconds));
           cancellationToken.ThrowIfCancellationRequested();
         }
+
         log.LogMessage(string.Format("{0} finished (TotalExecutionTime: {1}).", refreshableJob.ToString(), refreshableJob.ExecutionTime));
 
@@ -277 +291 @@
           scopes[j++] = scope;
         }
+
         return scopes;
-      }
-      catch (OperationCanceledException e) {
+      } catch (OperationCanceledException e) {
         throw e;
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
         log.LogException(e);
         throw e;
-      }
-      finally {
+      } finally {
         DisposeJob(refreshableJob);
       }
@@ -293 +305 @@
     private RefreshableJob CreateJob() {
       lock (locker) {
-        var hiveExperiment = new Job();
-        hiveExperiment.Name = "HiveEngine Run " + jobs.Count;
-        hiveExperiment.DateCreated = DateTime.Now;
-        hiveExperiment.ResourceNames = this.ResourceNames;
-        var refreshableHiveExperiment = new RefreshableJob(hiveExperiment);
-        refreshableHiveExperiment.IsDownloadable = false; // download happens automatically so disable button
+        var hiveExperiment = new Job {
+          Name = "HiveEngine Run " + jobs.Count,
+          DateCreated = DateTime.Now,
+          ProjectId = ProjectId,
+          ResourceIds = ResourceIds.ToList(),
+        };
+
+        var refreshableHiveExperiment = new RefreshableJob(hiveExperiment) {
+          RefreshAutomatically = false,
+          IsDownloadable = false // download happens automatically later on so disable button
+        };
+
         jobs.Add(refreshableHiveExperiment);
+
         return refreshableHiveExperiment;
       }
@@ -319 +338 @@
     private void DeleteHiveExperiment(Guid jobId) {
       HiveClient.TryAndRepeat(() => {
-        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(jobId));
+        HiveServiceLocator.Instance.CallHiveService(s => s.UpdateJobState(jobId, JobState.StatisticsPending));
       }, 5, string.Format("Could not delete jobs"));
-    }
-
-    private List<Guid> GetResourceIds() {
-      return HiveServiceLocator.Instance.CallHiveService(service => {
-        var resourceNames = ResourceNames.Split(';');
-        var resourceIds = new List<Guid>();
-        foreach (var resourceName in resourceNames) {
-          Guid resourceId = service.GetResourceId(resourceName);
-          if (resourceId == Guid.Empty) {
-            throw new ResourceNotFoundException(string.Format("Could not find the resource '{0}'", resourceName));
-          }
-          resourceIds.Add(resourceId);
-        }
-        return resourceIds;
-      });
     }
   }