Changeset 8019 for trunk/sources/HeuristicLab.Tests

Timestamp:

06/17/12 15:05:11 (12 years ago)

Author:

abeham

Message:

#1775: reintegrated branch

Location:

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

Files:

• DiscreteCrossoverTest.cs (modified) (2 diffs)
• UniformOnePositionManipulatorTest.cs (modified) (2 diffs)

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

@@ -119 +119 @@
       parent2 = new IntegerVector(new int[] { 4, 1, 3, 2, 8 });
       expected = new IntegerVector(new int[] { 2, 2, 3, 5, 8 });
-      actual = DiscreteCrossover.Apply(random, parent1, parent2);
+      actual = DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new IntegerVector[] { parent1, parent2 }));
       Assert.IsTrue(Auxiliary.IntegerVectorIsEqualByPosition(actual, expected));
 
@@ -129 +129 @@
       exceptionFired = false;
       try {
-        actual = DiscreteCrossover.Apply(random, parent1, parent2);
+        actual = DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new IntegerVector[] { parent1, parent2 }));
       }
       catch (System.ArgumentException) {

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

@@ -87 +87 @@
       TestRandom random = new TestRandom();
       IntegerVector parent, expected;
-      IntValue min, max;
+      IntMatrix bounds = new IntMatrix(1, 2);
       // The following test is not based on published examples
       random.Reset();
@@ -93 +93 @@
       parent = new IntegerVector(new int[] { 2, 2, 3, 5, 1 });
       expected = new IntegerVector(new int[] { 2, 2, 3, 3, 1 });
-      min = new IntValue(2);
-      max = new IntValue(7);
-      UniformOnePositionManipulator.Apply(random, parent, min, max);
+      bounds[0, 0] = 2;
+      bounds[0, 1] = 7;
+      UniformOnePositionManipulator.Apply(random, parent, bounds);
       Assert.IsTrue(Auxiliary.IntegerVectorIsEqualByPosition(expected, parent));
     }