Changeset 13556

Timestamp:

01/19/16 12:00:45 (9 years ago)

Author:

thasling

Message:

new hive project

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core.Host/Program.cs (modified) (1 diff)
• DistributedGA.Core/DistributedGA.Core.csproj (modified) (2 diffs)
• DistributedGA.Core/HeuristicLab.snk (added)
• DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (5 diffs)
• DistributedGA.Core/Implementation/TestPeerListManager.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (2 diffs)
• DistributedGA.Core/Interface/IMessageHandler.cs (modified) (1 diff)
• DistributedGA.Core/Interface/IPeerListManager.cs (modified) (1 diff)
• DistributedGA.Hive/DistributedGA.Hive.csproj (modified) (3 diffs)
• DistributedGA.Hive/HeuristicLab.snk (added)
• DistributedGA.Hive/P2PTask.cs (added)
• DistributedGA.Hive/Plugin.cs (added)
• DistributedGA.Hive/Program.cs (deleted)
• DistributedGA.Test/Form1.cs (modified) (2 diffs)
• DistributedGA.v12.suo (modified) (previous)

branches/thasling/DistributedGA/DistributedGA.Core.Host/Program.cs

@@ -11 +11 @@
         Console.WriteLine("Starting peer...");
         IMessageHandler h = new PeerNetworkMessageHandler();
-        h.Init();
+        h.Init("","");
         PeerInfo pi = h.GetPeerInfo();
         Console.WriteLine(string.Format("Peer is hostet at IP: {0} and port: {1}", pi.IpAddress, pi.Port));

branches/thasling/DistributedGA/DistributedGA.Core/DistributedGA.Core.csproj

@@ -29 +29 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
@@ -61 +67 @@
     <Compile Include="SolutionInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs

