Changeset 8790 for trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.cs

Timestamp:

10/11/12 13:37:56 (12 years ago)

Author:

abeham

Message:

#1969: Made sure max is exclusive and always a feasible value (a multiple of step + min)

File:

• trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.cs

@@ -85 +85 @@
       if (bounds == null || bounds.Rows == 0 || bounds.Columns < 2) throw new ArgumentException("UniformOnePositionManipulator: Invalid bounds specified", "bounds");
       int min = bounds[index % bounds.Rows, 0], max = bounds[index % bounds.Rows, 1], step = 1;
-      if (bounds.Columns > 2) step = bounds[index % bounds.Rows, 2];
-      vector[index] = RoundFeasible(min, max, step, random.Next(min, max + 1));
+      if (min == max) {
+        vector[index] = min;
+      } else {
+        if (bounds.Columns > 2) step = bounds[index % bounds.Rows, 2];
+        // max has to be rounded to the lower feasible value
+        // e.g. min...max / step = 0...100 / 5, max is exclusive so it would be 0..99
+        // but 99 is not a feasible value, so max needs to be adjusted => min = 0, max = 95
+        max = FloorFeasible(min, max, step, max - 1);
+        vector[index] = RoundFeasible(min, max, step, random.Next(min, max));
+      }
     }