Changeset 7995 for trunk/sources/HeuristicLab.Selection/3.3/TournamentSelector.cs

Timestamp:

06/13/12 09:01:31 (12 years ago)

Author:

mkommend

Message:

#1871: Added quality checks in all SingleObjectiveSelectors.

File:

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

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -57 +58 @@
       IRandom random = RandomParameter.ActualValue;
       bool maximization = MaximizationParameter.ActualValue.Value;
-      List<double> qualities = QualityParameter.ActualValue.Select(x => x.Value).ToList();
+      List<double> qualities = QualityParameter.ActualValue.Where(x => IsValidQuality(x.Value)).Select(x => x.Value).ToList();
       int groupSize = GroupSizeParameter.ActualValue.Value;
       IScope[] selected = new IScope[count];
+
+      //check if list with indexes is as long as the original scope list
+      //otherwise invalid quality values were filtered
+      if (qualities.Count != scopes.Count) {
+        throw new ArgumentException("The scopes contain invalid quality values (either infinity or double.NaN) on which the selector cannot operate.");
+      }
 
       for (int i = 0; i < count; i++) {