Changeset 15214 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization

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

Location:

trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3

Files:

• AdaptiveRandomTopologyUpdater.cs (modified) (1 diff)
• ParticleSwarmOptimization.cs (modified) (1 diff)
• RandomTopologyInitializer.cs (modified) (1 diff)
• SPSORandomTopologyInitializer.cs (modified) (1 diff)

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

@@ -86 +86 @@
       var successor = new OperationCollection(new[] { base.Apply() });
       var max = MaximizationParameter.ActualValue.Value;
-      if (max && swarmBest.Value >= previousBest.Value
-        || !max && swarmBest.Value <= previousBest.Value)
+      if (max && swarmBest.Value <= previousBest.Value
+        || !max && swarmBest.Value >= previousBest.Value)
         successor.Insert(0, ExecutionContext.CreateOperation(TopologyInitializerParameter.ActualValue));
 

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

@@ -181 +181 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<DoubleValue>("Inertia", "Inertia weight on a particle's movement (omega).", new DoubleValue(0.721)));
-      Parameters.Add(new ValueParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p).", new DoubleValue(1)));
-      Parameters.Add(new ValueParameter<DoubleValue>("NeighborBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g).", new DoubleValue(1)));
+      Parameters.Add(new ValueParameter<DoubleValue>("PersonalBestAttraction", "Weight for particle's pull towards its personal best soution (phi_p).", new DoubleValue(1.193)));
+      Parameters.Add(new ValueParameter<DoubleValue>("NeighborBestAttraction", "Weight for pull towards the neighborhood best solution or global best solution in case of a totally connected topology (phi_g).", new DoubleValue(1.193)));
       Parameters.Add(new ConstrainedValueParameter<IParticleCreator>("ParticleCreator", "Operator that creates a new particle."));
       Parameters.Add(new ConstrainedValueParameter<IParticleUpdater>("ParticleUpdater", "Operator that updates a particle."));

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Algorithms.ParticleSwarmOptimization {
-  [Item("Random Topology Initializer", "Each particle is informed by exactly k+1 distinct other particles (including itself).")]
+  [Item("Random Distinct Topology Initializer", "Each particle is informed by exactly k+1 distinct other particles (including itself).")]
   [StorableClass]
   public sealed class RandomTopologyInitializer : TopologyInitializer, IStochasticOperator {

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);