Changeset 2840

Timestamp:

02/19/10 12:55:18 (15 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

Location:

trunk/sources/HeuristicLab.Permutation/3.3/Tests

Files:

• OrderCrossoverTest.cs (modified) (4 diffs)
• Random.cs (modified) (3 diffs)

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

@@ -124 +124 @@
       // based on the previous with changed breakpoints
       random.Reset();
-      random.IntNumbers = new int[] { 4, 4 };
-      expected = new Permutation(new int[] { 3, 4, 0, 9, 7, 8, 2, 1, 6, 5 });
+      random.IntNumbers = new int[] { 6, 9 };
+      expected = new Permutation(new int[] { 3, 4, 8, 2, 7, 1, 6, 0, 5, 9 });
       Assert.IsTrue(expected.Validate());
       actual = target.Cross(random, parents);
@@ -132 +132 @@
       // another one based on the previous with changed breakpoints
       random.Reset();
-      random.IntNumbers = new int[] { 9, 9 };
-      expected = new Permutation(new int[] { 5, 3, 4, 0, 8, 2, 7, 1, 6, 9 });
-      Assert.IsTrue(expected.Validate());
-      actual = target.Cross(random, parents);
-      Assert.IsTrue(actual.Validate());
-      Assert.IsTrue(Auxiliary.PermutationIsEqualByPosition(expected, actual));
+      random.IntNumbers = new int[] { 0, 9 };
+      expected = new Permutation(new int[] { 2, 1, 4, 3, 7, 8, 6, 0, 5, 9 });
+      Assert.IsTrue(expected.Validate());
+      actual = target.Cross(random, parents);
+      Assert.IsTrue(actual.Validate());
+      Assert.IsTrue(Auxiliary.PermutationIsEqualByPosition(expected, actual));
+      // perform a test with more than two parents
+      random.Reset();
+      bool exceptionFired = false;
+      try {
+        target.Cross(random, new ItemArray<Permutation>(new Permutation[] { new Permutation(4), new Permutation(4), new Permutation(4)}));
+      } catch (System.InvalidOperationException) {
+        exceptionFired = true;
+      }
+      Assert.IsTrue(exceptionFired);
+      // perform a test when two permutations are of unequal length
+      random.Reset();
+      exceptionFired = false;
+      try {
+        target.Cross(random, new ItemArray<Permutation>(new Permutation[] { new Permutation(8), new Permutation(6) }));
+      } catch (System.ArgumentException) {
+        exceptionFired = true;
+      }
+      Assert.IsTrue(exceptionFired);
     }
 
@@ -196 +214 @@
       // based on the previous with changed breakpoints
       random.Reset();
-      random.IntNumbers = new int[] { 4, 4 };
-      expected = new Permutation(new int[] { 3, 4, 0, 9, 7, 8, 2, 1, 6, 5 });
+      random.IntNumbers = new int[] { 6, 9 };
+      expected = new Permutation(new int[] { 3, 4, 8, 2, 7, 1, 6, 0, 5, 9 });
       Assert.IsTrue(expected.Validate());
       actual = OrderCrossover.Apply(random, parent1, parent2);
@@ -204 +222 @@
       // another one based on the previous with changed breakpoints
       random.Reset();
-      random.IntNumbers = new int[] { 9, 9 };
-      expected = new Permutation(new int[] { 5, 3, 4, 0, 8, 2, 7, 1, 6, 9 });
-      Assert.IsTrue(expected.Validate());
-      actual = OrderCrossover.Apply(random, parent1, parent2);
-      Assert.IsTrue(actual.Validate());
-      Assert.IsTrue(Auxiliary.PermutationIsEqualByPosition(expected, actual));
+      random.IntNumbers = new int[] { 0, 9 };
+      expected = new Permutation(new int[] { 2, 1, 4, 3, 7, 8, 6, 0, 5, 9 });
+      Assert.IsTrue(expected.Validate());
+      actual = OrderCrossover.Apply(random, parent1, parent2);
+      Assert.IsTrue(actual.Validate());
+      Assert.IsTrue(Auxiliary.PermutationIsEqualByPosition(expected, actual));
+      // perform a test when the two permutations are of unequal length
+      random.Reset();
+      bool exceptionFired = false;
+      try {
+        OrderCrossover.Apply(random, new Permutation(8), new Permutation(6));
+      } catch (System.ArgumentException) {
+        exceptionFired = true;
+      }
+      Assert.IsTrue(exceptionFired);
     }
 

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++];
     }