Changeset 5204

Timestamp:

01/03/11 23:21:30 (13 years ago)

Author:

swagner

Message:

Stored whole population in SingleObjectiveTestFunctionSolution only in the 2D case (#1360)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionSolutionView.cs

@@ -157 +157 @@
               graphics.DrawLine(cross, a - 4, b + 4, a + 4, b - 4);
             }
-            foreach (RealVector vector in Content.Population)
-              graphics.FillEllipse(Brushes.Blue, (float)((vector[0] - xMin) * xStep - 4), (float)((vector[1] - yMin) * yStep - 4), 8.0f, 8.0f);
+            if (Content.Population != null) {
+              foreach (RealVector vector in Content.Population)
+                graphics.FillEllipse(Brushes.Blue, (float)((vector[0] - xMin) * xStep - 4), (float)((vector[1] - yMin) * yStep - 4), 8.0f, 8.0f);
+            }
             if (Content.BestRealVector != null) {
               graphics.FillEllipse(Brushes.Green, (float)((Content.BestRealVector[0] - xMin) * xStep - 5), (float)((Content.BestRealVector[1] - yMin) * yStep - 5), 10.0f, 10.0f);

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -109 +109 @@
       SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
 
-      int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      int i = -1;
+      if (!max) i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      else i = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
 
       if (bestKnownQuality == null ||
@@ -123 +125 @@
         ResultCollection results = ResultsParameter.ActualValue;
         solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], EvaluatorParameter.ActualValue);
-        solution.Population = realVectors;
+        solution.Population = realVectors[i].Length == 2 ? realVectors : null;
         solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
         solution.Bounds = BoundsParameter.ActualValue;
@@ -134 +136 @@
           solution.BestQuality = qualities[i];
         }
-        solution.Population = realVectors;
+        solution.Population = realVectors[i].Length == 2 ? realVectors : null;
       }