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

Timestamp:

12/21/10 01:13:49 (14 years ago)

Author:

cneumuel

Message:

#1215

• added possibility to create all parameter combinations from a ParameterConfigurationTree and generate an experiment from them

File:

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

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

@@ -40 +40 @@
     public const string ProblemTypeParameterName = "ProblemType";
     public const string ProblemsParameterName = "Problems";
-    public const string ParameterConfigurationParameterName = "InitialParameterConfigurationTree";
+    public const string ParameterConfigurationTreeParameterName = "ParameterConfigurationTree";
     public const string RepetitionsParameterName = "Repetitions";
 
@@ -58 +58 @@
       get { return (ValueParameter<ConstrainedItemList<ISingleObjectiveProblem>>)Parameters[ProblemsParameterName]; }
     }
-    public IValueParameter<ParameterConfigurationTree> ParameterConfigurationParameter {
-      get { return (ValueParameter<ParameterConfigurationTree>)Parameters[ParameterConfigurationParameterName]; }
+    public IValueParameter<ParameterConfigurationTree> ParameterConfigurationTreeParameter {
+      get { return (ValueParameter<ParameterConfigurationTree>)Parameters[ParameterConfigurationTreeParameterName]; }
     }
     public IValueParameter<IntValue> RepetitionsParameter {
@@ -87 +87 @@
       set { ProblemsParameter.Value = value; }
     }
-    public ParameterConfigurationTree AlgorithmParameterConfiguration {
-      get { return ParameterConfigurationParameter.Value; }
-      set { ParameterConfigurationParameter.Value = value; }
+    public ParameterConfigurationTree ParameterConfigurationTree {
+      get { return ParameterConfigurationTreeParameter.Value; }
+      set { ParameterConfigurationTreeParameter.Value = value; }
     }
     public IntValue Repetitions {
@@ -101 +101 @@
       Parameters.Add(new ValueParameter<ISingleObjectiveProblem>(ProblemTypeParameterName, "The problem type.", new SingleObjectiveTestFunctionProblem()));
       Parameters.Add(new ValueParameter<ConstrainedItemList<ISingleObjectiveProblem>>(ProblemsParameterName, "The problems that should be evaluated.", new ConstrainedItemList<ISingleObjectiveProblem>()));
-      Parameters.Add(new ValueParameter<ParameterConfigurationTree>(ParameterConfigurationParameterName, "List of algorithm parameters that should be optimized."));
+      Parameters.Add(new ValueParameter<ParameterConfigurationTree>(ParameterConfigurationTreeParameterName, "List of algorithm parameters that should be optimized."));
       Parameters.Add(new ValueParameter<IntValue>(RepetitionsParameterName, "The number of evaluations for each problem.", new IntValue(3)));
 
@@ -122 +122 @@
       Problems.Type = Problem.GetType();
       Algorithm.Problem = Problem;
-      ParameterConfigurationParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
+      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
     }
 
@@ -185 +185 @@
     void AlgorithmTypeParameter_ValueChanged(object sender, EventArgs e) {
       Algorithm.Problem = Problem;
-      ParameterConfigurationParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
+      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
     }
     void ProblemTypeParameter_ValueChanged(object sender, EventArgs e) {
       Problems.Type = Problem.GetType();
       Algorithm.Problem = Problem;
-      ParameterConfigurationParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
+      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(Algorithm);
     }
     #endregion