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

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/IntValue

Files:

• DiscreteIntValueCrossover.cs (modified) (1 diff)
• MultiIntValueCrossover.cs (modified) (1 diff)
• NormalIntValueCrossover.cs (modified) (1 diff)

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