Changeset 5111 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

Timestamp:

12/15/10 23:41:33 (13 years ago)

Author:

cneumuel

Message:

#1215

• improved exchangeability of crossover and mutation operators for parameter values

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs (modified) (5 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

@@ -36 +36 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class MetaOptimizationProblem : SingleObjectiveProblem<IMetaOptimizationEvaluator, IParameterConfigurationCreator> {
+  public sealed class MetaOptimizationProblem : SingleObjectiveProblem<IParameterConfigurationEvaluator, IParameterConfigurationCreator> {
     public const string AlgorithmTypeParameterName = "AlgorithmType";
     public const string ProblemTypeParameterName = "ProblemType";
@@ -42 +42 @@
     public const string ParameterConfigurationParameterName = "InitialParameterConfigurationTree";
     public const string RepetitionsParameterName = "Repetitions";
+
+    public const string IntValueManipulatorParameterName = "IntValueManipulator";
+    public const string DoubleValueManipulatorParameterName = "DoubleValueManipulator";
+    public const string IntValueCrossoverParameterName = "IntValueCrossover";
+    public const string DoubleValueCrossoverParameterName = "DoubleValueCrossover";
 
     #region Parameter Properties
@@ -58 +63 @@
     public IValueParameter<IntValue> RepetitionsParameter {
       get { return (ValueParameter<IntValue>)Parameters[RepetitionsParameterName]; }
+    }
+
+    public IValueParameter<IIntValueManipulator> IntValueManipulatorParameter {
+      get { return (ValueParameter<IIntValueManipulator>)Parameters[IntValueManipulatorParameterName]; }
+    }
+
+    public IValueParameter<IDoubleValueManipulator> DoubleValueManipulatorParameter {
+      get { return (ValueParameter<IDoubleValueManipulator>)Parameters[DoubleValueManipulatorParameterName]; }
     }
     #endregion
@@ -91 +104 @@
       Parameters.Add(new ValueParameter<IntValue>(RepetitionsParameterName, "The number of evaluations for each problem.", new IntValue(3)));
 
+      var validIntManipulators = new ItemSet<IIntValueManipulator>( ApplicationManager.Manager.GetInstances<IIntValueManipulator>());
+      var validDoubleManipulators = new ItemSet<IDoubleValueManipulator>(ApplicationManager.Manager.GetInstances<IDoubleValueManipulator>());
+      Parameters.Add(new ConstrainedValueParameter<IIntValueManipulator>(IntValueManipulatorParameterName, "", validIntManipulators, new UniformIntValueManipulator()));
+      Parameters.Add(new ConstrainedValueParameter<IDoubleValueManipulator>(DoubleValueManipulatorParameterName, "", validDoubleManipulators, new NormalDoubleValueManipulator()));
+
+
       Maximization = new BoolValue(false);
       SolutionCreator = new RandomParameterConfigurationCreator();
-      Evaluator = new MetaOptimizationEvaluator();
+      Evaluator = new ParameterConfigurationEvaluator();
 
       InitializeOperators();
@@ -136 +155 @@
     }
     private void ParameterizeEvaluator() {
-      ((MetaOptimizationEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
+      ((ParameterConfigurationEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
     }
     private void ParameterizeAnalyzer() {