Changeset 5381 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs

Timestamp:

01/26/11 18:39:49 (13 years ago)

Author:

abeham

Message:

#1395

• Allowed to select the bounds checker to use in all RealVectorManipulator and RealVectorCrossover operators
• Added a second bounds checker, the ReflectiveBoundsChecker which does not cut at the bounds, but mirrors the vector at the bounds
• Use a repeating strategy in the move generators
• Removed obsolete IRealVectorPSODecoder and IRealVectorPSOEncoder interfaces
• Marked RealVectorToRealVectorEncoder as obsolete, internal and removed all meaningful code from it (it slipped into the release and should be thrown out as soon as possible)
• Use a repeating strategy to stick within the bounds in the StdDevStrategyVectorManipulator when manipulating the mutation strengths
• By default use smaller initial bounds in the StdDevStrategyVectorCreator (parameterized by the problem)

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs

@@ -65 +65 @@
     public override IOperation Apply() {
       RealVector vector = RealVectorParameter.ActualValue;
-      AdditiveMove[] moves = GenerateMoves(RandomParameter.ActualValue, vector);
       DoubleMatrix bounds = BoundsParameter.ActualValue;
-      if (bounds != null) {
-        for (int i = 0; i < moves.Length; i++) {
-          AdditiveMove move = moves[i];
-          if (vector[move.Dimension] + move.MoveDistance < bounds[move.Dimension % bounds.Rows, 0])
-            vector[move.Dimension] = bounds[move.Dimension % bounds.Rows, 0];
-          else if (vector[move.Dimension] + move.MoveDistance > bounds[move.Dimension % bounds.Rows, 1])
-            vector[move.Dimension] = bounds[move.Dimension % bounds.Rows, 1];
-        }
-      }
+      AdditiveMove[] moves = GenerateMoves(RandomParameter.ActualValue, vector, bounds);
       Scope[] moveScopes = new Scope[moves.Length];
       for (int i = 0; i < moveScopes.Length; i++) {
@@ -85 +76 @@
     }
 
-    protected abstract AdditiveMove[] GenerateMoves(IRandom random, RealVector realVector);
+    protected abstract AdditiveMove[] GenerateMoves(IRandom random, RealVector realVector, DoubleMatrix bounds);
   }
 }