Changeset 15102 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorNeighborhoodParticleUpdater.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/RealVectorNeighborhoodParticleUpdater.cs (modified) (2 diffs)

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

@@ -30 +30 @@
   [StorableClass]
   [NonDiscoverableType]
-  [Obsolete("Replaced by SPSO2007ParticleUpdater")]
+  [Obsolete("Use SPSO2011ParticleUpdater")]
   internal sealed class RealVectorNeighborhoodParticleUpdater : RealVectorParticleUpdater {
 
@@ -43 +43 @@
     #endregion
 
-    private void UpdateVelocity() {
-      var velocity = VelocityParameter.ActualValue;
-      var position = RealVectorParameter.ActualValue;
-      var inertia = CurrentInertiaParameter.ActualValue.Value;
-      var personalBest = PersonalBestParameter.ActualValue;
-      var personalBestAttraction = PersonalBestAttractionParameter.ActualValue.Value;
-      var neighborBest = NeighborBestParameter.ActualValue;
-      var neighborBestAttraction = NeighborBestAttractionParameter.ActualValue.Value;
+    public override IOperation Apply() {
+      double inertia = Inertia.Value;
+      double personalBestAttraction = PersonalBestAttraction.Value;
+      double neighborBestAttraction = NeighborBestAttraction.Value;
 
-      var random = RandomParameter.ActualValue;
+      RealVector velocity = new RealVector(Velocity.Length);
+      RealVector position = new RealVector(RealVector.Length);
+      double r_p = Random.NextDouble();
+      double r_g = Random.NextDouble();
 
       for (int i = 0; i < velocity.Length; i++) {
-        double r_p = random.NextDouble();
-        double r_g = random.NextDouble();
         velocity[i] =
-          velocity[i] * inertia +
-          (personalBest[i] - position[i]) * personalBestAttraction * r_p +
-          (neighborBest[i] - position[i]) * neighborBestAttraction * r_g;
+          Velocity[i] * inertia +
+          (PersonalBest[i] - RealVector[i]) * personalBestAttraction * r_p +
+          (BestPoint[i] - RealVector[i]) * neighborBestAttraction * r_g;
       }
 
-      var maxVelocity = CurrentMaxVelocityParameter.ActualValue.Value;
-      var speed = Math.Sqrt(velocity.DotProduct(velocity));
-      if (speed > maxVelocity) {
-        for (var i = 0; i < velocity.Length; i++) {
-          velocity[i] *= maxVelocity / speed;
-        }
-      }
-    }
-
-    private void UpdatePosition() {
-      var velocity = VelocityParameter.ActualValue;
-      var position = RealVectorParameter.ActualValue;
-
-      for (int i = 0; i < velocity.Length; i++) {
-        position[i] += velocity[i];
-      }
-
-      var bounds = BoundsParameter.ActualValue;
-      for (int i = 0; i < position.Length; i++) {
-        double min = bounds[i % bounds.Rows, 0];
-        double max = bounds[i % bounds.Rows, 1];
-        if (position[i] < min) {
-          position[i] = min;
-          velocity[i] = -0.5 * velocity[i]; // SPSO 2011
-        }
-        if (position[i] > max) {
-          position[i] = max;
-          velocity[i] = -0.5 * velocity[i]; // SPSO 2011
-        }
-      }
-    }
-
-    public override IOperation Apply() {
-      UpdateVelocity();
-      UpdatePosition();
+      MoveParticle(velocity, position);
 
       return base.Apply();