@@ -2 +2 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Net;
@@ -30 +29 @@
 
 
-    public void Init() {
+    public void Init(string lanIpPrefix, string contactServerUrl) {
       try {
         ownInstance = new PeerInfo() {
-          IpAddress = GetExternalIpAddress(),
+          IpAddress = GetExternalIpAddress(lanIpPrefix),
           Port = 0,
           ProblemInstance = "TestProblem"
@@ -46 +45 @@
 
         peerListManager = new WcfPeerListManager();
-        peerListManager.Init(ownInstance);
+        peerListManager.Init(ownInstance, contactServerUrl);
 
         sender = new WcfMessageSender();
@@ -114 +113 @@
     }
 
-    private string GetExternalIpAddress() {
+    private string GetExternalIpAddress(string ipPrefix) {
       try {
         var strHostName = Dns.GetHostName();
@@ -123 +122 @@
         return addr
           .Select(ip => ip.ToString())
-          .First(str => str.StartsWith(ConfigurationManager.AppSettings["LanIpPrefix"]));
+          .First(str => str.StartsWith(ipPrefix));
       } catch { return null; }
     }

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/TestPeerListManager.cs

@@ -1 @@
-using DistributedGA.Core.Domain;
+using System.Collections.Generic;
+using DistributedGA.Core.Domain;
 using DistributedGA.Core.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceModel;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DistributedGA.Core.Implementation
-{
-    public class TestPeerListManager : IPeerListManager
-    {
-        public void Init(PeerInfo source)
-        {
+namespace DistributedGA.Core.Implementation {
+  public class TestPeerListManager : IPeerListManager {
 
-        }
 
-        public List<PeerInfo> GetPeerList()
-        {
-            PeerInfo pi1 = new PeerInfo() { IpAddress = "localhost", Port = 3030 };
-            PeerInfo pi2 = new PeerInfo() { IpAddress = "localhost", Port = 3031 };
-            PeerInfo pi3 = new PeerInfo() { IpAddress = "localhost", Port = 3032 };
-            PeerInfo pi4 = new PeerInfo() { IpAddress = "localhost", Port = 3033 };
-            PeerInfo pi5 = new PeerInfo() { IpAddress = "localhost", Port = 3034 };
-            return new List<PeerInfo>() { pi1, pi2, pi3, pi4, pi5 };
-        }
+    public List<PeerInfo> GetPeerList() {
+      PeerInfo pi1 = new PeerInfo() { IpAddress = "localhost", Port = 3030 };
+      PeerInfo pi2 = new PeerInfo() { IpAddress = "localhost", Port = 3031 };
+      PeerInfo pi3 = new PeerInfo() { IpAddress = "localhost", Port = 3032 };
+      PeerInfo pi4 = new PeerInfo() { IpAddress = "localhost", Port = 3033 };
+      PeerInfo pi5 = new PeerInfo() { IpAddress = "localhost", Port = 3034 };
+      return new List<PeerInfo>() { pi1, pi2, pi3, pi4, pi5 };
+    }
 
-        public void SendLogToServer(string msg)
-        {
+    public void SendLogToServer(string msg) {
 
-        }
     }
+
+    public void Init(PeerInfo source, string contactServerUrl) {
+
+    }
+  }
 }

branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.ServiceModel;
@@ -15 +14 @@
     private PeerInfo myself = null;
 
-    public void Init(PeerInfo source) {
-      serverString = ConfigurationManager.AppSettings["ContactServerURL"];
+    public void Init(PeerInfo source, string contactServerUrl) {
+      serverString = contactServerUrl;
       client = CreateClient();
       myself = source;

branches/thasling/DistributedGA/DistributedGA.Core/Interface/IMessageHandler.cs

@@ -4 +4 @@
 namespace DistributedGA.Core.Interface {
   public interface IMessageHandler {
-    void Init(); //Registers at contract-server
+    void Init(string lanIpPrefix, string contactServerUrl); //Registers at contract-server
 
     void PublishDataToNetwork(SolutionInfo[] data);

branches/thasling/DistributedGA/DistributedGA.Core/Interface/IPeerListManager.cs

@@ -1 @@
-using DistributedGA.Core.Domain;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using DistributedGA.Core.Domain;
 
-namespace DistributedGA.Core.Interface
-{
-    public interface IPeerListManager
-    {
-        void Init(PeerInfo source); //Registers own instance at the contact-server
+namespace DistributedGA.Core.Interface {
+  public interface IPeerListManager {
+    void Init(PeerInfo source, string contactServerUrl); //Registers own instance at the contact-server
 
-        List<PeerInfo> GetPeerList(); //Recieves all peers in the network from contact-server
+    List<PeerInfo> GetPeerList(); //Recieves all peers in the network from contact-server
 
-        void SendLogToServer(string msg);
-    }
+    void SendLogToServer(string msg);
+  }
 }

branches/thasling/DistributedGA/DistributedGA.Hive/DistributedGA.Hive.csproj

@@ -6 +6 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{F191E644-1AFC-4825-8897-E79A6ED91B20}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DistributedGA.Hive</RootNamespace>
@@ -32 +32 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HeuristicLab.Clients.Hive-3.3">
       <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Clients.Hive-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.Clients.Hive.JobManager-3.3">
-      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Clients.Hive.JobManager-3.3.dll</HintPath>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Collections-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Common-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Core-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Data-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Hive-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Hive-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Optimization-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Parameters-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.Persistence-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\Users\Lokal\Downloads\HeuristicLab 3.3.13\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
@@ -49 +84 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
+    <Compile Include="P2PTask.cs" />
+    <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="HeuristicLab.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DistributedGA.Core\DistributedGA.Core.csproj">
+      <Project>{02e73f42-bdc9-4a7a-b74f-5879def27320}</Project>
+      <Name>DistributedGA.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/thasling/DistributedGA/DistributedGA.Test/Form1.cs

@@ -26 +26 @@
     private void button3_Click(object sender, EventArgs e) {
       IMessageHandler h1 = new PeerNetworkMessageHandler();
-      h1.Init();
+      h1.Init("", "");
       IMessageHandler h2 = new PeerNetworkMessageHandler();
-      h2.Init();
+      h2.Init("", "");
       IMessageHandler h3 = new PeerNetworkMessageHandler();
-      h3.Init();
+      h3.Init("", "");
       IMessageHandler h4 = new PeerNetworkMessageHandler();
-      h4.Init();
+      h4.Init("", "");
       IMessageHandler h5 = new PeerNetworkMessageHandler();
-      h5.Init();
+      h5.Init("", "");
       var pop1 = CreatePopulation();
       h1.PublishDataToNetwork(pop1);
@@ -53 +53 @@
     private void button4_Click(object sender, EventArgs e) {
       var l = new WcfPeerListManager();
-      l.Init(CreatePeerInfo());
+      l.Init(CreatePeerInfo(),"");
       l.GetPeerList();
     }