Changeset 357 for trunk/sources/HeuristicLab.CEDMA.Server

Timestamp:

07/01/08 16:40:27 (16 years ago)

Author:

gkronber

Message:

worked on ticket #187. code is a mess. work-in-progress.

Location:

trunk/sources/HeuristicLab.CEDMA.Server

Files:

• AgentWorld.cs (deleted)
• HeuristicLab.CEDMA.Server.csproj (modified) (3 diffs)
• IAgentWorld.cs (deleted)
• ServerForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

@@ -38 +38 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization">
@@ -56 +59 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentWorld.cs" />
-    <Compile Include="IAgentWorld.cs" />
     <Compile Include="ServerApplication.cs" />
     <Compile Include="HeuristicLabCedmaServerPlugin.cs" />
@@ -69 +70 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
+      <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
+      <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.CEDMA.DB\HeuristicLab.CEDMA.DB.csproj">
+      <Project>{B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}</Project>
+      <Name>HeuristicLab.CEDMA.DB</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/sources/HeuristicLab.CEDMA.Server/ServerForm.cs

@@ -32 +32 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Net;
+using HeuristicLab.CEDMA.DB;
+using HeuristicLab.CEDMA.DB.Interfaces;
 
 namespace HeuristicLab.CEDMA.Server {
   public partial class ServerForm : Form {
     private ServiceHost host;
-    private AgentWorld agentWorld = new AgentWorld();
+    private Database database = new Database();
 
     public ServerForm() {
@@ -51 +53 @@
 
     private void Start() {
-      host = new ServiceHost(agentWorld, new Uri(addressTextBox.Text));
+      host = new ServiceHost(database, new Uri(addressTextBox.Text));
       ServiceThrottlingBehavior throttlingBehavior = new ServiceThrottlingBehavior();
       throttlingBehavior.MaxConcurrentSessions = 20;
@@ -62 +64 @@
         binding.Security.Mode = SecurityMode.None;
 
-        host.AddServiceEndpoint(typeof(IAgentWorld), binding, addressTextBox.Text);
+        host.AddServiceEndpoint(typeof(IDatabase), binding, addressTextBox.Text);
         host.Open();
       } catch (CommunicationException ex) {
@@ -71 +73 @@
 
     private void statusUpdateTimer_Tick(object sender, EventArgs e) {
-      activeAgentsTextBox.Text = agentWorld.ActiveAgents.ToString();
     }
   }