Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionAnalyzer.cs

Timestamp:

11/25/14 03:26:00 (10 years ago)

Author:

swagner

Message:

#2205: Merged changes r11062:11557 from trunk/sources into branches/OptimizationNetworks

Location:

branches/OptimizationNetworks

Files:

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

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

@@ -95 +95 @@
       DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
 
-      int ind = -1;
-      if (!max) ind = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
-      else ind = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
+      int indexOfBest = -1;
+      if (!max) indexOfBest = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      else indexOfBest = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
 
-      var bestQuality = qualities[ind].Value;
-      var bestParameterVector = (RealVector)parameterVectors[ind].Clone();
+      var bestQuality = qualities[indexOfBest].Value;
+      var bestParameterVector = (RealVector)parameterVectors[indexOfBest].Clone();
       ResultCollection results = ResultsParameter.ActualValue;
 
@@ -123 +123 @@
 
       //update best known quality
-      if (bestKnownQuality == null || max && bestQuality > bestKnownQuality.Value
+      if (bestKnownQuality == null 
+        || max && bestQuality > bestKnownQuality.Value
         || !max && bestQuality < bestKnownQuality.Value) {
         BestKnownQualityParameter.ActualValue = new DoubleValue(bestQuality);