Changeset 3013 for trunk/sources/HeuristicLab.Grid.HiveBridge

Timestamp:

03/12/10 13:42:37 (14 years ago)

Author:

kgrading

Message:

fixed HiveBridge and removed compile errors (#830)

File:

• trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs

@@ -48 +48 @@
 
     public JobState JobState(Guid guid) {
-      ResponseObject<SerializedJobResult> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
+      ResponseObject<SerializedJob> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
       if (response != null) {
         return HeuristicLab.Grid.JobState.Busy;
@@ -57 +57 @@
       var jobObj = CreateJobObj(engine);
 
-      ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.Job> res = SavelyExecute(() => executionEngine.AddJob(jobObj));
+      ResponseObject<HeuristicLab.Hive.Contracts.BusinessObjects.JobDto> res = SavelyExecute(() => executionEngine.AddJob(jobObj));
       return res == null ? Guid.Empty : res.Obj.Id;
     }
 
     public byte[] TryEndExecuteEngine(Guid guid) {
-      ResponseObject<SerializedJobResult> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
+      ResponseObject<SerializedJob> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
       if (response != null &&
         response.Success && response.Obj != null) {
-        HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
+        HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobData);
         // only return the engine when it wasn't canceled (result is only a snapshot)
         if (restoredJob.Progress == 1.0) {
@@ -86 +86 @@
 
     private HeuristicLab.Hive.Contracts.BusinessObjects.SerializedJob CreateJobObj(byte[] serializedEngine) {
-      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
+      HeuristicLab.Hive.Contracts.BusinessObjects.JobDto jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.JobDto();
 
-      List<HivePluginInfo> requiredPlugins = new List<HivePluginInfo>();
+      List<HivePluginInfoDto> requiredPlugins = new List<HivePluginInfoDto>();
       IEngine engine = RestoreEngine(serializedEngine, requiredPlugins);
 
@@ -119 +119 @@
     }
 
-    private IEngine RestoreEngine(byte[] serializedEngine, List<HivePluginInfo> requiredPlugins) {
+    private IEngine RestoreEngine(byte[] serializedEngine, List<HivePluginInfoDto> requiredPlugins) {
       // unzip and restore to determine the list of required plugins (NB: inefficient!)
       MemoryStream memStream = new MemoryStream(serializedEngine);
@@ -144 +144 @@
 
       foreach (IPluginDescription uniquePlugin in plugins) {
-        HivePluginInfo pluginInfo =
-          new HivePluginInfo();
+        HivePluginInfoDto pluginInfo =
+          new HivePluginInfoDto();
         pluginInfo.Name = uniquePlugin.Name;
         pluginInfo.Version = uniquePlugin.Version.ToString();