Changeset 4170 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts

Timestamp:

08/06/10 09:20:18 (14 years ago)

Author:

cneumuel

Message:

refactoring of Result-Polling of HiveExperiment, polling is now much faster and code is cleaner (1092#)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3

Files:

• BusinessObjects/HivePluginInfoDto.cs (modified) (2 diffs)
• BusinessObjects/JobResult.cs (modified) (1 diff)
• BusinessObjects/JobResultList.cs (added)
• HeuristicLab.Hive.Contracts-3.3.csproj (modified) (1 diff)
• Interfaces/IClientCommunicator.cs (modified) (2 diffs)
• Interfaces/IExecutionEngineFacade.cs (modified) (1 diff)
• Interfaces/IJobManager.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/HivePluginInfoDto.cs

@@ -60 +60 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      int[] parts = this.storableVersion.Split('.').Select(s => int.Parse(s)).ToArray();
-      this.Version = new Version(parts[0], parts[1], parts[2], parts[3]);
+      this.Version = new Version(storableVersion);
     }
 
@@ -71 +70 @@
       return clone;
     }
+
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/JobResult.cs

@@ -41 +41 @@
     [Storable]
     [DataMember]
-    public double Percentage { get; set; }
-    [Storable]
-    [DataMember]
-    public DateTime Timestamp { get; set; }
-    [Storable]
-    [DataMember]
     public Guid ClientId { get; set; }
     [Storable]
     [DataMember]
-    public Exception Exception { get; set; }
+    public State State { get; set; }
     [Storable]
     [DataMember]
-    public DateTime DateFinished { get; set; }
+    public double? Percentage { get; set; }
+    [Storable]
+    [DataMember]
+    public String Exception { get; set; }
+    [Storable]
+    [DataMember]
+    public DateTime? DateCalculated { get; set; }
+    [Storable]
+    [DataMember]
+    public DateTime? DateFinished { get; set; }
 
     public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
       JobResult clone = (JobResult) base.Clone(cloner);
       clone.ClientId = this.ClientId;
+      clone.DateCalculated = this.DateCalculated;
       clone.DateFinished = this.DateFinished;
-      throw new NotImplementedException("Exception kann nicht serialisiert werden, deshalb irgendwie wrappen... oder nur message (+stacktrace, ...?) speichern");
       clone.Exception = this.Exception;
       clone.JobId = this.JobId;
       clone.Percentage = this.Percentage;
-      clone.Timestamp = this.Timestamp;
+      clone.State = this.State;
       return clone;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/HeuristicLab.Hive.Contracts-3.3.csproj

@@ -120 +120 @@
     <Compile Include="BusinessObjects\ClientGroupDto.cs" />
     <Compile Include="BusinessObjects\HivePluginFile.cs" />
+    <Compile Include="BusinessObjects\JobResultList.cs" />
     <Compile Include="BusinessObjects\ResourceDto.cs" />
     <Compile Include="BusinessObjects\SerializedJob.cs" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IClientCommunicator.cs

@@ -47 +47 @@
       byte[] result, 
       double percentage,
-      Exception exception);
+      string exception);
     [OperationContract]
     ResponseResultReceived ProcessSnapshot(Guid clientId,
@@ -53 +53 @@
       byte[] result, 
       double percentage, 
-      Exception exception);
+      string exception);
     [OperationContract]
     Response Logout(Guid clientId);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IExecutionEngineFacade.cs

@@ -42 +42 @@
     [OperationContract]
     ResponseObject<JobDto> GetJobById(Guid jobId);
+    [OperationContract]
+    ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
   }
 }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/Interfaces/IJobManager.cs

@@ -50 +50 @@
     ResponseObject<SerializedJob> GetLastSerializedJobResultOf(Guid jobId, bool requested, bool snapshot);
     [OperationContract]
-    ResponseList<JobResult> GetAllJobResults(Guid jobId);
+    ResponseObject<JobResultList> GetAllJobResults(IEnumerable<Guid> jobIds);
     [OperationContract]
     Response RequestSnapshot(Guid jobId);