Changeset 1119

Timestamp:

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

Author:

kgrading

Message:

corrected the progress calculation (#457)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/BusinessObjects/HeartBeatData.cs (modified) (1 diff)
• HeuristicLab.Hive.JobBase/TestJob.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/ConfigurationManager/ConfigManager.cs

@@ -106 +106 @@
       return st;      
     }
+
+    public Dictionary<long, double> GetProgressOfAllJobs() {
+      Dictionary<long,double> prog = new Dictionary<long,double>();
+      Dictionary<long, Executor> engines = Core.GetExecutionEngines();
+      foreach (KeyValuePair<long, Executor> kvp in engines) {
+        Executor e = kvp.Value;
+        prog[e.JobId] = e.Progress;
+      }
+      return prog;
+    }
+
   }
 }

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

@@ -162 +162 @@
         AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
-        lock (Locker) {
+        lock (Locker) {                    
           if (!jobs.ContainsKey(e.Result.Job.Id)) {
             jobs.Add(e.Result.Job.Id, e.Result.Job);

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();

trunk/sources/HeuristicLab.Hive.Client.ExecutionEngine/Executor.cs

@@ -53 +53 @@
     public void Start(byte[] serializedJob) {
       CreationTime = DateTime.Now;
-      Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
+      //Job = (IJob)PersistenceManager.RestoreFromGZip(serializedJob);
+      //debug
+      Job = new TestJob();
       Job.JobStopped += new EventHandler(Job_JobStopped);
       Job.Start();

trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/HeartBeatData.cs

@@ -16 +16 @@
     public int freeCores { get; set; }
     [DataMember]
-    public int jobProgress { get; set; } // TODO: define Type 
+    public Dictionary<long, double> jobProgress { get; set; } // TODO: define Type 
   }
 }

trunk/sources/HeuristicLab.Hive.JobBase/TestJob.cs

@@ -67 +67 @@
     }
 
+    public TestJob() {
+    }
+
 
   }