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

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/Crossovers/DoubleValue

Files:

• AverageDoubleValueCrossover.cs (modified) (1 diff)
• DiscreteDoubleValueCrossover.cs (modified) (1 diff)
• MultiDoubleValueCrossover.cs (added)
• NormalDoubleValueCrossover.cs (modified) (1 diff)

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