Changeset 4144 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

Timestamp:

08/04/10 14:34:40 (14 years ago)

Author:

cneumuel

Message:

improved HiveExperiment GUI (HL3.3 look&feel, RunCollectionView, JobItem.ToString) (#1115)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3

Files:

• HiveExperiment.cs (modified) (7 diffs)
• JobItem.cs (modified) (5 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -280 +280 @@
               StatusMessage = "Initial Snapshot",
               Success = true
-            }
+            },
+            Optimizer = optimizer
           };
           jobItems.Add(jobItem);
@@ -348 +349 @@
         return optimizers;
       } else {
-        return FlatOptimizerTree(null, experiment);
+        return FlatOptimizerTree(null, experiment, "");
       }
     }
@@ -361 +362 @@
     /// </summary>
     /// <returns>a dictionary mapping from the parent optimizer to the child optimizer</returns>
-    private IDictionary<IOptimizer, IOptimizer> FlatOptimizerTree(IOptimizer parent, IOptimizer optimizer) {
+    private IDictionary<IOptimizer, IOptimizer> FlatOptimizerTree(IOptimizer parent, IOptimizer optimizer, string prepend) {
       IDictionary<IOptimizer, IOptimizer> optimizers = new Dictionary<IOptimizer, IOptimizer>();
       if (optimizer is HeuristicLab.Optimization.Experiment) {
         HeuristicLab.Optimization.Experiment experiment = optimizer as HeuristicLab.Optimization.Experiment;
+        if (this.experiment != experiment) {
+          prepend += "Experiment/"; // don't prepend for top-level optimizers
+        }
         foreach (IOptimizer opt in experiment.Optimizers) {
-          AddRange(optimizers, FlatOptimizerTree(experiment, opt));
+          AddRange(optimizers, FlatOptimizerTree(experiment, opt, prepend));
         }
       } else if (optimizer is BatchRun) {
         BatchRun batchRun = optimizer as BatchRun;
+        prepend += "BatchRun/";
         for (int i = 0; i < batchRun.Repetitions; i++) {
           IOptimizer opt = (IOptimizer)batchRun.Algorithm.Clone();
-          AddRange(optimizers, FlatOptimizerTree(batchRun, opt));
+          opt.Name += " [" + i + "]";
+          IDictionary<IOptimizer, IOptimizer> batchOptimizers = FlatOptimizerTree(batchRun, opt, prepend);
+          AddRange(optimizers, batchOptimizers);
         }
       } else if (optimizer is EngineAlgorithm) {
+        optimizer.Name = prepend + optimizer.Name;
         optimizers.Add(optimizer, parent);
       } else {
         Logger.Warn("Optimizer of type " + optimizers.GetType().ToString() + " unknown");
+        optimizer.Name = prepend + optimizer.Name;
         optimizers.Add(optimizer, parent);
       }
@@ -398 +407 @@
           BatchRun batchRun = (BatchRun)parentOptimizer;
           if (newOptimizer is IAlgorithm) {
-            batchRun.Runs.Add(new Run((IAlgorithm)newOptimizer));
+            batchRun.Runs.Add(new Run(newOptimizer.Name, (IAlgorithm)newOptimizer) );
           } else {
             throw new NotSupportedException("Only IAlgorithm types supported");
@@ -461 +470 @@
           IExecutionEngineFacade executionEngineFacade = GetExecutionEngineFacade();
           IJob restoredObject = null;
+          IOptimizer originalOptimizer = pendingOptimizersByJobId[job.Id];
 
           do {
-            if (stopPending || !this.IsPollingResults) {
-              return;
-            }
-
-            ResponseObject<JobDto> response = executionEngineFacade.GetJobById(job.Id);
-            LogMessage("Response: " + response.StatusMessage + " (jobId: " + job.Id + ")");
-            GetJobItemById(job.Id).LogMessage("Response: " + response.StatusMessage);
-
-            UpdateJobItem(response.Obj);
-
-            if (response.Obj.State == State.Abort) {
-              // job is aborted, don't poll for results anymore
-              GetJobItemById(job.Id).LogMessage("Job successfully aborted");
-              return;
-            }
-
             // loop while 
             // 1. the user doesn't request an abort 
@@ -484 +478 @@
             // 3. no result for the job is available yet (response.Obj==null)
             // 4. the result that we get from the server is a snapshot and not the final result
+
+            if (stopPending || !this.IsPollingResults) {
+              return;
+            }
+
+            ResponseObject<JobDto> response = executionEngineFacade.GetJobById(job.Id);
+            LogMessage("Response: " + response.StatusMessage + " (jobId: " + job.Id + ")");
+            GetJobItemById(job.Id).LogMessage("Response: " + response.StatusMessage);
+
+            UpdateJobItem(response.Obj);
+
+            if (response.Obj.State == State.Abort) {
+              pendingOptimizersByJobId.Remove(job.Id);
+              parentOptimizersByPendingOptimizer.Remove(originalOptimizer);
+              GetJobItemById(job.Id).LogMessage("Job successfully aborted");
+              return;
+            }
+
+            if (response.Obj.State == State.Failed) {
+              pendingOptimizersByJobId.Remove(job.Id);
+              parentOptimizersByPendingOptimizer.Remove(originalOptimizer);
+              GetJobItemById(job.Id).LogMessage("Job failed with exception: " + response.Obj.Exception);
+              return;
+            }
+
             if (response.Success && response.Obj != null && response.Obj.State == State.Finished) {
               ResponseObject<SerializedJob> jobResponse = executionEngineFacade.GetLastSerializedResult(job.Id, false, false);
               restoredObject = XmlParser.Deserialize<IJob>(new MemoryStream(jobResponse.Obj.SerializedJobData));
               UpdateSnapshot(jobResponse);
+            } else {
+              Thread.Sleep(resultPollingIntervalMs);
             }
-
-            Thread.Sleep(resultPollingIntervalMs);
           } while (restoredObject == null || restoredObject.ExecutionState != Core.ExecutionState.Stopped);
 
@@ -496 +515 @@
           GetJobItemById(job.Id).LogMessage("Job finished");
           // job retrieved... replace the existing optimizers with the finished one
-          IOptimizer originalOptimizer = pendingOptimizersByJobId[job.Id];
+          
           IOptimizer restoredOptimizer = ((OptimizerJob)restoredObject).Optimizer;
           

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/JobItem.cs

@@ -10 +10 @@
 using HeuristicLab.Common;
 using System.Diagnostics;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Hive.Experiment {
@@ -19 +20 @@
       get {
         if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-        else if (jobDto.State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else if (jobDto.State == State.Idle) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
         else if (jobDto.State == State.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
-        else if (jobDto.State == State.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else if (jobDto.State == State.Abort) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
+        else if (jobDto.State == State.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
+        else if (jobDto.State == State.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
         else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
       }
@@ -65 +67 @@
       get { return log; }
     }
+
+    [Storable]
+    private IOptimizer optimizer;
+    public IOptimizer Optimizer {
+      get { return optimizer; }
+      set { this.optimizer = value; }
+    }
     
     public JobItem() {
@@ -72 +81 @@
     public override string ToString() {
       if (jobDto != null) {
-        return base.ToString() + " - " + jobDto.Id.ToString();
+        return optimizer.Name;
       } else {
         return base.ToString();
@@ -105 +114 @@
       clone.latestSnapshot = (ResponseObject<SerializedJob>)cloner.Clone(this.latestSnapshot);
       clone.log = (ILog)cloner.Clone(this.log);
+      clone.optimizer = (IOptimizer)cloner.Clone(this.optimizer);
       return clone;
     }