Changeset 4423 for branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs

Timestamp:

09/17/10 10:26:55 (14 years ago)

Author:

cneumuel

Message:

• Refactored HL.Hive.Experiment. JobItems are not called HiveJobs and OptimizerJobs do not contain a hierarchy anymore.
• Dynamic generation of jobs on a slave are not reflected on the client user interface.
• Optimizer-Trees are now strictly synchronized with the HiveJob-Trees (also the ComputeInParallel property is taken into account when the Child HiveJobs are created)
• Improved the way a class can report progress and lock the UI (IProgressReporter, IProgress, Progress, ProgressView)
• Changes were made to the config-files, so that server and clients work with blade12.hpc.fh-hagenberg.at
• Lots of small changes and bugfixes

File:

• branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs (modified) (3 diffs)

branches/3.3-Hive/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Core/3.3/ConfigurationManager/ConfigManager.cs

@@ -107 +107 @@
       st.ConnectedSince = WcfService.Instance.ConnectedSince;
 
-      st.TotalCores = hardwareInfo.NrOfCores;
-      st.FreeCores = hardwareInfo.NrOfCores - GetUsedCores();
+      st.TotalCores = hardwareInfo.NrOfCores.HasValue ? hardwareInfo.NrOfCores.Value : 0;
+      st.FreeCores = hardwareInfo.NrOfCores.HasValue ? hardwareInfo.NrOfCores.Value - GetUsedCores() : 0;
 
       st.JobsAborted = SlaveStatusInfo.JobsAborted;
@@ -120 +120 @@
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
-          st.Jobs.Add(new JobStatus { JobId = e.JobId, Progress = e.Progress, Since = e.CreationTime });
+          st.Jobs.Add(new JobStatus { JobId = e.JobId, ExecutionTime = e.ExecutionTime, Since = e.CreationTime });
         }
       }
@@ -126 +126 @@
     }
 
-    public Dictionary<Guid, double> GetProgressOfAllJobs() {
-      Dictionary<Guid, double> prog = new Dictionary<Guid, double>();
+    public Dictionary<Guid, TimeSpan> GetExecutionTimeOfAllJobs() {
+      Dictionary<Guid, TimeSpan> prog = new Dictionary<Guid, TimeSpan>();
       Dictionary<Guid, Executor> engines = Core.ExecutionEngines;
       lock (engines) {
         foreach (KeyValuePair<Guid, Executor> kvp in engines) {
           Executor e = kvp.Value;
-          //if (!e.JobIsFinished) 
-          prog[e.JobId] = e.Progress;
+          prog[e.JobId] = e.ExecutionTime;
         }
       }