Changeset 2730 for trunk/sources/HeuristicLab.GP/3.3/TreeGardener.cs

Timestamp:

02/01/10 16:43:56 (14 years ago)

Author:

gkronber

Message:

Made PTC2 operator more robust. #859 (PTC2 initialization operator fails if it is used with restrictive function libraries)

File:

• trunk/sources/HeuristicLab.GP/3.3/TreeGardener.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP/3.3/TreeGardener.cs

@@ -483 +483 @@
 
     public static IFunction RandomSelect(IRandom random, IList<IFunction> functionSet) {
+      if (random == null || functionSet == null) throw new ArgumentNullException();
+      if (functionSet.Count == 0) throw new ArgumentException("Empty function set");
+      if (functionSet.Select(x => x.Tickets).Sum() <= 0) throw new ArgumentException("All functions in set have 0 tickets");
       double[] accumulatedTickets = new double[functionSet.Count];
       double ticketAccumulator = 0;
@@ -498 +501 @@
         if (r < accumulatedTickets[i]) return functionSet[i];
       }
-      // sanity check
-      throw new InvalidProgramException(); // should never happen
+      throw new ArgumentException();
     }