Changeset 8590 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators

Timestamp:

09/06/12 14:45:59 (12 years ago)

Author:

jkarder

Message:

#1853:

• added MultiDoubleValueCrossover
• fixed bug in AverageDoubleValueCrossover
• minor code improvements

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/IntValue

Files:

• NormalIntValueManipulator.cs (modified) (2 diffs)
• UniformIntValueManipulator.cs (modified) (2 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/IntValue/NormalIntValueManipulator.cs

@@ -36 +36 @@
   [StorableClass]
   public class NormalIntValueManipulator : SingleSuccessorOperator, IIntValueManipulator, IStochasticOperator {
-
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
@@ -59 +58 @@
     public static void ApplyStatic(IRandom random, IntValue value, IntValueRange range) {
       var strategy = new RealVector(new double[] { (range.UpperBound.Value - range.LowerBound.Value) / 10 });
-      var vector = new RealVector(new double[] { value.Value });
+      var vector = new RealVector(1);
       int val = value.Value;
 

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/IntValue/UniformIntValueManipulator.cs

@@ -36 +36 @@
   [StorableClass]
   public class UniformIntValueManipulator : SingleSuccessorOperator, IIntValueManipulator, IStochasticOperator {
-
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
@@ -58 +57 @@
 
     public static void ApplyStatic(IRandom random, IntValue value, IntValueRange range) {
-      var vector = new IntegerVector(new int[] { value.Value });
+      var vector = new IntegerVector(1);
+      var bounds = new IntMatrix(1, 2);
+      bounds[0, 0] = range.LowerBound.Value;
+      bounds[0, 1] = range.UpperBound.Value;
       int val = value.Value;
 
       do {
         vector[0] = val;
-        UniformOnePositionManipulator.Apply(random, vector, new IntMatrix(new int[,] { { range.LowerBound.Value, range.UpperBound.Value } }));
+        UniformOnePositionManipulator.Apply(random, vector, bounds);
         value.Value = vector[0];
         value.Value = range.ApplyStepSize(value.Value);