Changeset 5892 for trunk/sources

Timestamp:

03/30/11 16:45:28 (14 years ago)

Author:

epitzer

Message:

Make particles reflect from the bounds to prevent them from becoming stuck. (#852)

Location:

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

Files:

• RealVectorNeighborhoodParticleUpdater.cs (modified) (1 diff)
• RealVectorParticleUpdater.cs (modified) (2 diffs)
• RealVectorTotallyConnectedParticleUpdater.cs (modified) (1 diff)

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

@@ -57 +57 @@
       }
 
-      BoundsChecker.Apply(velocity, CurrentVelocityBounds);
-      for (int i = 0; i < velocity.Length; i++) {
-        position[i] = RealVector[i] + velocity[i];
-      }
-      BoundsChecker.Apply(position, Bounds);
-
-      RealVector = position;
-      Velocity = velocity;
+      MoveParticle(velocity, position);
 
       return base.Apply();

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -130 +131 @@
     }
     #endregion
+
+    protected void MoveParticle(RealVector velocity, RealVector position) {
+      BoundsChecker.Apply(velocity, CurrentVelocityBounds);
+      for (int i = 0; i < velocity.Length; i++) {
+        position[i] = RealVector[i] + velocity[i];
+      }
+      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) {
+          int reflectionCount = (int)Math.Truncate((min - position[i]) / (max - min)) + 1;
+          double reflection = (min - position[i]) % (max - min);
+          if (IsOdd(reflectionCount)) {
+            position[i] = min + reflection;
+            velocity[i] = -velocity[i];
+
+          } else {
+            position[i] = max - reflection;
+          }
+        }
+        if (position[i] > max) {
+          int reflectionCount = (int)Math.Truncate((position[i] - max) / (max - min)) + 1;
+          double reflection = (position[i] - max) % (max - min);
+          if (IsOdd(reflectionCount)) {
+            position[i] = max - reflection;
+            velocity[i] = -velocity[i];
+          } else {
+            position[i] = min + reflection;
+          }
+        }
+      }
+
+      RealVector = position;
+      Velocity = velocity;
+    }
+
+    private static bool IsOdd(int number) {
+      return number % 2 == 1;
+    }
   }
 }

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

@@ -57 +57 @@
       }
 
-      BoundsChecker.Apply(velocity, CurrentVelocityBounds);
-      for (int i = 0; i < velocity.Length; i++) {
-        position[i] = RealVector[i] + velocity[i];
-      }
-      BoundsChecker.Apply(position, Bounds);
-
-      RealVector = position;
-      Velocity = velocity;
+      MoveParticle(velocity, position);
 
       return base.Apply();