Changeset 15102 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2011ParticleUpdater.cs

Timestamp:

06/30/17 21:57:38 (7 years ago)

Author:

abeham

Message:

#2797:

• Recreated backwards compatibility by readding old operators and renaming new operators to SPSO*
  • If a previously configured algorithm is run again, the same results should be obtained
• Set all old operators to internal, NonDiscoverableType, and Obsolete (they are also not fixed, e.g. PersonalBest update remains flawed)
• Added SPSO 2007 velocity initializer and let users choose in SPSOParticleCreator
• Changed description of PSO
• Updated sample

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2011ParticleUpdater.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSO2011ParticleUpdater.cs

@@ -29 +29 @@
   [Item("SPSO 2011 Particle Updater", "Updates the particle's position according to the formulae described in SPSO 2011.")]
   [StorableClass]
-  public sealed class SPSO2011ParticleUpdater : RealVectorParticleUpdater {
-
+  public sealed class SPSO2011ParticleUpdater : SPSOParticleUpdater {
     #region Construction & Cloning
     [StorableConstructor]
@@ -41 +40 @@
     #endregion
     
-    public static void UpdateVelocity(IRandom random, RealVector velocity, double maxVelocity, RealVector position, double inertia, RealVector personalBest, double personalBestAttraction, RealVector neighborBest, double neighborBestAttraction) {
+    public static void UpdateVelocity(IRandom random, RealVector velocity, double maxVelocity, RealVector position, double inertia, RealVector personalBest, double personalBestAttraction, RealVector neighborBest, double neighborBestAttraction, double c = 1.193) {
       var gravity = new double[velocity.Length];
       var direct = new RealVector(velocity.Length);
@@ -47 +46 @@
 
       for (int i = 0; i < velocity.Length; i++) {
-        var g_id = 1.193 * ((personalBest[i] + neighborBest[i] - 2 * position[i]) / 3.0);
+        var g_id = c * ((personalBest[i] + neighborBest[i] - 2 * position[i]) / 3.0);
         gravity[i] = g_id + position[i];
         direct[i] = (random.NextDouble() - 0.5) * 2;
@@ -101 +100 @@
       var neighborBest = NeighborBestParameter.ActualValue;
       var neighborBestAttraction = NeighborBestAttractionParameter.ActualValue.Value;
-      
-      UpdateVelocity(random, velocity, maxVelocity, position, inertia, personalBest, personalBestAttraction, neighborBest, neighborBestAttraction);
+      var maxBeyond = MaxBeyondBestParameter.ActualValue.Value;
+
+      UpdateVelocity(random, velocity, maxVelocity, position, inertia, personalBest, personalBestAttraction, neighborBest, neighborBestAttraction, maxBeyond);
       UpdatePosition(bounds, velocity, position);