Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/BoundedIntegerVectorManipulator.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/BoundedIntegerVectorManipulator.cs (modified) (2 diffs)

branches/GP-MoveOperators/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/BoundedIntegerVectorManipulator.cs

@@ -31 +31 @@
   [StorableClass]
   public abstract class BoundedIntegerVectorManipulator : IntegerVectorManipulator, IBoundedIntegerVectorOperator {
-    
+
     public IValueLookupParameter<IntMatrix> BoundsParameter {
       get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
@@ -45 +45 @@
 
     protected sealed override void Manipulate(IRandom random, IntegerVector integerVector) {
-      if (BoundsParameter.ActualValue == null) throw new InvalidOperationException("UniformSomePositionsManipulator: Parameter " + BoundsParameter.ActualName + " could not be found.");
+      if (BoundsParameter.ActualValue == null) throw new InvalidOperationException("BoundedIntegerVectorManipulator: Parameter " + BoundsParameter.ActualName + " could not be found.");
       ManipulateBounded(random, integerVector, BoundsParameter.ActualValue);
     }
 
     protected abstract void ManipulateBounded(IRandom random, IntegerVector integerVector, IntMatrix bounds);
-
-    protected static int RoundFeasible(int min, int max, int step, double value) {
-      return Math.Max(min, Math.Min(max, (int)Math.Round((value - min) / (double)step) * step + min));
-    }
-    protected static int FloorFeasible(int min, int max, int step, double value) {
-      return Math.Max(min, Math.Min(max, (int)Math.Floor((value - min) / (double)step) * step + min));
-    }
-    protected static int CeilingFeasible(int min, int max, int step, double value) {
-      return Math.Max(min, Math.Min(max, (int)Math.Ceiling((value - min) / (double)step) * step + min));
-    }
   }
 }