Changeset 17695 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.ParameterOptimization

Timestamp:

07/23/20 16:21:55 (4 years ago)

Author:

abeham

Message:

#2521:

• Moving solution creator parameter from problems to algorithms (breaking wiring in some HeuristicOptimizationProblems)
• Disallowing evaluator or encoding changes in encoding-specific base problems (to avoid confusion in derived problems whether this needs to be handled or not)
• Added private set to ReferenceParameter property (serialization)

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs (modified) (7 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -30 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -36 +36 @@
   [Item("Parameter Optimization Problem", "A base class for other problems for the optimization of a parameter vector.")]
   [StorableType("B1F529FE-483C-4EF2-9306-2F6A0833EEAC")]
-  public abstract class ParameterOptimizationProblem : SingleObjectiveHeuristicOptimizationProblem<IParameterVectorEvaluator, IRealVectorCreator>, IStorableContent {
+  public abstract class ParameterOptimizationProblem : SingleObjectiveHeuristicOptimizationProblem<IParameterVectorEvaluator>, IStorableContent {
     public string Filename { get; set; }
     private const string ProblemSizeParameterName = "ProblemSize";
@@ -94 +94 @@
 
     protected ParameterOptimizationProblem(IParameterVectorEvaluator evaluator)
-      : base(evaluator, new UniformRandomRealVectorCreator()) {
+      : base(evaluator) {
       Parameters.Add(new FixedValueParameter<IntValue>(ProblemSizeParameterName, "The dimension of the parameter vector that is to be optimized.", new IntValue(1)));
       Parameters.Add(new ValueParameter<DoubleMatrix>(BoundsParameterName, "The bounds for each dimension of the parameter vector. If the number of bounds is smaller than the problem size then the bounds are reused in a cyclic manner.", new DoubleMatrix(new double[,] { { 0, 100 } }, new string[] { "LowerBound", "UpperBound" })));
       Parameters.Add(new ValueParameter<StringArray>(ParameterNamesParameterName, "The element names which are used to calculate the quality of a parameter vector.", new StringArray(new string[] { "Parameter0" })));
 
-      SolutionCreator.LengthParameter.ActualName = "ProblemSize";
+      // TODO
+      //SolutionCreator.LengthParameter.ActualName = "ProblemSize";
 
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>());
@@ -139 +140 @@
 
     private void UpdateParameters() {
-      Evaluator.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      // TODO: This method wired solution creator -> should be done by encoding
+      //Evaluator.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
       Evaluator.ParameterNamesParameter.ActualName = ParameterNamesParameter.Name;
 
       foreach (var bestSolutionAnalyzer in Operators.OfType<BestSolutionAnalyzer>()) {
-        bestSolutionAnalyzer.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        //bestSolutionAnalyzer.ParameterVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         bestSolutionAnalyzer.ParameterNamesParameter.ActualName = ParameterNamesParameter.Name;
       }
@@ -152 +154 @@
         Bounds[i, 1] = 100.0;
       }
-
+      /* TODO
       foreach (var op in Operators.OfType<IRealVectorManipulator>())
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
@@ -160 +162 @@
         similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
       }
+      */
     }