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

Timestamp:

01/20/11 01:30:44 (14 years ago)

Author:

cneumuel

Message:

#1215

• made all IAlgorithm types compatible to be loaded into MetaOptimization.
• valid problem types are now automatically set

Location:

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

Files:

• AlgorithmExecutor.cs (modified) (1 diff)
• ParameterConfigurationEvaluator.cs (modified) (6 diffs)

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

@@ -11 +11 @@
   /// </summary>
   public class AlgorithmExecutor {
-    private EngineAlgorithm algorithm;
+    private IAlgorithm algorithm;
     private AutoResetEvent waitHandle = new AutoResetEvent(false);
 
-    public AlgorithmExecutor(EngineAlgorithm algorithm) {
+    public AlgorithmExecutor(IAlgorithm algorithm) {
       this.algorithm = algorithm;
     }

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

@@ -30 +30 @@
       get { return (ILookupParameter<TypeValue>)Parameters[MetaOptimizationProblem.AlgorithmTypeParameterName]; }
     }
-    public ILookupParameter<IItemList<ISingleObjectiveProblem>> ProblemsParameter {
-      get { return (ILookupParameter<IItemList<ISingleObjectiveProblem>>)Parameters[MetaOptimizationProblem.ProblemsParameterName]; }
+    public ILookupParameter<IItemList<IProblem>> ProblemsParameter {
+      get { return (ILookupParameter<IItemList<IProblem>>)Parameters[MetaOptimizationProblem.ProblemsParameterName]; }
     }
     public ILookupParameter<ParameterConfigurationTree> ParameterConfigurationParameter {
@@ -58 +58 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the ParameterVector."));
       Parameters.Add(new LookupParameter<TypeValue>(MetaOptimizationProblem.AlgorithmTypeParameterName, "Missing description."));
-      Parameters.Add(new LookupParameter<IItemList<ISingleObjectiveProblem>>(MetaOptimizationProblem.ProblemsParameterName, "Missing description."));
+      Parameters.Add(new LookupParameter<IItemList<IProblem>>(MetaOptimizationProblem.ProblemsParameterName, "Missing description."));
       Parameters.Add(new LookupParameter<ParameterConfigurationTree>("ParameterConfigurationTree", "Missing description."));
       Parameters.Add(new LookupParameter<IntValue>(MetaOptimizationProblem.RepetitionsParameterName, "Number of evaluations on one problem."));
@@ -77 +77 @@
     public override IOperation Apply() {
       ParameterConfigurationTree parameterConfiguration = ParameterConfigurationParameter.ActualValue;
-      EngineAlgorithm algorithm = (EngineAlgorithm)Activator.CreateInstance(AlgorithmTypeParameter.ActualValue.Value);
-      IItemList<ISingleObjectiveProblem> problems = ProblemsParameter.ActualValue;
+      IAlgorithm algorithm = (IAlgorithm)Activator.CreateInstance(AlgorithmTypeParameter.ActualValue.Value);
+      IItemList<IProblem> problems = ProblemsParameter.ActualValue;
       ItemDictionary<StringValue, RunCollection> runsCache = ResultsParameter.ActualValue.ContainsKey("Runs") ? (ItemDictionary<StringValue, RunCollection>)ResultsParameter.ActualValue["Runs"].Value : null;
       double[] referenceQualities = GetReferenceQualities(problems);
@@ -113 +113 @@
     }
 
-    private double[] GetReferenceQualities(IItemList<ISingleObjectiveProblem> problems) {
+    private double[] GetReferenceQualities(IItemList<IProblem> problems) {
       double[] referenceQualities;
       if (ProblemQualityReferencesParameter.ActualValue == null) {
@@ -127 +127 @@
     }
 
-    private RunCollection ExecuteAlgorithm(ParameterConfigurationTree parameterConfiguration, EngineAlgorithm algorithm, IItemList<ISingleObjectiveProblem> problems) {
-      EngineAlgorithm algorithmClone = (EngineAlgorithm)algorithm.Clone();
+    private RunCollection ExecuteAlgorithm(ParameterConfigurationTree parameterConfiguration, IAlgorithm algorithm, IItemList<IProblem> problems) {
+      IAlgorithm algorithmClone = (IAlgorithm)algorithm.Clone();
 
       // set parameters
@@ -134 +134 @@
       algorithmClone.StoreAlgorithmInEachRun = false;
 
-      algorithmClone.Engine = new SequentialEngine.SequentialEngine();
+      if (algorithmClone is EngineAlgorithm) {
+        ((EngineAlgorithm)algorithmClone).Engine = new SequentialEngine.SequentialEngine();
+      }
       algorithmClone.Prepare(true);
 
-      foreach (ISingleObjectiveProblem problem in problems) {
+      foreach (IProblem problem in problems) {
         algorithmClone.Problem = (IProblem)problem.Clone();