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

Timestamp:

03/10/11 10:44:42 (13 years ago)

Author:

cneumuel

Message:

#1215

• evaluation operator returns operatorgraph which creates a scope and an operation for each algorithm execution (each repetition and problem)
• split ValueConfiguration into ParameterizedValueConfiguration and RangeValueConfiguration

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Files:

• . (modified) (1 prop)
• MetaOptimizationProblem.cs (modified) (3 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

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

@@ -137 +137 @@
       Maximization = new BoolValue(false);
       SolutionCreator = new RandomParameterConfigurationCreator();
-      Evaluator = new ParameterConfigurationEvaluator();
+      Evaluator = new PMOEvaluator();
 
       InitializeOperators();
@@ -186 +186 @@
     }
     private void ParameterizeEvaluator() {
-      ((ParameterConfigurationEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
+      ((PMOEvaluator)Evaluator).ParameterConfigurationParameter.ActualName = ((RandomParameterConfigurationCreator)SolutionCreator).ParameterConfigurationParameter.ActualName;
     }
     private void ParameterizeAnalyzer() {
@@ -246 +246 @@
       IAlgorithm instance = (IAlgorithm)Activator.CreateInstance(AlgorithmType.Value);
       this.ProblemType.ValidTypes = ApplicationManager.Manager.GetTypes(instance.ProblemType, true).ToList();
-      this.ProblemType.Value = this.ProblemType.ValidTypes.Where(t => t != typeof(MetaOptimizationProblem)).FirstOrDefault();
+      this.ProblemType.Value = this.ProblemType.ValidTypes.SingleOrDefault(t => t == typeof(SingleObjectiveTestFunctionProblem)) ?? this.ProblemType.ValidTypes.Where(t => t != typeof(MetaOptimizationProblem)).FirstOrDefault();
       if (ProblemType.Value != null) {
         ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, ProblemType.Value));
+        Problems.Add((IProblem)Activator.CreateInstance(this.ProblemType.Value));
       } else {
         ParameterConfigurationTreeParameter.ActualValue = null;

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x