Changeset 13982 for branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs

Timestamp:

07/02/16 15:23:57 (8 years ago)

Author:

thasling

Message:

#2615:
made minor changes

File:

• branches/thasling/DistributedGA/DistributedGA.Core/Implementation/WcfPeerListManager.cs (modified) (4 diffs)

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

@@ -24 +24 @@
     private IContactService heartbeatClient;
 
-    private Random rand;
 
-    private double communicationRate; //how many peers are contacted by this peer in percent
 
-    public void Init(PeerInfo source, string contactServerUrl, double communicationRate) {
+    public void Init(PeerInfo source, string contactServerUrl) {
       serverString = contactServerUrl;
-      this.communicationRate = communicationRate;
       myself = source;
-      rand = new Random();
-     
+
       //Init ChannelFactory and Clients
       var binding = new NetTcpBinding();
@@ -43 +39 @@
       client.RegisterPeer(source);
       //Start heartbeat timer
-      timer = new Timer(1000); //each 5 minutes
+      timer = new Timer(1000 * 20); //each 20 seconds
       timer.Elapsed += SendHeartbeatToServer;
       timer.Start();
@@ -51 +47 @@
       try {
         var allPeers = client.GetPeerList(myself); //maybe timout exception...
-        var peersForMessaging = ChoosePeersForMessaging(ref allPeers);
-        return peersForMessaging;
+        return allPeers;
       }
       catch { } //if maybe sending failed (because of connection lost, etc.): just ignore
@@ -72 +67 @@
     }
 
-
-    private List<PeerInfo> ChoosePeersForMessaging(ref List<PeerInfo> allPeers) {
-      Shuffle<PeerInfo>(allPeers);
-      int toTake = Convert.ToInt32(allPeers.Count * communicationRate) + 1;
-      if (allPeers.Count > 0 && toTake == 0) {
-        toTake = 1;
-      }
-      return allPeers.Take(toTake).ToList(); ;
-    }
-    private  void Shuffle<T>(IList<T> list) {
-      int n = list.Count;
-      while (n > 1) {
-        n--;
-        int k = rand.Next(n + 1);
-        T value = list[k];
-        list[k] = list[n];
-        list[n] = value;
-      }
-    }
-
     private void SendHeartbeatToServer(object sender, ElapsedEventArgs e) {
       lock (timerLock) {