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

Timestamp:

03/10/11 19:26:58 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented optimization of problem parameters

File:

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

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

@@ -269 +269 @@
       // the first problem in the list is always the instance for the algorithm - this way some basic wiring between problem and algorithm can be sustained
       if (e.Items.Single().Index == 0) {
-        ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, e.Items.Single().Value));
+        ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, e.Items.Single().Value), e.Items.Single().Value);
 
         // special for DataAnalysisProblem: Because of wiring between algorithm and problem, ParameterConfigurationTree needs to be recreated on Reset event
@@ -291 +291 @@
 
     private void DataAnalysisProblem_Reset(object sender, EventArgs e) {
-      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, Problems.First()));
+      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(CreateAlgorithm(AlgorithmType.Value, Problems.First()), Problems.First());
     }
     #endregion
@@ -304 +304 @@
       AlgorithmType.Value = algorithm.GetType();
       if (algorithm.Problem != null) ProblemType.Value = algorithm.Problem.GetType();
-      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(algorithm);
-      if (algorithm.Problem != null) Problems.Add((IProblem)algorithm.Problem);
+      if (algorithm.Problem != null) {
+        Problems.Clear();
+        Problems.Add((IProblem)algorithm.Problem);
+      }
+      ParameterConfigurationTreeParameter.ActualValue = new ParameterConfigurationTree(algorithm, Problems.First());
+      
     }
   }