Changeset 2840 for trunk/sources/HeuristicLab.Permutation/3.3/Tests/Random.cs

Timestamp:

02/19/10 12:55:18 (14 years ago)

Author:

abeham

Message:

updated the fake random number generator to throw an exception when the requested random variable doesn't fit the bounds
updated the OrderCrossoverTest to test for thrown exceptions #889

File:

• trunk/sources/HeuristicLab.Permutation/3.3/Tests/Random.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Permutation/3.3/Tests/Random.cs

@@ -62 +62 @@
     public int Next(int maxVal) {
       if (nextIntIndex >= intNumbers.Length) throw new InvalidOperationException("Random: No more integer random numbers available");
+      if (IntNumbers[nextIntIndex] >= maxVal) throw new InvalidOperationException("Random: Next integer random number (" + IntNumbers[nextIntIndex] + ") is >= " + maxVal);
       return intNumbers[nextIntIndex++];
     }
@@ -67 +68 @@
     public int Next(int minVal, int maxVal) {
       if (nextIntIndex >= intNumbers.Length) throw new InvalidOperationException("Random: No more integer random numbers available");
+      if (IntNumbers[nextIntIndex] < minVal || IntNumbers[nextIntIndex] >= maxVal) throw new InvalidOperationException("Random: Next integer random number (" + IntNumbers[nextIntIndex] + ") is not in the range [" + minVal + ";" + maxVal + ")");
       return intNumbers[nextIntIndex++];
     }
@@ -72 +74 @@
     public double NextDouble() {
       if (nextDoubleIndex >= doubleNumbers.Length) throw new InvalidOperationException("Random: No more double random numbers available");
+      if (doubleNumbers[nextDoubleIndex] < 0.0 || doubleNumbers[nextDoubleIndex] >= 1.0) throw new InvalidOperationException("Random: Next double ranomd number (" + DoubleNumbers[nextDoubleIndex] + ") is not in the range [0;1)");
       return doubleNumbers[nextDoubleIndex++];
     }