Changeset 3123 for trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformOnePositionManipulator.cs

Timestamp:

03/19/10 15:59:37 (14 years ago)

Author:

abeham

Message:

Updated RealVector encoding to use a double matrix as bounds #929

File:

• trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformOnePositionManipulator.cs (modified) (5 diffs)

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

@@ -38 +38 @@
   public class MichalewiczNonUniformOnePositionManipulator : RealVectorManipulator {
     /// <summary>
-    /// The lower bound of the values in the real vector.
+    /// The lower and upper bound (1st and 2nd column) of the positions in the vector. If there are less rows than dimensions, the rows are cycled.
     /// </summary>
-    public ValueLookupParameter<DoubleValue> MinimumParameter {
-      get { return (ValueLookupParameter<DoubleValue>)Parameters["Minimum"]; }
-    }
-    /// <summary>
-    /// The upper bound of the values in the real vector.
-    /// </summary>
-    public ValueLookupParameter<DoubleValue> MaximumParameter {
-      get { return (ValueLookupParameter<DoubleValue>)Parameters["Maximum"]; }
+    public ValueLookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (ValueLookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
     }
     /// <summary>
@@ -69 +63 @@
 
     /// <summary>
-    /// Initializes a new instance of <see cref="MichalewiczNonUniformOnePositionManipulator"/> with five 
-    /// parameters (<c>Minimum</c>, <c>Maximum</c>, <c>CurrentGeneration</c>, <c>MaximumGenerations</c>
+    /// Initializes a new instance of <see cref="MichalewiczNonUniformOnePositionManipulator"/> with four 
+    /// parameters (<c>Bounds</c>, <c>CurrentGeneration</c>, <c>MaximumGenerations</c>
     /// and <c>GenerationDependency</c>).
     /// </summary>
     public MichalewiczNonUniformOnePositionManipulator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Minimum", "Minimum of the sampling range for the vector element (included)"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Maximum", "Maximum of the sampling range for the vector element (excluded)"));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bound (1st and 2nd column) of the positions in the vector. If there are less rows than dimensions, the rows are cycled."));
       Parameters.Add(new LookupParameter<IntValue>("Generation", "Current generation of the algorithm"));
       Parameters.Add(new LookupParameter<IntValue>("MaximumGenerations", "Maximum number of generations"));
@@ -89 +82 @@
     /// <param name="random">The random number generator.</param>
     /// <param name="vector">The real vector to manipulate.</param>
-    /// <param name="min">The minimum value of the sampling range for the vector element (inclusive).</param>
-    /// <param name="max">The maximum value of the sampling range for the vector element (exclusive).</param>
+    /// <param name="bounds">The lower and upper bound (1st and 2nd column) of the positions in the vector. If there are less rows than dimensions, the rows are cycled.</param>
     /// <param name="currentGeneration">The current generation of the algorithm.</param>
     /// <param name="maximumGenerations">Maximum number of generations.</param>
     /// <param name="generationsDependency">Specifies the degree of dependency on the number of generations.</param>
     /// <returns>The manipulated real vector.</returns>
-    public static void Apply(IRandom random, RealVector vector, DoubleValue min, DoubleValue max, IntValue currentGeneration, IntValue maximumGenerations, DoubleValue generationsDependency) {
+    public static void Apply(IRandom random, RealVector vector, DoubleMatrix bounds, IntValue currentGeneration, IntValue maximumGenerations, DoubleValue generationsDependency) {
       if (currentGeneration.Value > maximumGenerations.Value) throw new ArgumentException("MichalewiczNonUniformOnePositionManipulator: CurrentGeneration must be smaller or equal than MaximumGeneration", "currentGeneration");
       int length = vector.Length;
@@ -102 +94 @@
       double prob = (1 - Math.Pow(random.NextDouble(), Math.Pow(1 - currentGeneration.Value / maximumGenerations.Value, generationsDependency.Value)));
 
+      double min = bounds[index % bounds.Rows, 0];
+      double max = bounds[index % bounds.Rows, 1];
+
       if (random.NextDouble() < 0.5) {
-        vector[index] = vector[index] + (max.Value - vector[index]) * prob;
+        vector[index] = vector[index] + (max - vector[index]) * prob;
       } else {
-        vector[index] = vector[index] - (vector[index] - min.Value) * prob;
+        vector[index] = vector[index] - (vector[index] - min) * prob;
       }
     }
@@ -115 +110 @@
     /// <param name="realVector">The real vector that should be manipulated.</param>
     protected override void Manipulate(IRandom random, RealVector realVector) {
-      if (MinimumParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + MinimumParameter.ActualName + " could not be found.");
-      if (MaximumParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + MaximumParameter.ActualName + " could not be found.");
+      if (BoundsParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + BoundsParameter.ActualName + " could not be found.");
       if (GenerationParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + GenerationParameter.ActualName + " could not be found.");
       if (MaximumGenerationsParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + MaximumGenerationsParameter.ActualName + " could not be found.");
       if (GenerationDependencyParameter.ActualValue == null) throw new InvalidOperationException("MichalewiczNonUniformOnePositionManipulator: Parameter " + GenerationDependencyParameter.ActualName + " could not be found.");
-      Apply(random, realVector, MinimumParameter.ActualValue, MaximumParameter.ActualValue, GenerationParameter.ActualValue, MaximumGenerationsParameter.ActualValue, GenerationDependencyParameter.ActualValue);
+      Apply(random, realVector, BoundsParameter.ActualValue, GenerationParameter.ActualValue, MaximumGenerationsParameter.ActualValue, GenerationDependencyParameter.ActualValue);
     }
   }