Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Services.OKB/3.3/Query

Timestamp:

07/08/16 14:40:02 (9 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.OKB/3.3/Query/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Query/DataTransfer/Algorithm.cs (modified) (1 diff)

branches/crossvalidation-2434/HeuristicLab.Services.OKB/3.3/Query/Convert.cs

@@ -46 +46 @@
     private static DT.Algorithm ToDto(DA.Algorithm source) {
       if (source == null) return null;
-      return new DT.Algorithm { Name = source.Name, Description = source.Description, AlgorithmClass = source.AlgorithmClass.Name, Platform = source.Platform.Name, DataType = Convert.ToDto(source.DataType) };
+      return new DT.Algorithm { Id = source.Id, Name = source.Name, Description = source.Description, AlgorithmClass = source.AlgorithmClass.Name, Platform = source.Platform.Name, DataType = Convert.ToDto(source.DataType) };
     }
 

branches/crossvalidation-2434/HeuristicLab.Services.OKB/3.3/Query/DataTransfer/Algorithm.cs

@@ -26 +26 @@
   public class Algorithm {
     [DataMember]
+    public long Id { get; set; }
+    [DataMember]
     public string Name { get; set; }
     [DataMember]