Changeset 7996 for trunk/sources

Timestamp:

06/13/12 09:09:36 (12 years ago)

Author:

mkommend

Message:

#1871: Improved performance of ProportionalSelector.

File:

• trunk/sources/HeuristicLab.Selection/3.3/ProportionalSelector.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Selection/3.3/ProportionalSelector.cs

@@ -69 +69 @@
       // prepare qualities for proportional selection
       var qualities = QualityParameter.ActualValue.Select(x => x.Value);
-      //check if list with indexes is as long as the original scope list
-      //otherwise invalid quality values were filtered
-      if (!qualities.All(IsValidQuality)) {
-        throw new ArgumentException("The scopes contain invalid quality values (either infinity or double.NaN) on which the selector cannot operate.");
+      double minQuality = double.MaxValue;
+      double maxQuality = double.MinValue;
+      foreach (var quality in qualities) {
+        if (!IsValidQuality(quality)) throw new ArgumentException("The scopes contain invalid quality values (either infinity or double.NaN) on which the selector cannot operate.");
+        if (quality < minQuality) minQuality = quality;
+        if (quality > maxQuality) maxQuality = quality;
       }
 
-      double minQuality = qualities.Min();
-      double maxQuality = qualities.Max();
       if (minQuality == maxQuality) {  // all quality values are equal
         qualities = qualities.Select(x => 1.0);
@@ -95 +95 @@
 
       List<double> list = qualities.ToList();
-      double qualitySum = qualities.Sum();
+      double qualitySum = list.Sum();
       for (int i = 0; i < count; i++) {
         double selectedQuality = random.NextDouble() * qualitySum;