Changeset 17544 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

Timestamp:

05/18/20 18:55:08 (4 years ago)

Author:

abeham

Message:

#2521: worked on refactoring, worked a lot on binary encoding / problems

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -37 +37 @@
   public class MultiObjectiveTestFunctionProblem : RealVectorMultiObjectiveProblem, IProblemInstanceConsumer<MOTFData>, IMultiObjectiveProblemDefinition<RealVectorEncoding, RealVector> {
     #region Parameter Properties
-    public IFixedValueParameter<IntValue> ProblemSizeParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["ProblemSize"]; }
-    }
     public IFixedValueParameter<IntValue> ObjectivesParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["Objectives"]; }
-    }
-    public IValueParameter<DoubleMatrix> BoundsParameter {
-      get { return (IValueParameter<DoubleMatrix>)Parameters["Bounds"]; }
     }
     public IValueParameter<IMultiObjectiveTestFunction> TestFunctionParameter {
@@ -52 +46 @@
 
     #region Properties
-    public int ProblemSize {
-      get { return ProblemSizeParameter.Value.Value; }
-      set { ProblemSizeParameter.Value.Value = value; }
-    }
     public new int Objectives {
       get { return ObjectivesParameter.Value.Value; }
       set { ObjectivesParameter.Value.Value = value; }
-    }
-    public DoubleMatrix Bounds {
-      get { return BoundsParameter.Value; }
-      set { BoundsParameter.Value = value; }
     }
     public IMultiObjectiveTestFunction TestFunction {
@@ -85 +71 @@
 
     public MultiObjectiveTestFunctionProblem() : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>("ProblemSize", "The dimensionality of the problem instance (number of variables in the function).", new IntValue(2)));
       Parameters.Add(new FixedValueParameter<IntValue>("Objectives", "The dimensionality of the solution vector (number of objectives).", new IntValue(2)));
-      Parameters.Add(new ValueParameter<DoubleMatrix>("Bounds", "The bounds of the solution given as either one line for all variables or a line for each variable. The first column specifies lower bound, the second upper bound.", new DoubleMatrix(new double[,] { { -4, 4 } })));
       Parameters.Add(new ValueParameter<IMultiObjectiveTestFunction>("TestFunction", "The function that is to be optimized.", new Fonseca()));
 
-      Encoding.LengthParameter = ProblemSizeParameter;
-      Encoding.BoundsParameter = BoundsParameter;
       BestKnownFrontParameter.Hidden = true;
 
@@ -101 +83 @@
     private void RegisterEventHandlers() {
       TestFunctionParameter.ValueChanged += TestFunctionParameterOnValueChanged;
-      ProblemSizeParameter.Value.ValueChanged += ProblemSizeOnValueChanged;
       ObjectivesParameter.Value.ValueChanged += ObjectivesOnValueChanged;
     }
@@ -156 +137 @@
     }
 
+    protected override void DimensionOnChanged() {
+      base.DimensionOnChanged();
+      if (Dimension < TestFunction.MinimumSolutionLength || Dimension > TestFunction.MaximumSolutionLength)
+        Dimension = Math.Min(TestFunction.MaximumSolutionLength, Math.Max(TestFunction.MinimumSolutionLength, Dimension));
+      UpdateParameterValues();
+    }
+
     private void TestFunctionParameterOnValueChanged(object sender, EventArgs eventArgs) {
-      ProblemSize = Math.Max(TestFunction.MinimumSolutionLength, Math.Min(ProblemSize, TestFunction.MaximumSolutionLength));
+      Dimension = Math.Max(TestFunction.MinimumSolutionLength, Math.Min(Dimension, TestFunction.MaximumSolutionLength));
       Objectives = Math.Max(TestFunction.MinimumObjectives, Math.Min(Objectives, TestFunction.MaximumObjectives));
       Parameters.Remove(ReferencePointParameterName);
@@ -163 +151 @@
       UpdateParameterValues();
       OnReset();
-    }
-
-    private void ProblemSizeOnValueChanged(object sender, EventArgs eventArgs) {
-      ProblemSize = Math.Min(TestFunction.MaximumSolutionLength, Math.Max(TestFunction.MinimumSolutionLength, ProblemSize));
-      UpdateParameterValues();
     }