Changeset 9933 for stable/HeuristicLab.Clients.Hive/3.3

Timestamp:

09/03/13 15:55:36 (11 years ago)

Author:

ascheibe

Message:

#1042 merged r9849, r9851, r9865, r9867, r9868, r9893, r9894, r9895, r9896, r9900, r9901, r9905, r9907 into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (2 diffs)

stable/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -265 +265 @@
       try {
         refreshableJob.IsProgressing = true;
-        refreshableJob.Progress = new Progress("Connecting to server...");
+        refreshableJob.Progress.Start("Connecting to server...");
         IEnumerable<string> resourceNames = ToResourceNameList(refreshableJob.Job.ResourceNames);
         var resourceIds = new List<Guid>();
@@ -424 +424 @@
       var hiveExperiment = refreshableJob.Job;
       refreshableJob.IsProgressing = true;
-      refreshableJob.Progress = new Progress();
       TaskDownloader downloader = null;
 
@@ -431 +430 @@
         IEnumerable<LightweightTask> allTasks;
 
-        refreshableJob.Progress.Status = "Connecting to Server...";
         // fetch all task objects to create the full tree of tree of HiveTask objects
-        refreshableJob.Progress.Status = "Downloading list of tasks...";
+        refreshableJob.Progress.Start("Downloading list of tasks...");
         allTasks = HiveServiceLocator.Instance.CallHiveService(s => s.GetLightweightJobTasksWithoutStateLog(hiveExperiment.Id));
         totalJobCount = allTasks.Count();

stable/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -26 +26 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
@@ -31 +32 @@
 namespace HeuristicLab.Clients.Hive {
   public class OptimizerHiveTask : HiveTask<OptimizerTask> {
+    public Progress Progress { get; private set; }
+
     #region Constructors and Cloning
-    public OptimizerHiveTask() { }
+    public OptimizerHiveTask() {
+      Progress = new Progress();
+    }
     public OptimizerHiveTask(IOptimizer optimizer)
       : this() {
@@ -43 +48 @@
     protected OptimizerHiveTask(OptimizerHiveTask original, Cloner cloner)
       : base(original, cloner) {
+      Progress = new Progress();
     }
     public override IDeepCloneable Clone(Cloner cloner) {

stable/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -178 +178 @@
     #region Constructors and Cloning
     public RefreshableJob() {
+      this.progress = new Progress();
       this.refreshAutomatically = false;
       this.Job = new Job();
@@ -186 +187 @@
     }
     public RefreshableJob(Job hiveJob) {
+      this.progress = new Progress();
       this.refreshAutomatically = true;
       this.Job = hiveJob;