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

Timestamp:

09/16/10 06:42:00 (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) (4 diffs)
• HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• Interfaces/IAdminService.cs (modified) (2 diffs)
• app.config (modified) (1 diff)

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

@@ -31 +31 @@
   [ServiceBehavior(IncludeExceptionDetailInFaults = true)]
   public class AdminService : IAdminService {
+    public void AddAlgorithmClass(AlgorithmClass algorithmClass) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        okb.AlgorithmClasses.InsertOnSubmit(new AlgorithmClass() {
+          Name = algorithmClass.Name,
+          Description = algorithmClass.Description
+        });
+        okb.SubmitChanges();
+      }
+    }
+    public AlgorithmClass[] GetAlgorithmClasses() {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.AlgorithmClasses.ToArray();
+      }
+    }
+    public void UpdateAlgorithmClass(AlgorithmClass algorithmClass) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        AlgorithmClass original = okb.AlgorithmClasses.First(a => a.Id == algorithmClass.Id);
+        original.Name = algorithmClass.Name;
+        original.Description = algorithmClass.Description;
+        okb.SubmitChanges();
+      }
+    }
+    public void DeleteAlgorithmClass(long algorithmClassId) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        okb.AlgorithmClasses.DeleteOnSubmit(okb.AlgorithmClasses.First(a => a.Id == algorithmClassId));
+        okb.SubmitChanges();
+      }
+    }
+
+    public void AddAlgorithm(Algorithm algorithm) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        okb.Algorithms.InsertOnSubmit(new Algorithm() {
+          AlgorithmClassId = algorithm.AlgorithmClassId,
+          PlatformId = algorithm.PlatformId,
+          Name = algorithm.Name,
+          Description = algorithm.Description
+        });
+        okb.SubmitChanges();
+      }
+    }
+    public Algorithm[] GetAlgorithms() {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.Algorithms.ToArray();
+      }
+    }
+    public void UpdateAlgorithm(Algorithm algorithm) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        Algorithm original = okb.Algorithms.First(a => a.Id == algorithm.Id);
+        original.AlgorithmClassId = algorithm.AlgorithmClassId;
+        original.PlatformId = algorithm.PlatformId;
+        original.Name = algorithm.Name;
+        original.Description = algorithm.Description;
+        okb.SubmitChanges();
+      }
+    }
+    public void DeleteAlgorithm(long algorithmId) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        okb.Algorithms.DeleteOnSubmit(okb.Algorithms.First(a => a.Id == algorithmId));
+        okb.SubmitChanges();
+      }
+    }
+
     /// <summary>
     /// Gets all available platforms.
@@ -80 +142 @@
         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);
@@ -143 +197 @@
         Problem originalProblem = okb.Problems.Single(p => p.Id == problem.Id);
         UpdateProblemData(problem, originalProblem, okb);
-        UpdateProblemCharacteristics(problem, originalProblem, okb);
         okb.SubmitChanges();
       }
@@ -178 +231 @@
       }
     }
-    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.ProblemCharacteristicFloatValues) {
-        original.ProblemCharacteristicFloatValues.Add(new ProblemCharacteristicFloatValue() {
-          ProblemId = original.Id,
-          ProblemCharacteristicId = fpc.ProblemCharacteristicId,
-          Value = fpc.Value,
-        });
-      }
-      foreach (var cpc in problem.ProblemCharacteristicStringValues) {
-        original.ProblemCharacteristicStringValues.Add(new ProblemCharacteristicStringValue() {
-          ProblemId = original.Id,
-          ProblemCharacteristicId = cpc.ProblemCharacteristicId,
-          Value = cpc.Value,
-        });
-      }
-    }
-
-
-    public void AddAlgorithmClass(AlgorithmClass algorithmClass) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        okb.AlgorithmClasses.InsertOnSubmit(new AlgorithmClass() { Name = algorithmClass.Name, Description = algorithmClass.Description });
-        okb.SubmitChanges();
-      }
-    }
-
-    public AlgorithmClass[] GetAlgorithmClasses() {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        return okb.AlgorithmClasses.ToArray();
-      }
-    }
-
-    public void UpdateAlgorithmClass(AlgorithmClass algorithmClass) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        AlgorithmClass original = okb.AlgorithmClasses.First(a => a.Id == algorithmClass.Id);
-        original.Name = algorithmClass.Name;
-        original.Description = algorithmClass.Description;
-        okb.SubmitChanges();
-      }
-    }
-
-    public void DeleteAlgorithmClass(long algorithmClassId) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        okb.AlgorithmClasses.DeleteOnSubmit(okb.AlgorithmClasses.First(a => a.Id == algorithmClassId));
-        okb.SubmitChanges();
-      }
-    }
-
   }
 }

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

@@ -121 +121 @@
   <ItemGroup>
     <Compile Include="AdminService.cs" />
-    <Compile Include="DataService.cs" />
-    <Compile Include="ExperimentKit.cs" />
     <Compile Include="Interfaces\IAdminService.cs" />
-    <Compile Include="Interfaces\IDataService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StarterKit.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -26 +26 @@
 namespace HeuristicLab.Services.OKB {
   /// <summary>
-  /// Allows updating the implementation of algorithms and problems. All
-  /// other entities can be modified using the <see cref="TableService"/>
+  /// Service of administrating the OKB.
   /// </summary>  
   [ServiceContract(ProtectionLevel = ProtectionLevel.EncryptAndSign)]
   public interface IAdminService {
+    [OperationContract]
+    void AddAlgorithmClass(AlgorithmClass algorithmClass);
+    [OperationContract]
+    AlgorithmClass[] GetAlgorithmClasses();
+    [OperationContract]
+    void UpdateAlgorithmClass(AlgorithmClass algorithmClass);
+    [OperationContract]
+    void DeleteAlgorithmClass(long algorithmClassId);
+
+    [OperationContract]
+    void AddAlgorithm(Algorithm algorithm);
+    [OperationContract]
+    Algorithm[] GetAlgorithms();
+    [OperationContract]
+    void UpdateAlgorithm(Algorithm algorithm);
+    [OperationContract]
+    void DeleteAlgorithm(long algorithmId);
+
+
+
+
 
     /// <summary>
@@ -108 +128 @@
     [OperationContract]
     void UpdateCompleteProblem(Problem problem);
-
-
-
-    [OperationContract]
-    void AddAlgorithmClass(AlgorithmClass algorithmClass);
-
-    [OperationContract]
-    AlgorithmClass[] GetAlgorithmClasses();
-
-    [OperationContract]
-    void UpdateAlgorithmClass(AlgorithmClass algorithmClass);
-
-    [OperationContract]
-    void DeleteAlgorithmClass(long algorithmClassId);
-
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/app.config

@@ -67 +67 @@
       <service name="HeuristicLab.Services.OKB.AdminService" behaviorConfiguration="DefaultServiceBehavior">
         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" />
-        <endpoint binding="netTcpBinding" bindingConfiguration="DefaultNetTcpBinding" contract="HeuristicLab.Services.OKB.IAdminService" />
+        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.OKB.IAdminService" />
         <host>
           <baseAddresses>
             <add baseAddress="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdminService" />
-            <add baseAddress="net.tcp://localhost:8733/OKB-3.3/AdminService" />
           </baseAddresses>
         </host>