Changeset 5277 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators

Timestamp:

01/11/11 16:00:17 (13 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/Manipulators/ParameterConfigurationManipulator.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationManipulator.cs

@@ -49 +49 @@
 
     public sealed override IOperation Apply() {
-      Apply(RandomParameter.ActualValue, ParameterConfigurationTreeParameter.ActualValue, this);
+      Apply(RandomParameter.ActualValue, ParameterConfigurationTreeParameter.ActualValue, IntValueManipulatorParameter.ActualValue, DoubleValueManipulatorParameter.ActualValue);
       return base.Apply();
     }
 
-    public static void Apply(IRandom random, IValueConfiguration configuration, ParameterConfigurationManipulator pcmanip) {
-      configuration.Mutate(random, Mutate, pcmanip);
+    public static void Apply(IRandom random, IValueConfiguration configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
+      configuration.Mutate(random, Mutate, intValueManipulator, doubleValueManipulator);
     }
 
-    private static void Mutate(IRandom random, IOptimizable configuration, ParameterConfigurationManipulator pcmanip) {
-      if (configuration is IValueConfiguration) {
-        var vc = configuration as IValueConfiguration;
+    private static void Mutate(IRandom random, IOptimizable configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
+      var vc = configuration as IValueConfiguration;
+      var pc = configuration as IParameterConfiguration;
+
+      if (vc != null) {
         var value = vc.ActualValue.Value;
         var range = vc.RangeConstraint;
         if (value is IntValue) {
-          pcmanip.IntValueManipulatorParameter.ActualValue.Apply(random, (IntValue)value, (IntValueRange)range);
+          intValueManipulator.Apply(random, (IntValue)value, (IntValueRange)range);
         } else if (value is PercentValue) {
-          pcmanip.DoubleValueManipulatorParameter.ActualValue.Apply(random, (PercentValue)value, ((PercentValueRange)range).AsDoubleValueRange());
+          doubleValueManipulator.Apply(random, (PercentValue)value, ((PercentValueRange)range).AsDoubleValueRange());
         } else if (value is DoubleValue) {
-          pcmanip.DoubleValueManipulatorParameter.ActualValue.Apply(random, (DoubleValue)value, (DoubleValueRange)range);
+          doubleValueManipulator.Apply(random, (DoubleValue)value, (DoubleValueRange)range);
         }
-      } else if (configuration is IParameterConfiguration) {
-        var pc = configuration as IParameterConfiguration;
-        pc.ActualValueConfigurationIndex = random.Next(pc.ValueConfigurations.CheckedItems.Count());
-        pc.ActualValue = pc.ValueConfigurations.CheckedItems.ElementAt(pc.ActualValueConfigurationIndex).ActualValue;
+      } else if (pc != null) {
+        do {
+          pc.ActualValueConfigurationIndex = random.Next(pc.ValueConfigurations.Count());
+        } while (!pc.ValueConfigurations.ItemChecked(pc.ValueConfigurations[pc.ActualValueConfigurationIndex]));
+        pc.ActualValue = pc.ValueConfigurations[pc.ActualValueConfigurationIndex].ActualValue;
       }
     }