Changeset 5009 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators

Timestamp:

12/01/10 20:37:36 (14 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

File:

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

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/MetaOptimizationEvaluator.cs

@@ -23 +23 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ILookupParameter<IAlgorithm> AlgorithmParameter {
-      get { return (ILookupParameter<IAlgorithm>)Parameters["Algorithm"]; }
+    public ILookupParameter<EngineAlgorithm> AlgorithmParameter {
+      get { return (ILookupParameter<EngineAlgorithm>)Parameters["Algorithm"]; }
     }
-    public ILookupParameter<IItemList<IProblem>> ProblemsParameter {
-      get { return (ILookupParameter<IItemList<IProblem>>)Parameters["Problems"]; }
+    public ILookupParameter<IItemList<ISingleObjectiveProblem>> ProblemsParameter {
+      get { return (ILookupParameter<IItemList<ISingleObjectiveProblem>>)Parameters["Problems"]; }
     }
-    public ILookupParameter<IValueConfiguration> ParameterConfigurationParameter {
-      get { return (ILookupParameter<IValueConfiguration>)Parameters["ValueConfiguration"]; }
+    public ILookupParameter<ParameterConfigurationTree> ParameterConfigurationParameter {
+      get { return (ILookupParameter<ParameterConfigurationTree>)Parameters["ParameterConfigurationTree"]; }
     }
     public ValueParameter<IntValue> RepetitionsParameter {
@@ -41 +41 @@
     }
 
-    public MetaOptimizationEvaluator() : base() {
+    public MetaOptimizationEvaluator()
+      : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the ParameterVector."));
-      Parameters.Add(new LookupParameter<IAlgorithm>("Algorithm", "Missing description."));
-      Parameters.Add(new LookupParameter<IItemList<IProblem>>("Problems", "Missing description."));
-      Parameters.Add(new LookupParameter<IValueConfiguration>("ValueConfiguration", "Missing description."));
+      Parameters.Add(new LookupParameter<EngineAlgorithm>("Algorithm", "Missing description."));
+      Parameters.Add(new LookupParameter<IItemList<ISingleObjectiveProblem>>("Problems", "Missing description."));
+      Parameters.Add(new LookupParameter<ParameterConfigurationTree>("ParameterConfigurationTree", "Missing description."));
       Parameters.Add(new ValueParameter<IntValue>(RepetitionsParameterName, "Number of evaluations for one individual.", new IntValue(3)));
     }
@@ -60 +61 @@
 
     public override IOperation Apply() {
-      AlgorithmParameter.ActualValue.Prepare();
-      //ParameterizeAlgorithm();
-      //ParameterConfigurationParameter.ActualValue.Parameterize(AlgorithmParameter.ActualValue);
+      EngineAlgorithm algorithm = (EngineAlgorithm)ParameterConfigurationParameter.ActualValue.ActualValue.Value;
+
+      // set parameters
+      ParameterConfigurationParameter.ActualValue.Parameterize(algorithm);
+
       algorithmStopped = false;
-      AlgorithmParameter.ActualValue.Stopped += new EventHandler(ActualValue_Stopped);
+      algorithm.Stopped += new EventHandler(ActualValue_Stopped);
 
       double qualitySum = 0;
 
-      foreach (IProblem problem in ProblemsParameter.ActualValue) {
-        AlgorithmParameter.ActualValue.Problem = problem;
-        AlgorithmParameter.ActualValue.Start();
-        while (!algorithmStopped) {
-          Thread.Sleep(1000); // wait for algorithm to complete; do not rely on Algorithm.ExecutionState here, because change of ExecutionState happens before Run is added (which causes problems because Algorithm might get cloned when its started already)
-        }
-        AlgorithmParameter.ActualValue.Stopped -= new EventHandler(ActualValue_Stopped);
-        qualitySum += ((DoubleValue)AlgorithmParameter.ActualValue.Results["BestQuality"].Value).Value;
+      //foreach (ISingleObjectiveProblem problem in ProblemsParameter.ActualValue) {
+      algorithm.Engine = new SequentialEngine.SequentialEngine();
+      //algorithm.Problem = problem;
+      algorithm.Prepare();
+      algorithm.Start();
+      while (!algorithmStopped) {
+        Thread.Sleep(1000); // wait for algorithm to complete; do not rely on Algorithm.ExecutionState here, because change of ExecutionState happens before Run is added (which causes problems because Algorithm might get cloned when its started already)
       }
+      double quality = ((DoubleValue)algorithm.Results["BestQuality"].Value).Value;
+      ParameterConfigurationParameter.ActualValue.Quality.Value = quality;
+      qualitySum += quality;
+      //}
 
-      double qualityAvg = qualitySum / ProblemsParameter.ActualValue.Count;
-      this.QualityParameter.ActualValue = new DoubleValue(qualityAvg);
+      algorithm.Stopped -= new EventHandler(ActualValue_Stopped);
+
+      //double qualityAvg = qualitySum / ProblemsParameter.ActualValue.Count;
+      //this.QualityParameter.ActualValue = new DoubleValue(qualityAvg);
+      this.QualityParameter.ActualValue = new DoubleValue(quality);
 
       return base.Apply();