Changeset 13183 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

Timestamp:

11/16/15 18:55:07 (8 years ago)

Author:

pfleck

Message:

#1674

• Added a SupportScript for the MultiObjectiveExternalEvaluationProblem.
• Extracted code from the SingleObjectiveOptimizationSupportScript into the OptimizationSupportScript to reuse code for the MultiObjectiveOptimizationSupportScript.

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

@@ -53 +53 @@
       get { return (IValueParameter<SolutionMessageBuilder>)Parameters["MessageBuilder"]; }
     }
-    //public IFixedValueParameter<MultiObjectiveOptimizationSupportScript> SupportScriptParameter {
-    //  get { return (IFixedValueParameter<MultiObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
-    //}
+    public IFixedValueParameter<MultiObjectiveOptimizationSupportScript> SupportScriptParameter {
+      get { return (IFixedValueParameter<MultiObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
+    }
     #endregion
 
@@ -68 +68 @@
       get { return MessageBuilderParameter.Value; }
     }
-    //public MultiObjectiveOptimizationSupportScript OptimizationSupportScript {
-    //  get { return SupportScriptParameter.Value; }
-    //}
-    //private IMultiObjectiveOptimizationSupport OptimizationSupport {
-    //  get { return SupportScriptParameter.Value; }
-    //}
+    public MultiObjectiveOptimizationSupportScript OptimizationSupportScript {
+      get { return SupportScriptParameter.Value; }
+    }
+    private IMultiObjectiveOptimizationSupport OptimizationSupport {
+      get { return SupportScriptParameter.Value; }
+    }
     #endregion
 
@@ -89 +89 @@
       Parameters.Add(new ValueParameter<CheckedItemCollection<IEvaluationServiceClient>>("Clients", "The clients that are used to communicate with the external application.", new CheckedItemCollection<IEvaluationServiceClient>() { new EvaluationServiceClient() }));
       Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()) { Hidden = true });
-      //Parameters.Add(new FixedValueParameter<MultiObjectiveOptimizationSupportScript>("SupportScript", "A script that can analyze the results of the optimization.", new MultiObjectiveOptimizationSupportScript()));
+      Parameters.Add(new FixedValueParameter<MultiObjectiveOptimizationSupportScript>("SupportScript", "A script that can analyze the results of the optimization.", new MultiObjectiveOptimizationSupportScript()));
 
       //Operators.Add(new BestScopeSolutionAnalyzer()); pareto front
@@ -114 +114 @@
 
     public override void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results, IRandom random) {
-      //OptimizationSupport.Analyze(individuals, qualities, results, random);
+      OptimizationSupport.Analyze(individuals, qualities, results, random);
     }