Changeset 8017 for branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/RoundedNormalAllPositionsManipulator.cs

Timestamp:

06/17/12 13:38:17 (12 years ago)

Author:

abeham

Message:

#1775:

• Renamed some crossovers
• Ported some additional crossovers from the real-vector plugin
• Introduced BoundedIntegerVector* base classes

File:

• branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/RoundedNormalAllPositionsManipulator.cs (modified) (5 diffs)

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/RoundedNormalAllPositionsManipulator.cs

@@ -35 +35 @@
   [Item("RoundedNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N_i(0,1) to the current value in each position i given the values for sigma_i in the parameter. The result is rounded to the next feasible value. If there are less elements in Sigma than positions, then Sigma is cycled.")]
   [StorableClass]
-  public class RoundedNormalAllPositionsManipulator : IntegerVectorManipulator {
-
-    public IValueLookupParameter<IntMatrix> BoundsParameter {
-      get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
-    }
+  public class RoundedNormalAllPositionsManipulator : BoundedIntegerVectorManipulator {
 
     public IValueParameter<DoubleArray> SigmaParameter {
@@ -54 +50 @@
     public RoundedNormalAllPositionsManipulator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled."));
       Parameters.Add(new ValueParameter<DoubleArray>("Sigma", "The vector containing the standard deviations used for manipulating each dimension. If it is only of length one the same sigma will be used for every dimension.", new DoubleArray(new double[] { 1 })));
     }
@@ -69 +64 @@
     /// <param name="sigma">The sigma vector determining the strength of the mutation.</param>
     /// <param name="random">A random number generator.</param>
-    /// <param name="vector">The integer vector to manipulate.</param>
+    /// <param name="vector">The integer vector to manipulate.</param>#
+    /// <param name="bounds">The bounds and step size for each dimension (will be cycled in case there are less rows than elements in the parent vectors).</param>
     /// <returns>The manipulated integer vector.</returns>
     public static void Apply(IRandom random, IntegerVector vector, IntMatrix bounds, DoubleArray sigma) {
-      if (sigma == null || sigma.Length == 0) throw new ArgumentException("ERROR: Vector containing the standard deviations is not defined.", "sigma");
+      if (sigma == null || sigma.Length == 0) throw new ArgumentException("RoundedNormalAllPositionsManipulator: Vector containing the standard deviations is not defined.", "sigma");
       if (bounds == null || bounds.Rows == 0 || bounds.Columns < 2) throw new ArgumentException("RoundedNormalAllPositionsManipulator: Invalid bounds specified.", "bounds");
       var N = new NormalDistributedRandom(random, 0.0, 1.0);
@@ -80 +76 @@
 
         int value = (vector[i] + (int)Math.Round((N.NextDouble() * sigma[i % sigma.Length])) - min) / step;
-        vector[i] = Math.Max(min, Math.Min(max, value * step + min));
+        vector[i] = RoundFeasible(min, max, step, value);
       }
     }
@@ -89 +85 @@
     /// <param name="random">The random number generator.</param>
     /// <param name="vector">The vector of integer values that is manipulated.</param>
-    protected override void Manipulate(IRandom random, IntegerVector vector) {
-      Apply(random, vector, BoundsParameter.ActualValue, SigmaParameter.Value);
+    /// <param name="bounds">The bounds and step size for each dimension (will be cycled in case there are less rows than elements in the parent vectors).</param>
+    protected override void ManipulateBounded(IRandom random, IntegerVector vector, IntMatrix bounds) {
+      Apply(random, vector, bounds, SigmaParameter.Value);
     }
   }