Changeset 8027 for branches

Timestamp:

06/18/12 10:16:59 (12 years ago)

Author:

abeham

Message:

#1775: updated metaopt branch

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Files:

• Encoding/Crossovers/ParameterConfigurationCrossover.cs (modified) (1 diff)
• Operators/Manipulators/IntValue/UniformIntValueManipulator.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs

@@ -119 +119 @@
       IntegerVector integerChild = HeuristicLab.Encodings.IntegerVectorEncoding.DiscreteCrossover.Apply(
         RandomParameter.ActualValue,
-        new IntegerVector(new IntArray(new int[] { ((IntValue)parameter1.ActualValue.Value).Value })),
-        new IntegerVector(new IntArray(new int[] { ((IntValue)parameter2.ActualValue.Value).Value })));
+        new ItemArray<IntegerVector>(
+          new IntegerVector[] {
+            new IntegerVector(new IntArray(new int[] { ((IntValue)parameter1.ActualValue.Value).Value })),
+            new IntegerVector(new IntArray(new int[] { ((IntValue)parameter2.ActualValue.Value).Value }))
+          }));
       return new IntValue(integerChild[0]);
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/IntValue/UniformIntValueManipulator.cs

@@ -38 +38 @@
       do {
         vector[0] = val;
-        UniformOnePositionManipulator.Apply(random, vector, range.LowerBound, new IntValue(range.UpperBound.Value + 1));
+        UniformOnePositionManipulator.Apply(random, vector, new IntMatrix(new int[,] { { range.LowerBound.Value, range.UpperBound.Value } } ));
         value.Value = vector[0];
         value.Value = range.ApplyStepSize(value.Value);