Changeset 11347 for trunk

Timestamp:

09/05/14 22:25:15 (10 years ago)

Author:

bburlacu

Message:

#2220: Fixed bug in the CartesianProduct extension method that was added in r11309 as part of #2234.

File:

• trunk/sources/HeuristicLab.Common/3.3/EnumerableExtensions.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Common/3.3/EnumerableExtensions.cs

@@ -96 +96 @@
     public static IEnumerable<IEnumerable<T>> CartesianProduct<T>(this IEnumerable<IEnumerable<T>> sequences) {
       IEnumerable<IEnumerable<T>> result = new[] { Enumerable.Empty<T>() };
-      return sequences.Aggregate(result, (current, s) => (from seq in current from item in s select seq.Concat(new[] { item })));
+      return sequences.Where(s => s.Any()).Aggregate(result, (current, s) => (from seq in current from item in s select seq.Concat(new[] { item })));
     }
   }