Changeset 1119 for trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

Timestamp:

01/14/09 16:03:50 (16 years ago)

Author:

kgrading

Message:

corrected the progress calculation (#457)

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

@@ -74 +74 @@
       ClientInfo info = ConfigManager.Instance.GetClientInfo();
       // Todo: remove tempfix for free cores.
-      // TODO: change jobProgress from int to Dictionary of Job and Double
-      HeartBeatData heartBeatData = new HeartBeatData { ClientId = info.ClientId, 
-                                                              freeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed), 
-                                                              freeMemory = 1000, 
-                                                              jobProgress = ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed};
+
+      HeartBeatData heartBeatData = new HeartBeatData {
+        ClientId = info.ClientId,
+        freeCores = info.NrOfCores - (ClientStatusInfo.JobsFetched - ClientStatusInfo.JobsProcessed),
+        freeMemory = 1000,
+        jobProgress = ConfigManager.Instance.GetProgressOfAllJobs()
+      };
       if (wcfService.ConnState == NetworkEnum.WcfConnState.Failed) {
         wcfService.Connect();