Changeset 5786 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

Timestamp:

03/22/11 11:36:53 (13 years ago)

Author:

cneumuel

Message:

#1233

• implemented correct numbering of BatchRuns
• improvements in ExperimentManager
• fixed bug in server (jobs were scheduled multiple times)
• added exception handling for task in slave
• improved timeout handling of jobs (LifecycleManager)

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

@@ -77 +77 @@
           DergisterOptimizerEvents();
           optimizerJob = value;
-          if (optimizerJob.ExecutionState == ExecutionState.Stopped) {
-            IsFinishedOptimizerDownloaded = true;
-          }
+          //if (optimizerJob.ExecutionState == ExecutionState.Stopped) {
+          //  IsFinishedOptimizerDownloaded = true;
+          //}
           RegisterOptimizerEvents();
           OnOptimizerJobChanged();
@@ -91 +91 @@
     }
 
-    private bool isFinishedOptimizerDownloaded;
-    public bool IsFinishedOptimizerDownloaded {
-      get { return isFinishedOptimizerDownloaded; }
-      set {
-        if (isFinishedOptimizerDownloaded != value) {
-          isFinishedOptimizerDownloaded = value;
-          OnIsFinishedOptimizerDownloadedChanged();
-        }
-      }
-    }
+    //private bool isFinishedOptimizerDownloaded;
+    //public bool IsFinishedOptimizerDownloaded {
+    //  get { return isFinishedOptimizerDownloaded; }
+    //  set {
+    //    if (isFinishedOptimizerDownloaded != value) {
+    //      isFinishedOptimizerDownloaded = value;
+    //      OnIsFinishedOptimizerDownloadedChanged();
+    //    }
+    //  }
+    //}
 
     private bool syncJobsWithOptimizers = true;
@@ -331 +331 @@
       }
       if (childIsFinishedOptimizerDownloaded) {
-        child.IsFinishedOptimizerDownloaded = true;
+        //child.IsFinishedOptimizerDownloaded = true; // todo: clean up with childIsFinishedOptimizerDownloaded
       }
       syncJobsWithOptimizers = true;
@@ -345 +345 @@
       }
       foreach (IRun run in optimizerJob.Optimizer.Runs) {
-        if (!batchRun.Runs.Contains(run))
+        if (!batchRun.Runs.Contains(run)) {
+          run.Name = GetNewRunName(run, batchRun.Runs);
           batchRun.Runs.Add(run);
+        }
+      }
+    }
+
+    /// <summary>
+    /// Parses the run numbers out of runs and renames the run to the next number
+    /// </summary>
+    private static string GetNewRunName(IRun run, RunCollection runs) {
+      int idx = run.Name.IndexOf("Run ") + 4;
+
+      if (idx == -1 || runs.Count == 0)
+        return run.Name;
+
+      int maxRunNumber = int.MinValue;
+      foreach (IRun r in runs) {
+        int number = GetRunNumber(r.Name);
+        maxRunNumber = Math.Max(maxRunNumber, number);
+      }
+
+      return run.Name.Substring(0, idx) + (maxRunNumber + 1).ToString();
+    }
+
+    /// <summary>
+    /// Parses the number of a Run out of its name. Example "Genetic Algorithm Run 3" -> 3
+    /// </summary>
+    private static int GetRunNumber(string runName) {
+      int idx = runName.IndexOf("Run ") + 4;
+      if (idx == -1) {
+        return 0;
+      } else {
+        return int.Parse(runName.Substring(idx, runName.Length - idx));
       }
     }
@@ -403 +435 @@
       if (lightweightJob != null) {
         job.Id = lightweightJob.Id;
-        job.Id = lightweightJob.Id;
+        job.ParentJobId = lightweightJob.ParentJobId;
         job.ExecutionTime = lightweightJob.ExecutionTime;
         job.State = lightweightJob.State;
         job.StateLog = new List<StateLog>(lightweightJob.StateLog);
-        // what about parentJob
+        job.Command = lightweightJob.Command;
+        job.LastJobDataUpdate = lightweightJob.LastJobDataUpdate;
+        
         OnJobStateChanged();
         OnToStringChanged();