Changeset 15091 for trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RandomTopologyInitializer.cs

Timestamp:

06/29/17 15:26:16 (7 years ago)

Author:

abeham

Message:

#2797:

• Updated PSO to make it more compatible with SPSO 2011
• Removed truncation of velocity vector and instead rescaled it given the maximum velocity
• Added non-zero initial velocity according to SPSO 2011
• Removed complicated bouncing code due to box constraints and instead implemented as described in SPSO 2011
• Calculating neighbor best has been changed to use personal best
• Avoiding local and global particle update and instead relying on neighborbest
• More randomization during velocity update by using a separate random numbers per dimension
• Reusing problem specific solution creator in RealVectorParticleCreator instead of always using UniformRandomRealVectorCreator

File:

• trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/RandomTopologyInitializer.cs (modified) (5 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [Item("Random Topology Initializer", "Randomly connectes every particle with k other particles.")]
   [StorableClass]
-  public sealed class RandomTopologyInitializer : TopologyInitializer {
+  public sealed class RandomTopologyInitializer : TopologyInitializer, IStochasticOperator {
     #region Parameters
     public ILookupParameter<IRandom> RandomParameter {
@@ -40 +41 @@
     }
     #endregion
-
-    #region Parameter Values
-    private IRandom Random {
-      get { return RandomParameter.ActualValue; }
-    }
-    private int NrOfConnections {
-      get { return NrOfConnectionsParameter.ActualValue.Value; }
-    }
-    #endregion
-
+    
     #region Construction & Cloning
     [StorableConstructor]
@@ -65 +57 @@
 
     public override IOperation Apply() {
-      ItemArray<IntArray> neighbors = new ItemArray<IntArray>(SwarmSize);
-      for (int i = 0; i < SwarmSize; i++) {
-        var numbers = Enumerable.Range(0, SwarmSize).ToList();
+      var random = RandomParameter.ActualValue;
+      var swarmSize = SwarmSizeParameter.ActualValue.Value;
+      var nrOfConnections = NrOfConnectionsParameter.ActualValue.Value;
+
+      ItemArray<IntArray> neighbors = new ItemArray<IntArray>(swarmSize);
+      for (int i = 0; i < swarmSize; i++) {
+        var numbers = Enumerable.Range(0, swarmSize).ToList();
         numbers.RemoveAt(i);
-        var selectedNumbers = new List<int>(NrOfConnections);
-        for (int j = 0; j < NrOfConnections && numbers.Count > 0; j++) {
-          int index = Random.Next(numbers.Count);
+        var selectedNumbers = new List<int>(nrOfConnections);
+        for (int j = 0; j < nrOfConnections && numbers.Count > 0; j++) {
+          int index = random.Next(numbers.Count);
           selectedNumbers.Add(numbers[index]);
           numbers.RemoveAt(index);
@@ -77 +73 @@
         neighbors[i] = new IntArray(selectedNumbers.ToArray());
       }
-      Neighbors = neighbors;
+      NeighborsParameter.ActualValue = neighbors;
       return base.Apply();
     }