Changeset 4119 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs

Timestamp:

07/28/10 17:48:10 (14 years ago)

Author:

cneumuel

Message:

HiveExperiment is now able to send IOptimizers of an Experiment and receive the calculated result (#1115)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs (modified) (5 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Core.cs

@@ -45 +45 @@
 using HeuristicLab.Hive.Client.Core.JobStorage;
 using HeuristicLab.Tracing;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Hive.Client.Core {
@@ -98 +99 @@
       if (cc.IPAdress != String.Empty && cc.Port != 0)
         wcfService.SetIPAndPort(cc.IPAdress, cc.Port);
-
-      if (!UptimeManager.Instance.CalendarAvailable || UptimeManager.Instance.IsOnline())
-        wcfService.Connect();
 
       //Initialize the heartbeat
@@ -249 +247 @@
         if (WcfService.Instance.ConnState == NetworkEnum.WcfConnState.Loggedin) {
           Logger.Info("Sending the finished job with id: " + jId);
-          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id,
-            jId,
-            sJob,
-            1,
-            null,
-            true);
+          wcfService.StoreFinishedJobResultAsync(ConfigManager.Instance.GetClientInfo().Id, jId, sJob, 1.0, null, true);
         } else {
           Logger.Info("Storing the finished job with id: " + jId + " to hdd");
@@ -465 +458 @@
 
       foreach (KeyValuePair<Guid, Executor> execKVP in engines) {
-        if (!execKVP.Value.Running && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
+        if (execKVP.Value.ExecutionState != ExecutionState.Started && execKVP.Value.CurrentMessage == MessageContainer.MessageType.NoMessage) {
           Logger.Info("Checking for JobId: " + execKVP.Value.JobId);
           Thread finThread = new Thread(new ParameterizedThreadStart(GetFinishedJob));
@@ -513 +506 @@
   }
 
- 
+
 }