Changeset 5277 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs

Timestamp:

01/11/11 16:00:17 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented crossover and manipulator operators for int and double values

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs (modified) (2 diffs)

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

@@ -58 +58 @@
       ParameterConfigurationTree child2 = (ParameterConfigurationTree)ParentsParameter.ActualValue[1];
 
-      child1.Cross(RandomParameter.ActualValue, child2, Cross, this);
+      child1.Cross(RandomParameter.ActualValue, child2, Cross, IntValueCrossoverParameter.ActualValue, DoubleValueCrossoverParameter.ActualValue);
       this.ChildParameter.ActualValue = child1;
 
@@ -64 +64 @@
     }
 
-    private static void Cross(IRandom random, IOptimizable configuartion, ParameterConfigurationCrossover pccross) {
-      if (configuartion is IValueConfiguration) {
-        var vc = configuartion as IValueConfiguration;
+    public static void Apply(IRandom random, IOptimizable configuartion, IOptimizable other, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
+      configuartion.Cross(random, other, Cross, intValueCrossover, doubleValueCrossover);
+    }
+
+    private static void Cross(IRandom random, IOptimizable configuartion, IOptimizable other, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
+      var vc = configuartion as IValueConfiguration;
+      var pc = configuartion as IParameterConfiguration;
+      if (vc != null) {
         var value = vc.ActualValue.Value;
         var range = vc.RangeConstraint;
 
         if (value is IntValue) {
-          pccross.IntValueCrossoverParameter.ActualValue.Apply(random, (IntValue)value, (IntValueRange)range);
+          intValueCrossover.Apply(random, (IntValue)value, (IntValue)((IValueConfiguration)other).ActualValue.Value, (IntValueRange)range);
         } else if (value is PercentValue) {
-          pccross.DoubleValueCrossoverParameter.ActualValue.Apply(random, (PercentValue)value, ((PercentValueRange)range).AsDoubleValueRange());
+          doubleValueCrossover.Apply(random, (PercentValue)value, (DoubleValue)((IValueConfiguration)other).ActualValue.Value, ((PercentValueRange)range).AsDoubleValueRange());
         } else if (value is DoubleValue) {
-          pccross.DoubleValueCrossoverParameter.ActualValue.Apply(random, (DoubleValue)value, (DoubleValueRange)range);
+          doubleValueCrossover.Apply(random, (DoubleValue)value, (DoubleValue)((IValueConfiguration)other).ActualValue.Value, (DoubleValueRange)range);
         }
-      } else if (configuartion is IParameterConfiguration) {
-
+      } else if (pc != null) {
+        if (random.NextDouble() > 0.5) {
+          pc.ActualValueConfigurationIndex = ((ParameterConfiguration)other).ActualValueConfigurationIndex;
+        }
+        pc.ActualValue = pc.ValueConfigurations[pc.ActualValueConfigurationIndex].ActualValue;
       }
     }