Changeset 10407 for trunk/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs

Timestamp:

01/28/14 11:38:13 (10 years ago)

Author:

abeham

Message:

Fixed bug in sample proportional without repetition

File:

• trunk/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Random/3.3/RandomEnumerable.cs

@@ -199 +199 @@
       HashSet<int> chosenIndices = new HashSet<int>();
       while (chosenIndices.Count < sourceArray.Length) {
-        int index = 0;
-        double ball = valueArray[index], sum = random.NextDouble() * total;
+        int index = -1;
+        double ball = 0, sum = random.NextDouble() * total;
         while (ball < sum) {
           index++;
           if (!chosenIndices.Contains(index))
-            ball += valueArray[++index];
-        }
+            ball += valueArray[index];
+        }
+        index = index >= 0 ? index : Enumerable.Range(0, sourceArray.Length).First(x => !chosenIndices.Contains(x));
         yield return sourceArray[index];
         chosenIndices.Add(index);