Changeset 5204 for trunk/sources/HeuristicLab.Problems.TestFunctions

Timestamp:

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

Author:

swagner

Message:

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

File:

• trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (3 diffs)

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;
       }