Changeset 4381 for trunk/sources/HeuristicLab.Services.OKB

Timestamp:

09/13/10 01:21:32 (14 years ago)

Author:

swagner

Message:

Worked on OKB data model and services (#1174).

Location:

trunk/sources/HeuristicLab.Services.OKB/3.3

Files:

• AdminService.cs (modified) (6 diffs)
• DataService.cs (modified) (9 diffs)
• HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• Interfaces/IAdminService.cs (modified) (3 diffs)
• Interfaces/IDataService.cs (modified) (3 diffs)
• Interfaces/IQueryService.cs (modified) (2 diffs)
• Interfaces/IRunnerService.cs (modified) (3 diffs)
• Interfaces/ITableService.cs (modified) (2 diffs)
• QueryService.cs (modified) (5 diffs)
• RunnerService.cs (modified) (20 diffs)
• StarterKit.cs (modified) (1 diff)
• TableService.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Services.OKB/3.3/AdminService.cs

@@ -24 +24 @@
 using System.ServiceModel;
 using HeuristicLab.Services.OKB.DataAccess;
-using log4net;
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Implementation of <see cref="IAdminService"/>
   /// </summary>
-  [ServiceBehavior(
-    InstanceContextMode = InstanceContextMode.PerSession,
-    IncludeExceptionDetailInFaults = true)]
+  [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
   public class AdminService : IAdminService {
-
-    private static ILog logger = LogManager.GetLogger(typeof(AdminService));
-
-    private OKBDataContext GetDataContext() {
-      return new OKBDataContext();
-    }
-
     /// <summary>
     /// Gets all available platforms.
     /// </summary>
     /// <returns>A list of <see cref="Platform"/>s.</returns>
-    public Platform[] GetPlatformNames() {
-      OKBDataContext okb = GetDataContext();
-      return okb.Platforms.ToArray();
+    public Platform[] GetPlatforms() {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.Platforms.ToArray();
+      }
     }
 
@@ -54 +44 @@
     /// Gets the complete algorithm object graph up to the following entities:
     /// <list type="bullet">
-    ///     <item>Parameter</item>
-    ///     <item>Algorithm_Paramters.Parameter.DataType</item>
-    ///     <item>Algorithm_Results.Result.DataType</item>
-    ///   </list>
+    ///   <item>Parameter</item>
+    ///   <item>Algorithm_Paramters.Parameter.DataType</item>
+    ///   <item>Algorithm_Results.Result.DataType</item>
+    /// </list>
     /// </summary>
     /// <param name="id">The algorithm id.</param>
     /// <returns>An <see cref="Algorithm"/></returns>
     public Algorithm GetCompleteAlgorithm(int id) {
-      OKBDataContext okb = GetDataContext();
-      var dlo = new DataLoadOptions();
-      dlo.LoadWith<Algorithm>(a => a.Platform);
-      dlo.LoadWith<Algorithm>(a => a.Algorithm_Parameters);
-      dlo.LoadWith<Algorithm>(a => a.Algorithm_Results);
-      dlo.LoadWith<Algorithm_Parameter>(ap => ap.Parameter);
-      dlo.LoadWith<Algorithm_Result>(ar => ar.Result);
-      dlo.LoadWith<Parameter>(p => p.DataType);
-      dlo.LoadWith<Result>(r => r.DataType);
-      okb.LoadOptions = dlo;
-      return okb.Algorithms.Single(a => a.Id == id);
+      using (OKBDataContext okb = new OKBDataContext()) {
+        var dlo = new DataLoadOptions();
+        dlo.LoadWith<Algorithm>(a => a.AlgorithmClass);
+        dlo.LoadWith<Algorithm>(a => a.Platform);
+        dlo.LoadWith<Algorithm>(a => a.AlgorithmUsers);
+        dlo.LoadWith<AlgorithmUser>(u => u.User);
+        okb.LoadOptions = dlo;
+        return okb.Algorithms.Single(a => a.Id == id);
+      }
     }
 
@@ -78 +66 @@
     /// Gets the complete problem object graph up to the following entities:
     /// <list type="bullet">
-    ///     <item>Platform</item>
-    ///     <item>SolutionRepresentation</item>
-    ///     <item>Problem_Parameters.Parameter</item>
-    ///     <item>IntProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
-    ///     <item>FloatProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
-    ///     <item>CharProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
-    ///   </list>
+    ///   <item>Platform</item>
+    ///   <item>SolutionRepresentation</item>
+    ///   <item>Problem_Parameters.Parameter</item>
+    ///   <item>IntProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
+    ///   <item>FloatProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
+    ///   <item>CharProblemCharacteristicValues.ProblemCharacteristic.DataType</item>
+    /// </list>
     /// </summary>
     /// <param name="id">The problem id.</param>
     /// <returns>A <see cref="Problem"/></returns>
     public Problem GetCompleteProblem(int id) {
-      OKBDataContext okb = GetDataContext();
-      var dlo = new DataLoadOptions();
-      dlo.LoadWith<Problem>(p => p.Platform);
-      dlo.LoadWith<Problem>(p => p.SolutionRepresentation);
-      dlo.LoadWith<Problem>(p => p.Problem_Parameters);
-      dlo.LoadWith<Problem>(p => p.IntProblemCharacteristicValues);
-      dlo.LoadWith<Problem>(p => p.FloatProblemCharacteristicValues);
-      dlo.LoadWith<Problem>(p => p.CharProblemCharacteristicValues);
-      dlo.LoadWith<Problem_Parameter>(ap => ap.Parameter);
-      dlo.LoadWith<IntProblemCharacteristicValue>(ipcv => ipcv.ProblemCharacteristic);
-      dlo.LoadWith<FloatProblemCharacteristicValue>(fpcv => fpcv.ProblemCharacteristic);
-      dlo.LoadWith<CharProblemCharacteristicValue>(cpcv => cpcv.ProblemCharacteristic);
-      dlo.LoadWith<Parameter>(p => p.DataType);
-      dlo.LoadWith<ProblemCharacteristic>(pc => pc.DataType);
-      okb.LoadOptions = dlo;
-      return okb.Problems.Single(p => p.Id == id);
+      using (OKBDataContext okb = new OKBDataContext()) {
+        var dlo = new DataLoadOptions();
+        dlo.LoadWith<Problem>(p => p.ProblemClass);
+        dlo.LoadWith<Problem>(p => p.SolutionRepresentation);
+        dlo.LoadWith<Problem>(p => p.Platform);
+        dlo.LoadWith<Problem>(p => p.ProblemUsers);
+        dlo.LoadWith<ProblemUser>(u => u.User);
+        dlo.LoadWith<Problem>(p => p.ProblemCharacteristicIntValues);
+        dlo.LoadWith<Problem>(p => p.ProblemCharacteristicFloatValues);
+        dlo.LoadWith<Problem>(p => p.ProblemCharacteristicStringValues);
+        dlo.LoadWith<ProblemCharacteristicIntValue>(ipcv => ipcv.ProblemCharacteristic);
+        dlo.LoadWith<ProblemCharacteristicFloatValue>(fpcv => fpcv.ProblemCharacteristic);
+        dlo.LoadWith<ProblemCharacteristicStringValue>(cpcv => cpcv.ProblemCharacteristic);
+        dlo.LoadWith<ProblemCharacteristic>(pc => pc.DataType);
+        okb.LoadOptions = dlo;
+        return okb.Problems.Single(p => p.Id == id);
+      }
     }
 
@@ -110 +99 @@
     /// Updates the algorithm object graph including the following properties and linked entitites:
     /// <list type="bullet">
-    ///     <item>Name</item>
-    ///     <item>Description</item>
-    ///     <item>AlgorithmClassId</item>
-    ///     <item>PlatformId</item>
-    ///     <item>Algorithm_Parameters</item>
-    ///     <item>Algorithm_Results</item>
-    ///   </list>
-    ///   <remarks>
+    ///   <item>Name</item>
+    ///   <item>Description</item>
+    ///   <item>AlgorithmClassId</item>
+    ///   <item>PlatformId</item>
+    ///   <item>Algorithm_Parameters</item>
+    ///   <item>Algorithm_Results</item>
+    /// </list>
+    /// <remarks>
     /// New <see cref="Parameter"/>s or <see cref="Result"/>s will not be
     /// created but have to be pre-existing.
@@ -124 +113 @@
     /// <param name="algorithm">The algorithm.</param>
     public void UpdateCompleteAlgorithm(Algorithm algorithm) {
-      OKBDataContext okb = GetDataContext();
-      Algorithm original = okb.Algorithms.Single(a => a.Id == algorithm.Id);
+      using (OKBDataContext okb = new OKBDataContext()) {
+        Algorithm original = okb.Algorithms.Single(a => a.Id == algorithm.Id);
+        UpdateAlgorithmData(algorithm, original, okb);
+        okb.SubmitChanges();
+      }
+    }
+
+    /// <summary>
+    /// Updates the problem object graph including the following properties and linked entities:
+    /// <list type="bullet">
+    ///   <item>Name</item>
+    ///   <item>Description</item>
+    ///   <item>ProblemClassId</item>
+    ///   <item>PlatformId</item>
+    ///   <item>SolutionRepresentationId</item>
+    ///   <item>IntProblemCharacteristicValues.Value</item>
+    ///   <item>FloatProblemCharacteristicValues.Value</item>
+    ///   <item>CharProblemCharacteristicValues.Value</item>
+    ///   <item>Problem_Parameters</item>
+    /// </list>
+    /// <remarks>
+    /// New <see cref="ProblemCharacteristic"/>s or <see cref="Parameter"/>s will
+    /// not be created but have to be pre-existing.
+    /// </remarks>
+    /// </summary>
+    /// <param name="problem">The problem.</param>
+    public void UpdateCompleteProblem(Problem problem) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        Problem originalProblem = okb.Problems.Single(p => p.Id == problem.Id);
+        UpdateProblemData(problem, originalProblem, okb);
+        UpdateProblemCharacteristics(problem, originalProblem, okb);
+        okb.SubmitChanges();
+      }
+    }
+
+    private static void UpdateAlgorithmData(Algorithm algorithm, Algorithm original, OKBDataContext okb) {
       original.Name = algorithm.Name;
       original.Description = algorithm.Description;
       original.AlgorithmClassId = algorithm.AlgorithmClassId;
       original.PlatformId = algorithm.PlatformId;
-      okb.Algorithm_Parameters.DeleteAllOnSubmit(original.Algorithm_Parameters);
-      foreach (var a_p in algorithm.Algorithm_Parameters)
-        original.Algorithm_Parameters.Add(new Algorithm_Parameter() {
+      okb.AlgorithmUsers.DeleteAllOnSubmit(original.AlgorithmUsers);
+      original.AlgorithmUsers.Clear();
+      foreach (var u in algorithm.AlgorithmUsers) {
+        original.AlgorithmUsers.Add(new AlgorithmUser() {
           AlgorithmId = original.Id,
-          ParameterId = a_p.ParameterId,
-        });
-      okb.Algorithm_Results.DeleteAllOnSubmit(original.Algorithm_Results);
-      foreach (var a_r in algorithm.Algorithm_Results)
-        original.Algorithm_Results.Add(new Algorithm_Result() {
-          AlgorithmId = original.Id,
-          ResultId = a_r.ResultId,
-        });
-      logger.Info("Updating algorithm implementation for " + original.Name);
-      okb.SubmitChanges();
-    }
-
-    /// <summary>
-    /// Updates the problem object graph including the following properties and linked entities:
-    /// <list type="bullet">
-    ///     <item>Name</item>
-    ///     <item>Description</item>
-    ///     <item>ProblemClassId</item>
-    ///     <item>PlatformId</item>
-    ///     <item>SolutionRepresentationId</item>
-    ///     <item>IntProblemCharacteristicValues.Value</item>
-    ///     <item>FloatProblemCharacteristicValues.Value</item>
-    ///     <item>CharProblemCharacteristicValues.Value</item>
-    ///     <item>Problem_Parameters</item>
-    ///   </list>
-    ///   <remarks>
-    /// New <see cref="ProblemCharacteristic"/>s or <see cref="Parameter"/>s will
-    /// not be created but have to be pre-existing.
-    /// </remarks>
-    /// </summary>
-    /// <param name="problem">The problem.</param>
-    public void UpdateCompleteProblem(Problem problem) {
-      OKBDataContext okb = GetDataContext();
-      Problem originalProblem = okb.Problems.Single(p => p.Id == problem.Id);
-      UpdateProblemMasterInfo(problem, originalProblem);
-      UpdateProblemCharacteristics(problem, okb, originalProblem);
-      UpdateProblemParameters(problem, okb, originalProblem);
-      logger.Info("Updating problem " + originalProblem.Name);
-      okb.SubmitChanges();
-    }
-
-    private static void UpdateProblemParameters(Problem problem, OKBDataContext okb, Problem originalProblem) {
-      okb.Problem_Parameters.DeleteAllOnSubmit(originalProblem.Problem_Parameters);
-      originalProblem.Problem_Parameters.Clear();
-      foreach (var p_p in problem.Problem_Parameters) {
-        originalProblem.Problem_Parameters.Add(new Problem_Parameter() {
-          ProblemId = originalProblem.Id,
-          ParameterId = p_p.ParameterId,
-        });
-      }
-    }
-
-    private static void UpdateProblemCharacteristics(Problem problem, OKBDataContext okb, Problem originalProblem) {
-      okb.IntProblemCharacteristicValues.DeleteAllOnSubmit(originalProblem.IntProblemCharacteristicValues);
-      okb.FloatProblemCharacteristicValues.DeleteAllOnSubmit(originalProblem.FloatProblemCharacteristicValues);
-      okb.CharProblemCharacteristicValues.DeleteAllOnSubmit(originalProblem.CharProblemCharacteristicValues);
-      originalProblem.IntProblemCharacteristicValues.Clear();
-      originalProblem.FloatProblemCharacteristicValues.Clear();
-      originalProblem.CharProblemCharacteristicValues.Clear();
-      foreach (var ipc in problem.IntProblemCharacteristicValues) {
-        originalProblem.IntProblemCharacteristicValues.Add(new IntProblemCharacteristicValue() {
-          ProblemId = originalProblem.Id,
+          UserId = u.UserId
+        });
+      }
+    }
+
+    private static void UpdateProblemData(Problem problem, Problem original, OKBDataContext okb) {
+      original.Name = problem.Name;
+      original.Description = problem.Description;
+      original.ProblemClassId = problem.ProblemClassId;
+      original.SolutionRepresentationId = problem.SolutionRepresentationId;
+      original.PlatformId = problem.PlatformId;
+      okb.ProblemUsers.DeleteAllOnSubmit(original.ProblemUsers);
+      original.ProblemUsers.Clear();
+      foreach (var u in problem.ProblemUsers) {
+        original.ProblemUsers.Add(new ProblemUser() {
+          ProblemId = original.Id,
+          UserId = u.UserId
+        });
+      }
+    }
+    private static void UpdateProblemCharacteristics(Problem problem, Problem original, OKBDataContext okb) {
+      okb.ProblemCharacteristicIntValues.DeleteAllOnSubmit(original.ProblemCharacteristicIntValues);
+      okb.ProblemCharacteristicFloatValues.DeleteAllOnSubmit(original.ProblemCharacteristicFloatValues);
+      okb.ProblemCharacteristicStringValues.DeleteAllOnSubmit(original.ProblemCharacteristicStringValues);
+      original.ProblemCharacteristicIntValues.Clear();
+      original.ProblemCharacteristicFloatValues.Clear();
+      original.ProblemCharacteristicStringValues.Clear();
+      foreach (var ipc in problem.ProblemCharacteristicIntValues) {
+        original.ProblemCharacteristicIntValues.Add(new ProblemCharacteristicIntValue() {
+          ProblemId = original.Id,
           ProblemCharacteristicId = ipc.ProblemCharacteristicId,
           Value = ipc.Value,
         });
       }
-      foreach (var fpc in problem.FloatProblemCharacteristicValues) {
-        originalProblem.FloatProblemCharacteristicValues.Add(new FloatProblemCharacteristicValue() {
-          ProblemId = originalProblem.Id,
+      foreach (var fpc in problem.ProblemCharacteristicFloatValues) {
+        original.ProblemCharacteristicFloatValues.Add(new ProblemCharacteristicFloatValue() {
+          ProblemId = original.Id,
           ProblemCharacteristicId = fpc.ProblemCharacteristicId,
           Value = fpc.Value,
         });
       }
-      foreach (var cpc in problem.CharProblemCharacteristicValues) {
-        originalProblem.CharProblemCharacteristicValues.Add(new CharProblemCharacteristicValue() {
-          ProblemId = originalProblem.Id,
+      foreach (var cpc in problem.ProblemCharacteristicStringValues) {
+        original.ProblemCharacteristicStringValues.Add(new ProblemCharacteristicStringValue() {
+          ProblemId = original.Id,
           ProblemCharacteristicId = cpc.ProblemCharacteristicId,
           Value = cpc.Value,
@@ -215 +207 @@
       }
     }
-
-    private static void UpdateProblemMasterInfo(Problem problem, Problem originalProblem) {
-      originalProblem.Name = problem.Name;
-      originalProblem.Description = problem.Description;
-      originalProblem.ProblemClassId = problem.ProblemClassId;
-      originalProblem.PlatformId = problem.PlatformId;
-      originalProblem.SolutionRepresentationId = problem.SolutionRepresentationId;
-    }
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/DataService.cs

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Services.OKB.DataAccess;
-using log4net;
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Implementation of the <see cref="IDataService"/>.
   /// </summary>
-  [ServiceBehavior(
-    InstanceContextMode = InstanceContextMode.PerSession,
-    IncludeExceptionDetailInFaults = true,
-    ConcurrencyMode = ConcurrencyMode.Multiple)]
+  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerSession, IncludeExceptionDetailInFaults = true)]
   class DataService : IDisposable, IDataService {
-
     private enum Mode { Request, Submit, None };
 
     private Mode mode = Mode.None;
-
     private EntityType type;
     private int id = -1;
     private MemoryStream dataStream;
 
-    private Guid sessionID;
-    private static ILog logger = LogManager.GetLogger(typeof(DataService));
-
-    private void Log(string message, params object[] args) {
-      using (log4net.ThreadContext.Stacks["NDC"].Push(sessionID.ToString())) {
-        logger.Info(String.Format(message, args));
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DataService"/> class.
-    /// </summary>
-    public DataService() {
-      sessionID = Guid.NewGuid();
-      Log("Instantiating new service");
-    }
-
     private void EnsureInit() {
       if (mode != Mode.None)
-        throw new FaultException(String.Format(
-          "Cannot service new request while processing another {0}-Operation", mode));
+        throw new FaultException(String.Format("Cannot service new request while processing another {0}-Operation.", mode));
     }
 
     private byte[] GetData(EntityType type, int id) {
-      Log("loading data", type, id);
       using (OKBDataContext okb = new OKBDataContext()) {
         switch (type) {
@@ -84 +58 @@
             }
             return algorithm.AlgorithmData.Data.ToArray();
-            break;
           case EntityType.Problem:
             Problem problem = okb.Problems.Single(p => p.Id == id);
@@ -95 +68 @@
             }
             return problem.ProblemData.Data.ToArray();
-            break;
           default:
-            throw new FaultException("Unsupported EntityType");
+            throw new FaultException("Unsupported EntityType.");
         }
       }
@@ -103 +75 @@
 
     private void SetData(EntityType type, int id, byte[] data) {
-      Log("saving data", type, id, data.Length);
-      OKBDataContext okb = new OKBDataContext();
-      switch (type) {
-        case EntityType.Algorithm:
-          Algorithm algorithm = okb.Algorithms.Single(a => a.Id == id);
-          if (algorithm.AlgorithmData == null)
-            algorithm.AlgorithmData = new AlgorithmData() {
-              AlgorithmId = algorithm.Id,
-              Data = new Binary(new byte[0])
-            };
-          algorithm.AlgorithmData.Data = new Binary(data);
-          okb.SubmitChanges();
-          break;
-        case EntityType.Problem:
-          Problem problem = okb.Problems.Single(p => p.Id == id);
-          if (problem.ProblemData == null)
-            problem.ProblemData = new ProblemData() {
-              ProblemId = problem.Id,
-              Data = new Binary(new byte[0])
-            };
-          problem.ProblemData.Data = new Binary(data);
-          okb.SubmitChanges();
-          break;
-        default:
-          throw new FaultException("Unsupported EntityType");
+      using (OKBDataContext okb = new OKBDataContext()) {
+        switch (type) {
+          case EntityType.Algorithm:
+            Algorithm algorithm = okb.Algorithms.Single(a => a.Id == id);
+            if (algorithm.AlgorithmData == null)
+              algorithm.AlgorithmData = new AlgorithmData() {
+                AlgorithmId = algorithm.Id,
+                Data = new Binary(new byte[0])
+              };
+            algorithm.AlgorithmData.Data = new Binary(data);
+            okb.SubmitChanges();
+            break;
+          case EntityType.Problem:
+            Problem problem = okb.Problems.Single(p => p.Id == id);
+            if (problem.ProblemData == null)
+              problem.ProblemData = new ProblemData() {
+                ProblemId = problem.Id,
+                Data = new Binary(new byte[0])
+              };
+            problem.ProblemData.Data = new Binary(data);
+            okb.SubmitChanges();
+            break;
+          default:
+            throw new FaultException("Unsupported EntityType.");
+        }
       }
-      okb.Dispose();
     }
 
     #region IDataService Members
-
     /// <summary>
     /// Request the specified <see cref="Algorithm"/> or <see cref="Problem"/>.
@@ -141 +111 @@
     /// <returns>The size of the data blob.</returns>
     public int Request(EntityType type, int id) {
-      Log("requesting data", type, id);
       EnsureInit();
       dataStream = new MemoryStream(GetData(type, id));
@@ -155 +124 @@
     public byte[] GetNextChunk(int size) {
       if (dataStream == null || mode != Mode.Request)
-        throw new FaultException("No data has been prepared, call Request first");
+        throw new FaultException("No data has been prepared, call Request first.");
       byte[] chunk = new byte[Math.Min(size, dataStream.Length - dataStream.Position)];
       dataStream.Read(chunk, 0, chunk.Length);
@@ -167 +136 @@
     /// <param name="id">The entity id.</param>
     public void Submit(EntityType type, int id) {
-      Log("Submitting", type, id);
       EnsureInit();
       GetData(type, id);
@@ -189 +157 @@
     /// </summary>
     public void TransferDone() {
-      Log("commiting transfer");
       if (mode == Mode.Submit)
         SetData(type, id, dataStream.ToArray());
@@ -201 +168 @@
       Dispose();
     }
-
     #endregion
 
     #region IDisposable Members
-
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
     /// </summary>
     public void Dispose() {
-      Log("disposing");
       mode = Mode.None;
       if (dataStream != null)
         dataStream.Dispose();
     }
-
     #endregion
   }

trunk/sources/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -128 +128 @@
     <Compile Include="Interfaces\IDataService.cs" />
     <Compile Include="Interfaces\IQueryService.cs" />
-    <Compile Include="Interfaces\IRunnerService.cs" />
+    <Compile Include="Interfaces\IRunnerService.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\ITableService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QueryService.cs" />
-    <Compile Include="RunnerService.cs" />
+    <Compile Include="RunnerService.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="StarterKit.cs" />
     <Compile Include="TableService.cs" />

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/IAdminService.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Allows updating the implementation of algorithms and problems. All
@@ -38 +37 @@
     /// <returns>A list of <see cref="Platform"/>s.</returns>
     [OperationContract]
-    Platform[] GetPlatformNames();
+    Platform[] GetPlatforms();
 
     /// <summary>
@@ -109 +108 @@
     [OperationContract]
     void UpdateCompleteProblem(Problem problem);
-
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/IDataService.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Choose between <see cref="Algorithm"/> or <see cref="Problem"/>.
@@ -30 +29 @@
   public enum EntityType {
     /// <summary>
-    /// Selects <see cref="Algorithm"/> as entity type.
+    /// Use <see cref="Algorithm"/> as entity type.
     /// </summary>
     Algorithm,
@@ -93 +92 @@
     void AbortTransfer();
   }
-
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/IQueryService.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Service interface for downloading selected information about <see cref="Experiment"/> <see cref="Run"/>s.
@@ -31 +30 @@
   [ServiceContract(SessionMode = SessionMode.Required, ProtectionLevel = ProtectionLevel.EncryptAndSign)]
   public interface IQueryService {
-
     /// <summary>
     /// Gets a list of all possible attribute selectors.

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/IRunnerService.cs

@@ -31 +31 @@
   [ServiceContract(SessionMode = SessionMode.Required, ProtectionLevel = ProtectionLevel.EncryptAndSign)]
   public interface IRunnerService {
-
     /// <summary>
     /// Logs the current user in. In case the user or client
@@ -86 +85 @@
     /// <param name="project">The project.</param>
     [OperationContract(IsInitiating = false)]
-    void AddRun(Algorithm algorithm, Problem problem, Project project);
+    void AddRun(Algorithm algorithm, Problem problem);
 
     /// <summary>
@@ -103 +102 @@
     void Logout();
   }
-
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/Interfaces/ITableService.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Service interface for downloading and uploading data tables.
@@ -75 +74 @@
     void DeleteTableRows(int[] ids, string tableName);
   }
-
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/QueryService.cs

@@ -27 +27 @@
 using HeuristicLab.Services.OKB.AttributeSelection;
 using HeuristicLab.Services.OKB.DataAccess;
-using log4net;
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Implementation of the <see cref="IQueryService"/>.
@@ -36 +34 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerSession, IncludeExceptionDetailInFaults = true)]
   public class QueryService : IQueryService, IDisposable {
-
-    private Guid sessionID;
-    private static ILog logger = LogManager.GetLogger(typeof(QueryService));
-
-    private void Log(string message, params object[] args) {
-      using (log4net.ThreadContext.Stacks["NDC"].Push(sessionID.ToString())) {
-        logger.Info(String.Format(message, args));
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="QueryService"/> class.
-    /// </summary>
-    public QueryService() {
-      sessionID = Guid.NewGuid();
-      Log("Instantiating new service");
-    }
-
-    private OKBDataContext GetDataContext() {
-      return new OKBDataContext();
-    }
-
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
@@ -76 +52 @@
     /// </returns>
     public AttributeSelector[] GetAllAttributeSelectors() {
-      Log("retrieving all attribute specifiers");
-      try {
-        OKBDataContext okb = GetDataContext();
+      using (OKBDataContext okb = new OKBDataContext()) {
         return RunAttributeSelector.GetAllAttributeSelectors(okb).Select(s => new AttributeSelector(s)).ToArray();
-      }
-      catch (Exception x) {
-        Log("exception caught: " + x.ToString());
-        throw;
       }
     }
@@ -95 +65 @@
     /// </returns>
     public DataTable PrepareQuery(AttributeSelector[] selectors) {
-      okb = GetDataContext();
-      Log("validating new query");
-      if (selectors.Length == 0)
-        throw new FaultException("No columns selected");
-      IEnumerable<RunAttributeSelector> checkedSelectors =
-        selectors.Select(s => new RunAttributeSelector(new OKBDataContext(okb.Connection.ConnectionString), s)).ToList();
-      Log("preparing query:\n  {0}", string.Join("\n  ", checkedSelectors.Select(s => s.ToString()).ToArray()));
-      dataSetBuilder = new DataSetBuilder(okb, checkedSelectors);
-      dataEnumerator = dataSetBuilder.GetEnumerator();
-      return dataSetBuilder.Runs;
+      using (OKBDataContext okb = new OKBDataContext()) {
+        if (selectors.Length == 0)
+          throw new FaultException("No columns selected");
+        IEnumerable<RunAttributeSelector> checkedSelectors =
+          selectors.Select(s => new RunAttributeSelector(new OKBDataContext(okb.Connection.ConnectionString), s)).ToList();
+        dataSetBuilder = new DataSetBuilder(okb, checkedSelectors);
+        dataEnumerator = dataSetBuilder.GetEnumerator();
+        return dataSetBuilder.Runs;
+      }
     }
 
@@ -137 +106 @@
     /// </summary>
     public void Terminate() {
-      Log("Terminating session");
       dataSetBuilder = null;
       if (dataEnumerator != null) {
-        Log("disposing data enumerate");
         dataEnumerator.Dispose();
         dataEnumerator = null;
       }
       if (okb != null) {
-        Log("disposing data context");
         okb.Dispose();
         okb = null;
       }
     }
-
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/RunnerService.cs

@@ -27 +27 @@
 using System.Web.Security;
 using HeuristicLab.Services.OKB.DataAccess;
-using log4net;
 
 namespace HeuristicLab.Services.OKB {
-
   /// <summary>
   /// Implementation of the <see cref="IRunnerService"/>.
   /// </summary>
-  [ServiceBehavior(
-    InstanceContextMode = InstanceContextMode.PerSession)]
+  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerSession)]
   public class RunnerService : IRunnerService, IDisposable {
-
-    private Guid sessionID;
-    private static ILog logger = LogManager.GetLogger(typeof(RunnerService));
-
-    private void Log(string message, params object[] args) {
-      using (log4net.ThreadContext.Stacks["NDC"].Push(sessionID.ToString())) {
-        logger.Info(String.Format(message, args));
-      }
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RunnerService"/> class.
-    /// </summary>
-    public RunnerService() {
-      sessionID = Guid.NewGuid();
-      Log("Instantiating new service");
-    }
-
     /// <summary>
     /// Obtain a "starter kit" of information, containing:
@@ -64 +43 @@
     /// </summary>
     public StarterKit GetStarterKit(string platformName) {
-      Log("distributing starter kit");
       Platform platform;
       using (OKBDataContext okb = new OKBDataContext()) {
@@ -86 +64 @@
         var StarterKit = new StarterKit() {
           AlgorithmClasses = okb.AlgorithmClasses.ToList(),
-          ProblemClasses = okb.ProblemClasses.ToList(),
-          Projects = okb.Projects.ToList()
+          ProblemClasses = okb.ProblemClasses.ToList()
         };
         return StarterKit;
@@ -100 +77 @@
     /// </summary>
     public ExperimentKit PrepareExperiment(Algorithm algorithm, Problem problem) {
-      Log("preparing experiment: {0}@{1}", algorithm.Name, problem.Name);
       OKBDataContext okb = new OKBDataContext();
       try {
         DataLoadOptions dlo = new DataLoadOptions();
         dlo.LoadWith<Problem>(p => p.SolutionRepresentation);
-        dlo.LoadWith<Parameter>(p => p.DataType);
+        dlo.LoadWith<AlgorithmParameter>(p => p.DataType);
+        dlo.LoadWith<ProblemParameter>(p => p.DataType);
         dlo.LoadWith<Result>(r => r.DataType);
-        dlo.LoadWith<Algorithm_Parameter>(ap => ap.Parameter);
-        dlo.LoadWith<Problem_Parameter>(pp => pp.Parameter);
-        dlo.LoadWith<Algorithm_Result>(ar => ar.Result);
         okb.LoadOptions = dlo;
         algorithm = okb.Algorithms.Single(a => a.Id == algorithm.Id);
         problem = okb.Problems.Single(p => p.Id == problem.Id);
-        algorithm.Algorithm_Parameters.Load();
-        algorithm.Algorithm_Results.Load();
-        problem.IntProblemCharacteristicValues.Load();
-        problem.FloatProblemCharacteristicValues.Load();
-        problem.CharProblemCharacteristicValues.Load();
-        problem.Problem_Parameters.Load();
+        algorithm.AlgorithmParameters.Load();
+        algorithm.Results.Load();
+        problem.ProblemCharacteristicIntValues.Load();
+        problem.ProblemCharacteristicFloatValues.Load();
+        problem.ProblemCharacteristicStringValues.Load();
+        problem.ProblemParameters.Load();
         return new ExperimentKit() {
           Algorithm = algorithm,
@@ -125 +99 @@
       }
       catch (Exception x) {
-        Log("exception caught: " + x.ToString());
         throw new FaultException("Excaption caught: " + x.ToString());
       }
@@ -141 +114 @@
     /// <param name="problem">The problem.</param>
     /// <param name="project">The project.</param>
-    public void AddRun(Algorithm algorithm, Problem problem, Project project) {
-      Log("adding run for {0}@{1}({2})[{3}, {4}]",
-        algorithm.Name, problem.Name, project.Name, currentUser.Name, currentClient.Name);
+    public void AddRun(Algorithm algorithm, Problem problem) {
       try {
         using (OKBDataContext okb = new OKBDataContext()) {
-          Experiment experiment = GetOrCreateExperiment(algorithm, problem, project, currentUser, okb);
+          Experiment experiment = GetOrCreateExperiment(algorithm, problem, currentUser, okb);
           Run run = new Run() {
             Experiment = experiment,
@@ -159 +130 @@
       }
       catch (Exception x) {
-        Log(x.ToString());
         throw new FaultException("Could not add run: " + x.ToString());
       }
     }
 
-    private Experiment GetOrCreateExperiment(Algorithm algorithm, Problem problem,
-        Project project, User user, OKBDataContext okb) {
+    private Experiment GetOrCreateExperiment(Algorithm algorithm, Problem problem, User user, OKBDataContext okb) {
       MatchResults(algorithm.Results, okb);
       EnsureParametersExist(algorithm.Parameters, okb);
-      var experimentQuery = CreateExperimentQuery(algorithm, problem, project, okb);
+      var experimentQuery = CreateExperimentQuery(algorithm, problem, okb);
       if (experimentQuery.Count() > 0) {
-        if (experimentQuery.Count() > 1)
-          Log("Warning: duplicate experiment found");
-        Log("reusing existing experiment");
         Experiment experiment = experimentQuery.First();
         return experiment;
       } else {
-        Log("creating new experiment");
         Experiment experiment = new Experiment() {
           AlgorithmId = algorithm.Id,
           ProblemId = problem.Id,
-          ProjectId = project.Id,
           ParameterValues = algorithm.ParameterValues
         };
@@ -191 +155 @@
       foreach (var result in results.Where(r => r.Name != null)) {
         result.Id = okb.Results.Single(r => r.Name == result.Name).Id;
-        Log("mapping named result {0} -> Id {1}", result.Name, result.Id);
         var value = result.ResultValue;
         if (value != null) {
@@ -205 +168 @@
         DataType dataType = GetOrCreateDataType(okb, param.DataType.ClrName);
         param.DataType = new DataType() { Id = dataType.Id };
-        Log("mapping datatype {0} to id {1}", dataType.ClrName, dataType.Id);
       }
       okb.SubmitChanges();
@@ -211 +173 @@
       var newParams = namedParams.Except(okb.Parameters, new NameComprarer());
       foreach (var p in newParams) {
-        Log("creating new parameter {0} ({2}:{1})", p.Name, p.DataType.ClrName, p.DataType.Id);
         okb.Parameters.InsertOnSubmit(new Parameter() {
           Name = p.Name,
@@ -220 +181 @@
       foreach (var np in namedParams) {
         np.Id = okb.Parameters.Single(p => p.Name == np.Name).Id;
-        Log("mapping named parameter {0} -> Id {1}", np.Name, np.Id);
         var value = np.ParameterValue;
         if (value != null) {
@@ -231 +191 @@
             DataType dataType = GetOrCreateDataType(okb, opVal.DataType.ClrName);
             newVal.DataType = new DataType() { Id = dataType.Id };
-            Log("mapping operator parameter datatype {0} to id {1}", dataType.ClrName, dataType.Id);
           }
         }
@@ -240 +199 @@
       DataType dataType = okb.DataTypes.SingleOrDefault(dt => dt.ClrName == clrName);
       if (dataType == null) {
-        Log("creating new datatype for ", clrName);
         dataType = new DataType() {
           ClrName = clrName,
@@ -251 +209 @@
     }
 
-    private IQueryable<Experiment> CreateExperimentQuery(Algorithm algorithm, Problem problem, Project project,
-        OKBDataContext okb) {
+    private IQueryable<Experiment> CreateExperimentQuery(Algorithm algorithm, Problem problem, OKBDataContext okb) {
       var experimentQuery =
         from x in okb.Experiments
         where x.Algorithm == algorithm
         where x.Problem == problem
-        where x.ProjectId == project.Id
         select x;
       foreach (IntParameterValue ipv in algorithm.IntParameterValues) {
@@ -279 +235 @@
             p.ParameterId == opv.ParameterId && p.DataTypeId == opv.DataTypeId));
       }
-      Log("experiment query: ", experimentQuery.Expression.ToString());
       return experimentQuery;
     }
@@ -310 +265 @@
       MembershipUser user = Membership.GetUser();
 
-      Log("Authenticating {0}@{1}", user.UserName, clientname);
       if (user == null ||
           string.IsNullOrEmpty(clientname) ||
           ServiceSecurityContext.Current.IsAnonymous) {
-        Log("rejecting anonymous login");
         return false;
       }
@@ -330 +283 @@
           okb.SubmitChanges();
         }
-        Log("  user = {0}, client = {1}", currentUser, currentClient);
         return true;
       }
@@ -339 +291 @@
     /// </summary>
     public void Logout() {
-      Log("Logging out");
       currentUser = null;
       currentClient = null;
@@ -348 +299 @@
     /// </summary>
     public void Dispose() {
-      Log("Closing session...");
       Logout();
     }
@@ -383 +333 @@
       return obj.Name.GetHashCode();
     }
-
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/StarterKit.cs

@@ -50 +50 @@
     [DataMember]
     public IEnumerable<ProblemClass> ProblemClasses { get; set; }
-
-    /// <summary>
-    /// Gets a list of all available projects.
-    /// </summary>
-    /// <value>The projects.</value>
-    [DataMember]
-    public IEnumerable<Project> Projects { get; set; }
   }
 

trunk/sources/HeuristicLab.Services.OKB/3.3/TableService.cs

@@ -31 +31 @@
 using HeuristicLab.Services.OKB.AttributeSelection;
 using HeuristicLab.Services.OKB.DataAccess;
-using log4net;
 
 namespace HeuristicLab.Services.OKB {
@@ -38 +37 @@
   /// Implementation of the <see cref="ITableService"/>.
   /// </summary>
-  [ServiceBehavior(
-    InstanceContextMode = InstanceContextMode.PerSession,
-    IncludeExceptionDetailInFaults = true)]
+  [ServiceBehavior(InstanceContextMode = InstanceContextMode.PerSession, IncludeExceptionDetailInFaults = true)]
   public class TableService : ITableService, IDisposable {
-
-    private static ILog logger = LogManager.GetLogger(typeof(TableService));
-
-    private OKBDataContext GetDataContext() {
-      return new OKBDataContext();
-    }
-
     private static List<Type> SupportedTypes = new List<Type>() {
       typeof(int),
+      typeof(long),
       typeof(double),
       typeof(string),
@@ -57 +48 @@
     };
 
+    private DataTable tableTemplate;
+    private IEnumerable<PropertyInfo> properties;
+    private IEnumerator rowEnumerator;
+
     #region ITableService Members
-
     /// <summary>
     /// Updates the data table.
@@ -65 +59 @@
     /// <param name="tableName">Name of the table.</param>
     public void UpdateDataTable(DataTable updatedRows, string tableName) {
-      logger.Info("updating table: " + tableName);
       Type tableType = Assembly.GetAssembly(typeof(Run)).GetType("HeuristicLab.Services.OKB.DataAccess." + tableName, true);
       var properties = from p in tableType.GetProperties()
                        where SupportedTypes.Contains(p.PropertyType)
                        select p;
-      OKBDataContext okb = GetDataContext();
-      ITable table = okb.GetTable(tableType);
-      foreach (DataRow row in updatedRows.Rows) {
-        if (row["Id"] == DBNull.Value)
-          table.InsertOnSubmit(CreateEntity(tableType, properties, row));
-      }
-      var updated = updatedRows.Rows.Cast<DataRow>().Where(row => row["Id"] != DBNull.Value).OrderBy(row => row["Id"]);
-      var entities = DataSetBuilder.GetEntities(okb, tableType, updated.Select(u => (int)u["Id"]));
-      var updateEnum = updated.GetEnumerator();
-      var entityEnum = entities.GetEnumerator();
-      while (updateEnum.MoveNext() && entityEnum.MoveNext()) {
-        bool idChecked = false;
-        foreach (var property in properties) {
-          Console.WriteLine("{0}.{1} = '{2}' -> '{3}'",
-            tableName, property.Name,
-            property.GetGetMethod().Invoke(entityEnum.Current, new object[0]),
-            updateEnum.Current[property.Name]);
-          if (property.Name == "Id") {
-            int entityId = (int)property.GetGetMethod().Invoke(entityEnum.Current, new object[0]);
-            int updateId = (int)updateEnum.Current["Id"];
-            Debug.Assert(entityId == updateId);
-            idChecked = true;
+      using (OKBDataContext okb = new OKBDataContext()) {
+        ITable table = okb.GetTable(tableType);
+        foreach (DataRow row in updatedRows.Rows) {
+          if (row["Id"] == DBNull.Value)
+            table.InsertOnSubmit(CreateEntity(tableType, properties, row));
+        }
+        var updated = updatedRows.Rows.Cast<DataRow>().Where(row => row["Id"] != DBNull.Value).OrderBy(row => row["Id"]);
+        var entities = DataSetBuilder.GetEntities(okb, tableType, updated.Select(u => (int)u["Id"]));
+        var updateEnum = updated.GetEnumerator();
+        var entityEnum = entities.GetEnumerator();
+        while (updateEnum.MoveNext() && entityEnum.MoveNext()) {
+          bool idChecked = false;
+          foreach (var property in properties) {
+            Console.WriteLine("{0}.{1} = '{2}' -> '{3}'",
+              tableName, property.Name,
+              property.GetGetMethod().Invoke(entityEnum.Current, new object[0]),
+              updateEnum.Current[property.Name]);
+            if (property.Name == "Id") {
+              int entityId = (int)property.GetGetMethod().Invoke(entityEnum.Current, new object[0]);
+              int updateId = (int)updateEnum.Current["Id"];
+              Debug.Assert(entityId == updateId);
+              idChecked = true;
+            }
+            object newValue = updateEnum.Current[property.Name];
+            if (newValue != DBNull.Value)
+              property.GetSetMethod().Invoke(entityEnum.Current, new object[] { newValue });
           }
-          object newValue = updateEnum.Current[property.Name];
-          if (newValue != DBNull.Value)
-            property.GetSetMethod().Invoke(entityEnum.Current, new object[] { newValue });
-        }
-        Debug.Assert(idChecked);
-      }
-      okb.SubmitChanges();
+          Debug.Assert(idChecked);
+        }
+        okb.SubmitChanges();
+      }
     }
 
     private object CreateEntity(Type tableType, IEnumerable<PropertyInfo> properties, DataRow row) {
       object instance = Activator.CreateInstance(tableType);
-      logger.Info("Creating new instance of " + tableType.Name);
       bool empty = true;
       foreach (var property in properties) {
@@ -125 +118 @@
     /// <param name="tableName">Name of the table.</param>
     public void DeleteTableRows(int[] ids, string tableName) {
-      logger.Info("delete rows from table: " + tableName);
       Type tableType = Assembly.GetAssembly(typeof(Run)).GetType("HeuristicLab.Services.OKB.DataAccess" + tableName, true);
-      OKBDataContext okb = GetDataContext();
-      ITable table = okb.GetTable(tableType);
-      table.DeleteAllOnSubmit(DataSetBuilder.GetEntities(okb, tableType, ids));
-      okb.SubmitChanges();
-    }
-
-    private DataTable tableTemplate;
-    private IEnumerable<PropertyInfo> properties;
-    private IEnumerator rowEnumerator;
+      using (OKBDataContext okb = new OKBDataContext()) {
+        ITable table = okb.GetTable(tableType);
+        table.DeleteAllOnSubmit(DataSetBuilder.GetEntities(okb, tableType, ids));
+        okb.SubmitChanges();
+      }
+    }
 
     /// <summary>
@@ -147 +136 @@
     /// </returns>
     public DataTable PrepareDataTable(string tableName, out int count) {
-      logger.Info("preparing data table: " + tableName);
       Type tableType = Assembly.GetAssembly(typeof(Run)).GetType("HeuristicLab.Services.OKB.DataAccess." + tableName, true);
       properties = from p in tableType.GetProperties()
@@ -163 +151 @@
         tableTemplate.Columns.Add(column);
       }
-      OKBDataContext okb = GetDataContext();
-      ITable table = okb.GetTable(tableType);
-      rowEnumerator = table.GetEnumerator();
-      count = DataSetBuilder.CountEntities(GetDataContext(), tableType);
-      return tableTemplate;
+      using (OKBDataContext okb = new OKBDataContext()) {
+        ITable table = okb.GetTable(tableType);
+        rowEnumerator = table.GetEnumerator();
+        count = DataSetBuilder.CountEntities(new OKBDataContext(), tableType);
+        return tableTemplate;
+      }
     }
 
@@ -198 +187 @@
       Dispose();
     }
-
     #endregion
 
     #region IDisposable Members
-
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
@@ -210 +197 @@
       properties = null;
     }
-
     #endregion
   }