Changeset 11152 for stable

Timestamp:

07/08/14 20:04:46 (10 years ago)

Author:

mkommend

Message:

#2193: Merged r10937, r11019 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

@@ -101 +101 @@
       var bestQuality = qualities[indexOfBest].Value;
       var bestParameterVector = (RealVector)parameterVectors[indexOfBest].Clone();
+      ResultCollection results = ResultsParameter.ActualValue;
 
       if (BestQualityParameter.ActualValue == null) {
@@ -107 +108 @@
       }
 
-      if (max && bestQuality > BestQualityParameter.ActualValue.Value
-          || !max && bestQuality < BestQualityParameter.ActualValue.Value) {
+      if (!results.ContainsKey(BestSolutionResultName)) {
+        results.Add(new Result(BestSolutionResultName, new DoubleArray(bestParameterVector.ToArray())));
+        var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
+        bestSolution.ElementNames = ParameterNamesParameter.ActualValue;
         BestQualityParameter.ActualValue.Value = bestQuality;
-        ResultCollection results = ResultsParameter.ActualValue;
-        if (results.ContainsKey(BestSolutionResultName)) {
-          var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
-          bestSolution.ElementNames = ParameterNamesParameter.ActualValue;
-          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 (max && bestQuality > BestQualityParameter.ActualValue.Value
+                || !max && bestQuality < BestQualityParameter.ActualValue.Value) {
+        var bestSolution = (DoubleArray)results[BestSolutionResultName].Value;
+        bestSolution.ElementNames = ParameterNamesParameter.ActualValue;
+        for (int i = 0; i < bestParameterVector.Length; i++)
+          bestSolution[i] = bestParameterVector[i];
+        BestQualityParameter.ActualValue.Value = bestQuality;
       }