Changeset 15214 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/SPSORandomTopologyInitializer.cs

Timestamp:

07/12/17 16:49:16 (7 years ago)

Author:

abeham

Message:

#2797:

• Fixed adaptive random topology updater
• Adapted default values of the best attraction parameters
• Changed code of the new topology initializer
• Fixed the parameters of the SPSO particle updaters (c parameter is actually (personal|neighbor)bestattraction), reordered the method signature and provided defaults
• Removed the max beyond parameter again
• Updated the sample and updated the unit test
  • In the sample no inertia updating is used, but the topology initializers / updaters of SPSO are used

File:

• trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/SPSORandomTopologyInitializer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/SPSORandomTopologyInitializer.cs

@@ -62 +62 @@
 
       // SPSO: Each particle informs at most K+1 particles (at least itself and K others)
-      var particlesInform = Enumerable.Repeat(k + 1, swarmSize)
-        .Select((v, i) => new HashSet<int>(Enumerable.Range(0, v).Select(x => x == 0 ? i : random.Next(swarmSize)))).ToList();
+      //       it is by design that we draw from the particles with repetition
+      var particlesInform = new List<HashSet<int>>(swarmSize);
+      for (var i = 0; i < swarmSize; i++) {
+        var informs = new HashSet<int>() { i };
+        for (var j = 0; j < k; j++) {
+          informs.Add(random.Next(swarmSize));
+        }
+        particlesInform.Add(informs);
+      }
 
       var neighbors = new ItemArray<IntArray>(swarmSize);