Changeset 15082 for stable/HeuristicLab.Clients.OKB/3.3/RunCreation/RunCreationClient.cs

Timestamp:

06/28/17 22:14:18 (7 years ago)

Author:

gkronber

Message:

#2588 merged r13682, r13683, r13684, r13690:13693, r13709, r13746 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.OKB/3.3/RunCreation/RunCreationClient.cs (modified) (7 diffs)

stable/HeuristicLab.Clients.OKB/3.3/RunCreation/RunCreationClient.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Common;
@@ -29 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.Xml;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -86 +86 @@
 
     #region Algorithm Methods
-    public static byte[] GetAlgorithmData(long algorithmId) {
+    public byte[] GetAlgorithmData(long algorithmId) {
       return CallRunCreationService<byte[]>(s => s.GetAlgorithmData(algorithmId));
     }
@@ -92 +92 @@
 
     #region Problem Methods
-    public static byte[] GetProblemData(long problemId) {
+    public byte[] GetProblemData(long problemId) {
       return CallRunCreationService<byte[]>(s => s.GetProblemData(problemId));
+    }
+    #endregion
+
+    #region Solution Methods
+    public IEnumerable<Solution> GetSolutions(long problemId) {
+      return CallRunCreationService(s => s.GetSolutions(problemId));
+    }
+
+    public Solution GetSolution(long solutionId) {
+      return CallRunCreationService(s => s.GetSolution(solutionId));
+    }
+
+    public byte[] GetSolutionData(long solutionId) {
+      return CallRunCreationService(s => s.GetSolutionData(solutionId));
+    }
+
+    public long AddSolution(Solution solution, byte[] data) {
+      return CallRunCreationService(s => s.AddSolution(solution, data));
+    }
+
+    public void DeleteSolution(Solution solution) {
+      CallRunCreationService(s => s.DeleteSolution(solution));
     }
     #endregion
@@ -104 +126 @@
 
     #region Characteristic Methods
-    public static IEnumerable<Value> GetCharacteristicValues(long problemId) {
+    public IEnumerable<Value> GetCharacteristicValues(long problemId) {
       return CallRunCreationService(s => s.GetCharacteristicValues(problemId));
     }
 
-    public static void SetCharacteristicValue(long problemId, Value v) {
+    public void SetCharacteristicValue(long problemId, Value v) {
       CallRunCreationService(s => s.SetCharacteristicValue(problemId, v));
     }
 
-    public static void SetCharacteristicValues(long problemId, IEnumerable<Value> values) {
+    public void SetCharacteristicValues(long problemId, IEnumerable<Value> values) {
       CallRunCreationService(s => s.SetCharacteristicValues(problemId, values.ToList()));
     }
@@ -208 +230 @@
 
     #region Helpers
-    private static void CallRunCreationService(Action<IRunCreationService> call) {
+    private void CallRunCreationService(Action<IRunCreationService> call) {
       RunCreationServiceClient client = ClientFactory.CreateClient<RunCreationServiceClient, IRunCreationService>();
       try {
@@ -220 +242 @@
       }
     }
-    private static T CallRunCreationService<T>(Func<IRunCreationService, T> call) {
+    private T CallRunCreationService<T>(Func<IRunCreationService, T> call) {
       RunCreationServiceClient client = ClientFactory.CreateClient<RunCreationServiceClient, IRunCreationService>();
       try {