Changeset 5312

Timestamp:

01/17/11 17:24:27 (14 years ago)

Author:

mkofler

Message:

#852: Adjusted PSO Prepare to use start value of omega/velocity updater(s) if specified.

File:

• branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified) (1 diff)

branches/PSO/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs

@@ -283 +283 @@
 
     public override void Prepare() {
-      if (Problem != null) base.Prepare();
+      if (Problem != null) {
+        base.Prepare();
+        if (OmegaUpdater != null && OmegaUpdater.StartValueParameter.Value != null) {
+          this.OmegaParameter.ActualValue = new DoubleValue(OmegaUpdaterParameter.Value.StartValueParameter.Value.Value);
+        }
+        if (VelocityBoundsUpdater != null && VelocityBoundsUpdater.StartValueParameter.Value != null && VelocityBoundsParameter.ActualValue != null) {
+          DoubleMatrix matrix = VelocityBoundsParameter.ActualValue;
+          for (int i = 0; i < matrix.Rows; i++) {
+            for (int j = 0; j < matrix.Columns; j++) {
+              if (matrix[i, j] >= 0) {
+                matrix[i, j] = VelocityBoundsUpdater.StartValueParameter.Value.Value;
+              } else {
+                matrix[i, j] = (-1) * VelocityBoundsUpdater.StartValueParameter.Value.Value;
+              }
+            }
+          }
+        }
+      }
     }