Changeset 3675 for trunk

Timestamp:

05/06/10 16:41:51 (14 years ago)

Author:

abeham

Message:

#890

• changed SinglePointCrossover to work with vectors of length 2
• updated unit tests

Location:

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3

Files:

• Crossovers/SinglePointCrossover.cs (modified) (1 diff)
• Tests/SinglePointCrossoverTest.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

@@ -49 +49 @@
     public static RealVector Apply(IRandom random, RealVector parent1, RealVector parent2) {
       if (parent1.Length != parent2.Length) throw new ArgumentException("SinglePointCrossover: Parents are of unequal length");
+      if (parent1.Length < 2) throw new ArgumentException("SinglePointCrossover: Cannot be applied to vectors with just one dimension.");
       int length = parent1.Length;
       RealVector result = new RealVector(length);
-      int breakPoint = random.Next(1, length - 1);
+      int breakPoint;
+      if (length == 2) breakPoint = 1;
+      else breakPoint = random.Next(1, length - 1);
 
       for (int i = 0; i < breakPoint; i++)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/SinglePointCrossoverTest.cs

@@ -95 +95 @@
       }
       Assert.IsTrue(exceptionFired);
+      // The following test checks if there is an exception when the vector has just one dimension
+      random.Reset();
+      parents = new ItemArray<RealVector>(new RealVector[] { new RealVector(1) });
+      exceptionFired = false;
+      try {
+        RealVector actual;
+        actual = target.Cross(random, parents);
+      } catch (System.ArgumentException) {
+        exceptionFired = true;
+      }
+      Assert.IsTrue(exceptionFired);
     }
 
@@ -125 +136 @@
       }
       Assert.IsTrue(exceptionFired);
+      // The following test is not based on published examples
+      random.Reset();
+      random.IntNumbers = new int[] { 5 }; // should not have an effect
+      parent1 = new RealVector(new double[] { 0.2, 0.4 });
+      parent2 = new RealVector(new double[] { 0.6, 0.1 });
+      expected = new RealVector(new double[] { 0.2, 0.1 });
+      actual = SinglePointCrossover.Apply(random, parent1, parent2);
+      Assert.IsTrue(Auxiliary.RealVectorIsAlmostEqualByPosition(actual, expected));
+      // The following test is not based on published examples
     }