Changeset 13957

Timestamp:

06/29/16 17:21:53 (8 years ago)

Author:

thasling

Message:

#2615:
implemented mechanism to check wheter recieved packages are from the same problem instance or not
added several config parameters to P2PMigrationAnalyzer
added new enum for migration strategies

Location:

branches/thasling/DistributedGA

Files:

• DistributedGA.Core/Implementation/PeerNetworkMessageHandler.cs (modified) (1 diff)
• DistributedGA.Hive/DistributedGA.Hive.csproj (modified) (1 diff)
• DistributedGA.Hive/MigrationStrategy.cs (added)
• DistributedGA.Hive/P2PMigrationAnalyzer.cs (modified) (5 diffs)

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

@@ -135 +135 @@
 
     private void OnDataRecieved(object sender, MessageRecieveEventArgs e) {
-      if (e != null) {
+      if (e != null && e.Sender.ProblemInstance.Equals(ownInstance.ProblemInstance)) {
         lock (activeQueueLocker) {
           foreach (byte[] item in e.data) {

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

@@ -97 +97 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MigrationStrategy.cs" />
     <Compile Include="P2PTask.cs" />
     <Compile Include="Plugin.cs" />

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

@@ -28 +28 @@
 using DistributedGA.Core.Implementation;
 using DistributedGA.Core.Interface;
+using DistributedGA.Hive;
 using HeuristicLab.Clients.Hive;
 using HeuristicLab.Common;
@@ -45 +46 @@
     public ILookupParameter<IntValue> MigrationIterationsParameter {
       get { return (ILookupParameter<IntValue>)Parameters["MigrationIterations"]; }
+    }
+    public ILookupParameter<IntValue> MigrationRatesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["MigrationRate"]; }
+    }
+    public ILookupParameter<IntValue> CommunicationRatesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["CommunicationRate"]; }
+    }
+    public ILookupParameter<IntValue> MessageCacheCapacityParameter {                         
+      get { return (ILookupParameter<IntValue>)Parameters["MessageCacheCapacity"]; }
     }
     public ILookupParameter<IRandom> RandomParameter {
@@ -76 +86 @@
       Parameters.Add(new LookupParameter<IntValue>("MigrationIterations"));
       Parameters.Add(new ValueParameter<IntValue>("MigrationInterval", "", new IntValue(1)));
+      Parameters.Add(new ValueParameter<IntValue>("MigrationRate", "", new IntValue(5)));
+      Parameters.Add(new ValueParameter<IntValue>("CommunicationRate", "", new IntValue(10)));
+      Parameters.Add(new ValueParameter<IntValue>("MessageCacheCapacity", "", new IntValue(100)));
       Parameters.Add(new ValueParameter<StringValue>("LanIpPrefix", "", new StringValue("10.")));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator"));
@@ -100 +113 @@
       var contactServerUri = ((StringValue)(Parameters["ContactServerURL"].ActualValue)).Value;
       var problemInstance = ((StringValue)Parameters["JobGUID"].ActualValue).Value;
-      h.Init(lanIpPrefix, contactServerUri, problemInstance, 10000, 100);
+      var communicationRate = ((IntValue)Parameters["CommunicationRate"].ActualValue).Value;
+      var messageCacheCapacity = ((IntValue)Parameters["MessageCacheCapacity"].ActualValue).Value;
+      h.Init(lanIpPrefix, contactServerUri, problemInstance, messageCacheCapacity, communicationRate);
       var peer = h.GetPeerInfo();
     }
@@ -113 +128 @@
         IScope scope = ExecutionContext.Scope;
         List<IScope> emigrantsList = new List<IScope>();
+
+        //define how many migrants to send
+        var migrationRate = ((IntValue)Parameters["MigrationRate"].ActualValue).Value;
+
+        //TODO: SELECT MIGRATION STRATEGY
 
         // select best as emigrant