Changeset 5385

Timestamp:

01/27/11 10:42:04 (14 years ago)

Author:

abeham

Message:

#1394

• Separated NormalAllPositionsManipulator into FixedNormalAllPositionsManipulator and SelfAdaptiveNormalAllPositionsManipulator.cs
• Classname and behavior of SelfAdaptiveNormalAllPositionsManipulator.cs remains to be the same as NormalAllPositionsManipulator for backwards compatibility reasons

Location:

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3

Files:

• HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (2 diffs)
• Manipulators/FixedNormalAllPositionsManipulator.cs (added)
• Manipulators/SelfAdaptiveNormalAllPositionsManipulator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/NormalAllPositionsManipulator.cs) (4 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

@@ -111 +111 @@
     <Compile Include="BoundsChecker.cs" />
     <Compile Include="Creators\UniformRandomRealVectorCreator.cs" />
+    <Compile Include="Manipulators\SelfAdaptiveNormalAllPositionsManipulator.cs" />
     <Compile Include="RealVectorCreator.cs" />
     <Compile Include="RealVectorCrossover.cs" />
@@ -140 +141 @@
     <Compile Include="Interfaces\IRealVectorMoveOperator.cs" />
     <Compile Include="Manipulators\MultiRealVectorManipulator.cs" />
-    <Compile Include="Manipulators\NormalAllPositionsManipulator.cs" />
+    <Compile Include="Manipulators\FixedNormalAllPositionsManipulator.cs" />
     <Compile Include="Moves\AdditiveMoveTabuChecker.cs" />
     <Compile Include="Moves\AdditiveMoveTabuMaker.cs" />

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/SelfAdaptiveNormalAllPositionsManipulator.cs

@@ -37 +37 @@
   /// The strategy vector can be of smaller length than the solution vector, in which case values are taken from the beginning again once the end of the strategy vector is reached.
   /// </remarks>
-  [Item("NormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N(0,1) to the current value in each position i. The values for sigma_i are taken from the strategy vector, if there are less elements in the strategy vector than positions, then the strategy vector is cycled. It is implemented as described in Beyer, H.-G. and Schwefel, H.-P. 2002. Evolution Strategies - A Comprehensive Introduction Natural Computing, 1, pp. 3-52.")]
+  [Item("SelfAdaptiveNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N(0,1) to the current value in each position i. The values for sigma_i are looked up dynamically. If there are less elements in the strategy vector than positions, then the strategy vector is cycled. It is implemented as described in Beyer, H.-G. and Schwefel, H.-P. 2002. Evolution Strategies - A Comprehensive Introduction Natural Computing, 1, pp. 3-52.")]
   [StorableClass]
+  // BackwardsCompatibility3.3
+  // Rename class to match file- and itemname when upgrading to 3.4
   public class NormalAllPositionsManipulator : RealVectorManipulator, ISelfAdaptiveManipulator {
     public Type StrategyParameterType {
@@ -46 +48 @@
     /// Parameter for the strategy vector.
     /// </summary>
-    public IValueLookupParameter<RealVector> StrategyParameterParameter {
-      get { return (IValueLookupParameter<RealVector>)Parameters["StrategyParameter"]; }
+    public ILookupParameter<RealVector> StrategyParameterParameter {
+      get { return (ILookupParameter<RealVector>)Parameters["StrategyParameter"]; }
     }
 
@@ -63 +65 @@
     public NormalAllPositionsManipulator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<RealVector>("StrategyParameter", "The vector containing the endogenous strategy parameters."));
+      Parameters.Add(new LookupParameter<RealVector>("StrategyParameter", "The vector containing the endogenous strategy parameters."));
     }
 
@@ -82 +84 @@
     public static void Apply(IRandom random, RealVector vector, RealVector strategyParameters) {
       NormalDistributedRandom N = new NormalDistributedRandom(random, 0.0, 1.0);
-      if (strategyParameters != null && strategyParameters.Length > 0) {
+      if (strategyParameters != null) {
         for (int i = 0; i < vector.Length; i++) {
           vector[i] = vector[i] + (N.NextDouble() * strategyParameters[i % strategyParameters.Length]);
         }
       } else {
+        // BackwardsCompatibility3.3
+        #region Backwards compatible region (remove with 3.4)
+        // when upgrading to 3.4 remove the whole condition and just put the if-branch in place (you should then also throw an ArgumentException when strategyParameters is null or has length 0)
         for (int i = 0; i < vector.Length; i++) {
           vector[i] = vector[i] + N.NextDouble();
         }
+        #endregion
       }
     }