Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs

Timestamp:

01/02/12 11:40:31 (12 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs (modified) (12 diffs)

branches/RegressionBenchmarks/HeuristicLab.Clients.Hive/3.3

@@ -1 +1 @@
 obj
 Plugin.cs
+bin

@@ -1 +1 @@
 obj
 Plugin.cs
+bin

branches/RegressionBenchmarks/HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs

@@ -65 +65 @@
             Optimization.Experiment experiment = (Optimization.Experiment)ItemTask.Item;
             foreach (IOptimizer childOpt in experiment.Optimizers) {
-              this.childHiveTasks.Add(new OptimizerHiveTask(childOpt));
+              var optimizerHiveTask = new OptimizerHiveTask(childOpt);
+              optimizerHiveTask.Task.Priority = Task.Priority; //inherit priority from parent
+              this.childHiveTasks.Add(optimizerHiveTask);
             }
           } else if (ItemTask.Item is Optimization.BatchRun) {
@@ -71 +73 @@
             if (batchRun.Optimizer != null) {
               while (this.childHiveTasks.Count < batchRun.Repetitions) {
-                this.childHiveTasks.Add(new OptimizerHiveTask(batchRun.Optimizer));
+                var optimizerHiveTask = new OptimizerHiveTask(batchRun.Optimizer);
+                optimizerHiveTask.Task.Priority = Task.Priority;
+                this.childHiveTasks.Add(optimizerHiveTask);
               }
               while (this.childHiveTasks.Count > batchRun.Repetitions) {
@@ -136 +140 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -152 +155 @@
             }
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -163 +165 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -174 +175 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        }
-        finally { childHiveTasksLock.ExitWriteLock(); }
+        } finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -205 +205 @@
           child.syncTasksWithOptimizers = true;
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
       syncTasksWithOptimizers = true;
     }
@@ -268 +267 @@
           child.SetIndexInParentOptimizerList(this);
         }
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
-    }
-
-    public override void AddChildHiveJob(HiveTask hiveJob) {
-      base.AddChildHiveJob(hiveJob);
-      var optimizerHiveJob = (OptimizerHiveTask)hiveJob;
+      } finally { childHiveTasksLock.ExitReadLock(); }
+    }
+
+    public override void AddChildHiveTask(HiveTask hiveTask) {
+      base.AddChildHiveTask(hiveTask);
+      var optimizerHiveJob = (OptimizerHiveTask)hiveTask;
       syncTasksWithOptimizers = false;
       if (this.ItemTask != null && optimizerHiveJob.ItemTask != null) {
@@ -339 +337 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -351 +348 @@
         }
         return null;
-      }
-      finally { childHiveTasksLock.ExitReadLock(); }
+      } finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -362 +358 @@
       int idx = run.Name.IndexOf("Run ") + 4;
 
-      if (idx == -1 || runs.Count == 0)
+      if (idx == 3 || runs.Count == 0)
         return run.Name;
 
@@ -379 +375 @@
     private static int GetRunNumber(string runName) {
       int idx = runName.IndexOf("Run ") + 4;
-      if (idx == -1) {
+      if (idx == 3) {
         return 0;
       } else {

@@ -1 +1 @@
 obj
 Plugin.cs
+bin