Changeset 11064 for branches/DataPreprocessing/HeuristicLab.Problems.ParameterOptimization

Timestamp:

07/01/14 10:53:46 (10 years ago)

Author:

mkommend

Message:

#2206: Updated data preprocessing branch with trunk changes.

Location:

branches/DataPreprocessing

Files:

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

branches/DataPreprocessing/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

@@ -108 +108 @@
       }
 
-      if (max && bestQuality > BestQualityParameter.ActualValue.Value
-          || !max && bestQuality < BestQualityParameter.ActualValue.Value) {
-        BestQualityParameter.ActualValue.Value = bestQuality;
-        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 if (!results.ContainsKey(BestSolutionResultName)) {
+      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;
+      } 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;
       }
+
       //update best known quality
       if (bestKnownQuality == null || max && bestQuality > bestKnownQuality.Value