Changeset 13553 for branches/thasling

Timestamp:

01/19/16 09:49:35 (9 years ago)

Author:

thasling

Message:

changed a few method names and other refactoring

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core.Host/Program.cs (modified) (1 diff)
• DistributedGA.Core/Domain/MessageRecieveEventArgs.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/MessageContractImpl.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (4 diffs)
• DistributedGA.Core/Implementation/WcfMessageSender.cs (modified) (1 diff)
• DistributedGA.Core/Implementation/WcfMessageService.cs (modified) (2 diffs)
• DistributedGA.Core/Interface/IMessageContract.cs (modified) (1 diff)
• DistributedGA.Core/Interface/IMessageHandler.cs (modified) (1 diff)
• DistributedGA.Core/Interface/IMessageSender.cs (modified) (1 diff)
• DistributedGA.Core/Interface/IMessageService.cs (modified) (1 diff)
• DistributedGA.Test/Form1.cs (modified) (2 diffs)
• DistributedGA.v12.suo (modified) (previous)

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

@@ -25 +25 @@
           var pop1 = CreatePopulation();
           Console.WriteLine("Publish population into network...");
-          h.PublishMigrationInfo(pop1);
+          h.PublishDataToNetwork(pop1);
           Console.WriteLine("Population published.");
           Console.WriteLine("Recieved populations:");
