Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs

Timestamp:

11/25/15 23:24:01 (8 years ago)

Author:

abeham

Message:

#2521:

• Adapted single-objective test function problem to new problem infrastructure
• Added additional interfaces to RealVectorEncoding
• Fixed IParticleUpdater interface (must implement IStochasticOperator if it contains a Random parameter)

File:

• branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs (modified) (3 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs

@@ -146 +146 @@
           pictureBox.Refresh();
           DoubleMatrix bounds = Content.Bounds;
-          if (bounds == null) bounds = Content.Evaluator.Bounds;
+          if (bounds == null) bounds = Content.TestFunction.Bounds;
           double xMin = bounds[0, 0], xMax = bounds[0, 1], yMin = bounds[1 % bounds.Rows, 0], yMax = bounds[1 % bounds.Rows, 1];
           double xStep = backgroundImage.Width / (xMax - xMin), yStep = backgroundImage.Height / (yMax - yMin);
@@ -174 +174 @@
       backgroundImage = new Bitmap(pictureBox.Width, pictureBox.Height);
       DoubleMatrix bounds = Content.Bounds;
-      if (bounds == null) bounds = Content.Evaluator.Bounds;
+      if (bounds == null) bounds = Content.TestFunction.Bounds;
       double xMin = bounds[0, 0], xMax = bounds[0, 1], yMin = bounds[1 % bounds.Rows, 0], yMax = bounds[1 % bounds.Rows, 1];
       double xStep = (xMax - xMin) / backgroundImage.Width, yStep = (yMax - yMin) / backgroundImage.Height;
@@ -181 +181 @@
       for (int i = 0; i < backgroundImage.Width; i++)
         for (int j = 0; j < backgroundImage.Height; j++) {
-          points[j, i] = Content.Evaluator.Evaluate2D(xMin + i * xStep, yMin + j * yStep);
+          points[j, i] = Content.TestFunction.Evaluate2D(xMin + i * xStep, yMin + j * yStep);
           if (points[j, i] < minPoint) minPoint = points[j, i];
           if (points[j, i] > maxPoint) maxPoint = points[j, i];