Changeset 2092 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

06/25/09 12:29:58 (15 years ago)

Author:

svonolfe

Message:

Small refactoring (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.Core/3.2

Files:

• ClientCommunicator.cs (modified) (3 diffs)
• ExecutionEngineFacade.cs (modified) (1 diff)
• JobManager.cs (modified) (4 diffs)
• ServerConsoleFacade.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -384 +384 @@
         Job job2Calculate = scheduler.GetNextJobForClient(clientId);
         if (job2Calculate != null) {
-          ComputableJob computableJob =
+          SerializedJob computableJob =
             jobAdapter.GetComputableJob(job2Calculate.Id);
 
@@ -435 +435 @@
           clientAdapter.GetById(clientId);
 
-        ComputableJob job =
-          new ComputableJob();
+        SerializedJob job =
+          new SerializedJob();
 
         if (job != null) {
@@ -481 +481 @@
           return response;
         }
-        job.SerializedJob = result;
+        job.SerializedJobData = result;
         job.JobInfo.Percentage = percentage;
 
         if (finished) {
           job.JobInfo.State = State.finished;
-          job.SerializedJob = result;
+          job.SerializedJobData = result;
         }
 

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ExecutionEngineFacade.cs

@@ -36 +36 @@
     #region IExecutionEngineFacade Members
 
-    public ResponseObject<Job> AddJob(ComputableJob job) {
+    public ResponseObject<Job> AddJob(SerializedJob job) {
       return jobManager.AddNewJob(job);
     }

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

@@ -74 +74 @@
 
         if (job != null) {
-          ComputableJob computableJob =
-              new ComputableJob();
+          SerializedJob computableJob =
+              new SerializedJob();
           computableJob.JobInfo =
             job;
@@ -82 +82 @@
           if (lastJobResult != null) {
             computableJob.JobInfo.Percentage = lastJobResult.Percentage;
-            computableJob.SerializedJob = lastJobResult.Result;
+            computableJob.SerializedJobData = lastJobResult.Result;
 
             jobAdapter.UpdateComputableJob(computableJob);
@@ -196 +196 @@
     /// <param name="job"></param>
     /// <returns></returns>
-    public ResponseObject<Job> AddNewJob(ComputableJob job) {
+    public ResponseObject<Job> AddNewJob(SerializedJob job) {
       ISession session = factory.GetSessionForCurrentThread();
 
@@ -216 +216 @@
             return response;
           }
-          if (job.SerializedJob == null) {
+          if (job.SerializedJobData == null) {
             response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_NULL;
             response.Success = false;

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

@@ -99 +99 @@
     }
 
-    public ResponseObject<Job> AddNewJob(ComputableJob job) {
+    public ResponseObject<Job> AddNewJob(SerializedJob job) {
       secMan.Authorize("AddJob", sessionID, job.JobInfo.Id);
       return jobManager.AddNewJob(job);