Changeset 10937 for trunk/sources

Timestamp:

06/04/14 12:59:15 (10 years ago)

Author:

mkommend

Message:

#2193: Fixed bug in BestSolutionAnalyzer for parameter optimization problems.

File:

• trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

@@ -101 +101 @@
       var bestQuality = qualities[ind].Value;
       var bestParameterVector = (RealVector)parameterVectors[ind].Clone();
+      ResultCollection results = ResultsParameter.ActualValue;
 
       if (BestQualityParameter.ActualValue == null) {
@@ -110 +111 @@
           || !max && bestQuality < BestQualityParameter.ActualValue.Value) {
         BestQualityParameter.ActualValue.Value = bestQuality;
-        ResultCollection results = ResultsParameter.ActualValue;
         if (results.ContainsKey(BestSolutionResultName)) {
           var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
@@ -116 +116 @@
           for (int i = 0; i < bestParameterVector.Length; i++)
             bestSolution[i] = bestParameterVector[i];
-        } else {
-          results.Add(new Result(BestSolutionResultName, new DoubleArray(bestParameterVector.ToArray())));
-          var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
-          bestSolution.ElementNames = ParameterNamesParameter.ActualValue;
         }
+      } else if (!results.ContainsKey(BestSolutionResultName)) {
+        results.Add(new Result(BestSolutionResultName, new DoubleArray(bestParameterVector.ToArray())));
+        var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
+        bestSolution.ElementNames = ParameterNamesParameter.ActualValue;
       }
-
       //update best known quality
       if (bestKnownQuality == null || max && bestQuality > bestKnownQuality.Value