-          foreach (var item in h.GetMigrationInfo()) {
+          foreach (var item in h.GetDataFromNetwork()) {
             Console.WriteLine(string.Format("Population with Quality: {0:2} in Iteration {1}", item.Quality, item.IterationNumber));
           }

branches/thasling/DistributedGA/DistributedGA.Core/Domain/MessageRecieveEventArgs.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DistributedGA.Core.Domain
-{
-    public class MessageRecieveEventArgs : EventArgs
-    {
-        public int val;
-        public SolutionInfo[] Population { get; set; }
-        public PeerInfo Sender { get; set; }
-    }
+namespace DistributedGA.Core.Domain {
+  public class MessageRecieveEventArgs : EventArgs {
+    public int val;
+    public SolutionInfo[] data { get; set; }
+    public PeerInfo Sender { get; set; }
+  }
 }

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

@@ -7 +7 @@
   [ServiceBehavior(InstanceContextMode = InstanceContextMode.Single)]
   public class MessageContractImpl : IMessageContract {
-    public void SendPopulation(PeerInfo sender, SolutionInfo[] population) {
-      MessageRecieveEventArgs args = new MessageRecieveEventArgs() { Sender = sender, Population = population };
+    public void SendData(PeerInfo sender, SolutionInfo[] data) {
+      MessageRecieveEventArgs args = new MessageRecieveEventArgs() { Sender = sender, data = data };
 
       if (MessageRecieved != null) {

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

@@ -43 +43 @@
         host = new WcfMessageService();
         ownInstance.Port = host.Init(ownInstance.IpAddress); //getting port, on which service is hostet
-        host.OnPopulationRecieved += new EventHandler<MessageRecieveEventArgs>(OnPopulationRecieved);
+        host.OnDataRecieved += new EventHandler<MessageRecieveEventArgs>(OnPopulationRecieved);
 
         peerListManager = new WcfPeerListManager();
@@ -65 +65 @@
     }
 
-    public void PublishMigrationInfo(SolutionInfo[] population) {
+    public void PublishDataToNetwork(SolutionInfo[] data) {
       try {
         foreach (PeerInfo peer in peerListManager.GetPeerList()) {
           //HACK: manipulate for monitoring in test
-          foreach (SolutionInfo si in population) {
+          foreach (SolutionInfo si in data) {
             si.IterationNumber = ownInstance.Port;
           }
           //maybe something will go wrong during network communication...
           try {
-            sender.SendPopulation(peer, population);
+            sender.SendData(peer, data);
           } catch (Exception ex) {
             AddError("PeerNetworkMessageHandler.PublishMigrationInfo(during sending to one peer!)", ex);
@@ -84 +84 @@
     }
 
-    public SolutionInfo[] GetMigrationInfo() {
+    public SolutionInfo[] GetDataFromNetwork() {
       try {
         List<SolutionInfo> res = new List<SolutionInfo>();
@@ -131 +131 @@
       if (e != null) {
         lock (activeQueueLocker) {
-          foreach (SolutionInfo si in e.Population) {
+          foreach (SolutionInfo si in e.data) {
             writeQueue.Enqueue(si);
           }

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

@@ -1 @@
-using DistributedGA.Core.Domain;
+using System;
+using System.ServiceModel;
+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 WcfMessageSender : IMessageSender
-    {
-        private PeerInfo myself;
+namespace DistributedGA.Core.Implementation {
+  public class WcfMessageSender : IMessageSender {
+    private PeerInfo myself;
 
-        public void Init(PeerInfo source)
-        {
-            myself = source;
-        }
+    public void Init(PeerInfo source) {
+      myself = source;
+    }
 
-        public void SendPopulation(PeerInfo destination, SolutionInfo[] population)
-        {
-            var client = CreateServerClient(destination.IpAddress, destination.Port);
-            client.SendPopulation(myself, population); //maybe timout exception...
-        }
+    public void SendData(PeerInfo destination, SolutionInfo[] data) {
+      var client = CreateServerClient(destination.IpAddress, destination.Port);
+      client.SendData(myself, data); //maybe timout exception...
+    }
 
-        private IMessageContract CreateServerClient(string ip, int port)
-        {
-            var serviceUrl = "DistributedGA.svc";
-            var baseUri = new Uri(string.Concat("http://", ip, ":", port, "/DistributedGA"));
-            var serviceUri = new Uri(baseUri, serviceUrl);
+    private IMessageContract CreateServerClient(string ip, int port) {
+      var serviceUrl = "DistributedGA.svc";
+      var baseUri = new Uri(string.Concat("http://", ip, ":", port, "/DistributedGA"));
+      var serviceUri = new Uri(baseUri, serviceUrl);
 
-            var binding = new BasicHttpBinding();
-            var endpoint = new EndpointAddress(serviceUri);
-            var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint);
+      var binding = new BasicHttpBinding();
+      var endpoint = new EndpointAddress(serviceUri);
+      var myChannelFactory = new ChannelFactory<IMessageContract>(binding, endpoint);
 
-            IMessageContract client = null;
-            client = myChannelFactory.CreateChannel();
-            return client;
-        }
+      IMessageContract client = null;
+      client = myChannelFactory.CreateChannel();
+      return client;
+    }
 
-    }
+  }
 }

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

@@ -9 +9 @@
 namespace DistributedGA.Core.Implementation {
   public class WcfMessageService : IMessageService {
-    public event EventHandler<MessageRecieveEventArgs> OnPopulationRecieved;
+    public event EventHandler<MessageRecieveEventArgs> OnDataRecieved;
 
     private static ManualResetEvent _ResetEvent = new ManualResetEvent(false);
@@ -55 +55 @@
 
     private void OnMessageRecieved(object sender, MessageRecieveEventArgs e) {
-      if (OnPopulationRecieved != null) {
-        OnPopulationRecieved(this, e);
+      if (OnDataRecieved != null) {
+        OnDataRecieved(this, e);
       }
     }

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

@@ -7 +7 @@
   public interface IMessageContract {
     [OperationContract]
-    void SendPopulation(PeerInfo sender, SolutionInfo[] population);
+    void SendData(PeerInfo sender, SolutionInfo[] data);
 
     event EventHandler<MessageRecieveEventArgs> MessageRecieved;

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

@@ -6 +6 @@
     void Init(); //Registers at contract-server
 
-    void PublishMigrationInfo(SolutionInfo[] population);
+    void PublishDataToNetwork(SolutionInfo[] data);
 
-    SolutionInfo[] GetMigrationInfo();
+    SolutionInfo[] GetDataFromNetwork();
 
     PeerInfo GetPeerInfo();

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

@@ -1 +1 @@
 using DistributedGA.Core.Domain;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DistributedGA.Core.Interface
-{
-    public interface IMessageSender
-    {
-        void Init(PeerInfo source);
+namespace DistributedGA.Core.Interface {
+  public interface IMessageSender {
+    void Init(PeerInfo source);
 
-        void SendPopulation(PeerInfo destination, SolutionInfo[] population);
-    }
+    void SendData(PeerInfo destination, SolutionInfo[] data);
+  }
 }

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

@@ -13 +13 @@
     void Dispose();
 
-    event EventHandler<MessageRecieveEventArgs> OnPopulationRecieved;
+    event EventHandler<MessageRecieveEventArgs> OnDataRecieved;
   }
 }

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

@@ -21 +21 @@
       IMessageSender c = new WcfMessageSender();
       c.Init(null);
-      c.SendPopulation(null, null);
+      c.SendData(null, null);
     }
 
@@ -36 +36 @@
       h5.Init();
       var pop1 = CreatePopulation();
-      h1.PublishMigrationInfo(pop1);
-      h1.PublishMigrationInfo(pop1);
-      var res1 = h1.GetMigrationInfo();
-      var res2 = h2.GetMigrationInfo();
-      h1.PublishMigrationInfo(pop1);
-      h1.PublishMigrationInfo(pop1);
-      var res3 = h1.GetMigrationInfo();
-      var res4 = h2.GetMigrationInfo();
-      h1.PublishMigrationInfo(pop1);
-      h1.PublishMigrationInfo(pop1);
-      var res5 = h1.GetMigrationInfo();
-      var res6 = h2.GetMigrationInfo();
+      h1.PublishDataToNetwork(pop1);
+      h1.PublishDataToNetwork(pop1);
+      var res1 = h1.GetDataFromNetwork();
+      var res2 = h2.GetDataFromNetwork();
+      h1.PublishDataToNetwork(pop1);
+      h1.PublishDataToNetwork(pop1);
+      var res3 = h1.GetDataFromNetwork();
+      var res4 = h2.GetDataFromNetwork();
+      h1.PublishDataToNetwork(pop1);
+      h1.PublishDataToNetwork(pop1);
+      var res5 = h1.GetDataFromNetwork();
+      var res6 = h2.GetDataFromNetwork();
       int i = 0;
     }