Changeset 13972 for branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs

Timestamp:

07/01/16 20:24:52 (8 years ago)

Author:

thasling

Message:

#2615:
improved log
made changes in data structure

File:

• branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs (modified) (4 diffs)

branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs

@@ -208 +208 @@
         {
           // send
-          var message = new byte[emigrantsList.Count][];
           for (int ei = 0; ei < emigrantsList.Count; ei++) {
             using (var stream = new MemoryStream()) {
+              byte[] message;
               var emigrantScope = emigrantsList[ei];
 
@@ -219 +219 @@
               }
               HeuristicLab.Persistence.Default.Xml.XmlGenerator.Serialize(msgScope, stream);
-              message[ei] = stream.GetBuffer();
+              message = stream.GetBuffer();
+              h.PublishDataToNetwork(message);
+
             }
           }
-          h.PublishDataToNetwork(message);
         }
 
@@ -229 +230 @@
           // recieve
           var message = h.GetDataFromNetwork();
-          for (int ei = 0; ei < message.Length; ei++) {
-            using (var stream = new MemoryStream(message[ei])) {
+          //for (int ei = 0; ei < message.Length; ei++) {
+          foreach (var msg in message) {
+            using (var stream = new MemoryStream(msg.Value)) {
               var immigrantScope = HeuristicLab.Persistence.Default.Xml.XmlParser.Deserialize<IScope>(stream);
 
@@ -278 +280 @@
               double quality = 0.0;
               quality = qImmigrant;
-              log.LogMessage(string.Format("Recieved individual with quality {0}", quality));
+              log.LogMessage(string.Format("Recieved individual with quality {0} from peer {1}:{2} ; Job: {3}",
+                                            quality, msg.Key.IpAddress, msg.Key.Port, msg.Key.ProblemInstance));
             }
           }