Changeset 12005 for stable/HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/LinkageTreeTest.cs

Timestamp:

02/13/15 15:00:15 (9 years ago)

Author:

abeham

Message:

#2174, #2282: merged revisions r11961,r11963,r11967,r11970,r11971,r11982,r11984,r11998,r12001,r12002,r12003,r12004,r11939,r11945,r11956,r11958,r11959,r11960,r11983,r11987,r11988,r11990,r11993,r11994,r11996,r11999,r12000 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3 (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3)
• HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/LinkageTreeTest.cs (modified) (2 diffs)

stable/HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/LinkageTreeTest.cs

@@ -22 +22 @@
 using System.Linq;
 using HeuristicLab.Algorithms.ParameterlessPopulationPyramid;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Random;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -29 +30 @@
   public class LinkageTreeTest {
     private static int Length = 9;
-    private static bool[][] solutions = new bool[][] {
-    new bool[] { true, true, false, false, false, false, false, false, false }, // 110000000
-    new bool[] { false, false, true, true, false, false, false, false, false }, // 001100000
-    new bool[] { false, false, false, false, true, true, false, false, false }, // 000011000
-    new bool[] { false, false, false, false, false, false, true, true, true },  // 000000111
-    new bool[] { true, true, true, true, false, false, false, false, false },   // 111100000
-    new bool[] { true, true, true, true, true, true, true, true, true },        // 111111111
+    private static BinaryVector[] solutions = {
+    new BinaryVector(new [] { true, true, false, false, false, false, false, false, false }), // 110000000
+    new BinaryVector(new [] { false, false, true, true, false, false, false, false, false }), // 001100000
+    new BinaryVector(new [] { false, false, false, false, true, true, false, false, false }), // 000011000
+    new BinaryVector(new [] { false, false, false, false, false, false, true, true, true }),  // 000000111
+    new BinaryVector(new [] { true, true, true, true, false, false, false, false, false }),   // 111100000
+    new BinaryVector(new [] { true, true, true, true, true, true, true, true, true }),        // 111111111
     };
 
     // These are the clusters that should be built using "solutions" and the seed 123
-    private static int[][] correctClusters = new int[][] {
+    private static int[][] correctClusters = {
       new int[] { 4, 5 },
       new int[] { 2, 3 },