Changeset 13448 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

Timestamp:

12/11/15 11:21:44 (8 years ago)

Author:

bwerth

Message:

#1087 implemented more Testfunctions; enabled setting of SolutionSize

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs (modified) (7 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -21 +21 @@
       get {
         return Parameters.ContainsKey("TestFunction") ? TestFunction.Maximization : new bool[2];
-      } //TODO shady
+      }
     }
 
     #region Parameter Properties
+
+
     private IFixedValueParameter<IntValue> ProblemSizeParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["ProblemSize"]; }
@@ -73 +75 @@
       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>("SolutionSize", "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[,] { { -100, 100 } })));
+      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()));
 
@@ -97 +99 @@
       TestFunctionParameter.ValueChanged += TestFunctionParameterOnValueChanged;
       ProblemSizeParameter.Value.ValueChanged += ProblemSizeOnValueChanged;
+      SolutionSizeParameter.Value.ValueChanged += SolutionSizeOnValueChanged;
       BoundsParameter.ValueChanged += BoundsParameterOnValueChanged;
     }
 
-    public double[] Evaluate(RealVector vector, IRandom random) {
-      return TestFunction.Evaluate(vector);
+    public double[] Evaluate(RealVector individual, IRandom random) {
+      return TestFunction.Evaluate(individual);
     }
-    public sealed override double[] Evaluate(Individual individual, IRandom random) {
+
+    public override double[] Evaluate(Individual individual, IRandom random) {
       return Evaluate(individual.RealVector(), random);
     }
+
 
     #region Events
@@ -114 +119 @@
     protected override void OnEvaluatorChanged() {
       base.OnEvaluatorChanged();
-     // Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
+      // Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
       Parameterize();
     }
+
     //private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
     //  Parameterize();
@@ -134 +140 @@
         ProblemSize = Math.Max(TestFunction.MinimumSolutionSize, Math.Min(SolutionSize, TestFunction.MaximumSolutionSize));
       }
-
       Bounds = (DoubleMatrix)TestFunction.Bounds.Clone();
       OnReset();
@@ -143 +148 @@
         || ProblemSize > TestFunction.MaximumProblemSize)
         ProblemSize = Math.Min(TestFunction.MaximumProblemSize, Math.Max(TestFunction.MinimumProblemSize, ProblemSize));
+      //TODO problemsize dominates solutionSize 
+      SolutionSizeOnValueChanged(sender, eventArgs);
     }
 
     private void SolutionSizeOnValueChanged(object sender, EventArgs eventArgs) {
       if (SolutionSize < TestFunction.MinimumSolutionSize
-        || ProblemSize > TestFunction.MaximumSolutionSize)
-        ProblemSize = Math.Min(TestFunction.MaximumSolutionSize, Math.Max(TestFunction.MinimumSolutionSize, SolutionSize));
+        || SolutionSize > TestFunction.MaximumSolutionSize)
+        SolutionSize = Math.Min(TestFunction.MaximumSolutionSize, Math.Max(TestFunction.MinimumSolutionSize, SolutionSize));
+      TestFunction.ActualSolutionSize = SolutionSize;
+      OnReset();
     }
 
@@ -163 +172 @@
 
     private void Parameterize() {
-      //empty for now
     }
+
+    
     #endregion
-
-
   }
 }