Changeset 8023

Timestamp:

06/18/12 10:04:24 (12 years ago)

Author:

abeham

Message:

#1775: fixed unit tests

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/DiscreteCrossover.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3/DiscreteCrossoverTest.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/DiscreteCrossover.cs

@@ -47 +47 @@
     /// Performs a discrete crossover operation of any number of given parents.
     /// </summary>
-    /// <exception cref="ArgumentException">Thrown when the vectors of the parents are of different length.</exception>
+    /// <exception cref="ArgumentException">Thrown when the vectors of the parents are of different length or when there are less than 2 parents.</exception>
     /// <param name="random">A random number generator.</param>
     /// <param name="parents">The list of parents for the crossover operation.</param>
     /// <returns>The newly created integer vector, resulting from the crossover operation.</returns>
     public static IntegerVector Apply(IRandom random, ItemArray<IntegerVector> parents) {
+      if (parents.Length < 2) throw new ArgumentException("DiscreteCrossover: There are less than two parents to cross.");
       int length = parents[0].Length;
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3/DiscreteCrossoverTest.cs

@@ -115 +115 @@
       // The following test is not based on published examples
       random.Reset();
-      random.DoubleNumbers = new double[] { 0, 0, 0.9, 0, 0.9 };
+      random.IntNumbers = new int[] { 0, 0, 1, 0, 1 };
       parent1 = new IntegerVector(new int[] { 2, 2, 3, 5, 1 });
       parent2 = new IntegerVector(new int[] { 4, 1, 3, 2, 8 });
@@ -124 +124 @@
       // The following test is not based on published examples
       random.Reset();
-      random.DoubleNumbers = new double[] { 0, 0, 0.9, 0, 0.9 };
+      random.IntNumbers = new int[] { 0, 0, 1, 0, 1 };
       parent1 = new IntegerVector(new int[] { 2, 2, 3, 5, 1, 9 }); // this parent is longer
       parent2 = new IntegerVector(new int[] { 4, 1, 3, 2, 8 });