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

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

Files:

• Crossovers/DoubleValue/AverageDoubleValueCrossover.cs (modified) (1 diff)
• Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs (modified) (1 diff)
• Crossovers/DoubleValue/MultiDoubleValueCrossover.cs (added)
• Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (modified) (1 diff)
• Crossovers/IntValue/DiscreteIntValueCrossover.cs (modified) (1 diff)
• Crossovers/IntValue/MultiIntValueCrossover.cs (modified) (1 diff)
• Crossovers/IntValue/NormalIntValueCrossover.cs (modified) (1 diff)
• Manipulators/IntValue/NormalIntValueManipulator.cs (modified) (2 diffs)
• Manipulators/IntValue/UniformIntValueManipulator.cs (modified) (2 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/AverageDoubleValueCrossover.cs

@@ -56 +56 @@
     public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range) {
       value.Value = (value.Value + other.Value) / 2;
-      value.Value = range.ApplyStepSize(value.Value);
     }
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs

@@ -55 +55 @@
 
     public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range) {
-      if (random.NextDouble() > 0.5) {
+      if (random.NextDouble() > 0.5)
         value.Value = other.Value;
-      }
     }
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs

@@ -53 +53 @@
 
     public void Apply(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range) {
-      value.Value = ApplyStatic(random, value, other, range).Value;
+      ApplyStatic(random, value, other, range);
     }
 
-    public static DoubleValue ApplyStatic(IRandom random, DoubleValue better, DoubleValue worse, DoubleValueRange range) {
-      NormalDistributedRandom N = new NormalDistributedRandom(random, better.Value, Math.Abs(better.Value - worse.Value) / 3);
-      var offspring = new DoubleValue();
+    public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range) {
+      var N = new NormalDistributedRandom(random, value.Value, Math.Abs(value.Value - other.Value) / 3);
+
+      double offspring;
       do {
-        offspring.Value = N.NextDouble();
-        offspring.Value = range.ApplyStepSize(offspring.Value);
-      } while (!range.IsInRange(offspring.Value));
+        offspring = N.NextDouble();
+        offspring = range.ApplyStepSize(offspring);
+      } while (!range.IsInRange(offspring));
 
-      return offspring;
+      value.Value = offspring;
     }
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/DiscreteIntValueCrossover.cs

@@ -55 +55 @@
 
     public static void ApplyStatic(IRandom random, IntValue value, IntValue other, IntValueRange range) {
-      if (random.NextDouble() > 0.5) {
+      if (random.NextDouble() > 0.5)
         value.Value = other.Value;
-      }
     }
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/MultiIntValueCrossover.cs

@@ -67 +67 @@
 
     public void Apply(IRandom random, IntValue value, IntValue other, IntValueRange range) {
-      // TODO
+      Operators[random.Next(Operators.Count)].Apply(random, value, other, range);
     }
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/NormalIntValueCrossover.cs

@@ -53 +53 @@
 
     public void Apply(IRandom random, IntValue value, IntValue other, IntValueRange range) {
-      value.Value = ApplyStatic(random, value, other, range).Value;
+      ApplyStatic(random, value, other, range);
     }
 
-    public static IntValue ApplyStatic(IRandom random, IntValue better, IntValue worse, IntValueRange range) {
-      NormalDistributedRandom N = new NormalDistributedRandom(random, better.Value, Math.Abs(better.Value - worse.Value) / 3);
-      var offspring = new IntValue();
+    public static void ApplyStatic(IRandom random, IntValue value, IntValue other, IntValueRange range) {
+      var N = new NormalDistributedRandom(random, value.Value, Math.Abs(value.Value - other.Value) / 3);
+
+      int offspring;
       do {
-        offspring.Value = (int)N.NextDouble();
-        offspring.Value = range.ApplyStepSize(offspring.Value);
-      } while (!range.IsInRange(offspring.Value));
-      return offspring;
+        offspring = (int)N.NextDouble();
+        offspring = range.ApplyStepSize(offspring);
+      } while (!range.IsInRange(offspring));
+
+      value.Value = offspring;
     }
   }

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);