Changeset 11987 for trunk/sources/HeuristicLab.Tests

Timestamp:

02/12/15 15:39:28 (9 years ago)

Author:

abeham

Message:

#2282:

• Renamed BinaryVectorProblem to BinaryProblem
• Removed IBinaryVectorProblem interface
• Derived BinaryProblem from SingleObjectiveBasicProblem
• Changed bool[] datatype to BinaryVector

Location:

trunk/sources/HeuristicLab.Tests

Files:

• HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/LinkageTreeTest.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/ParameterlessPopulationPyramidTest.cs (modified) (3 diffs)
• HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/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 },

trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3/ParameterlessPopulationPyramidTest.cs

@@ -22 +22 @@
 using System;
 using System.Threading;
-using HeuristicLab.Algorithms.ParameterlessPopulationPyramid;
 using HeuristicLab.Common;
-using HeuristicLab.Problems.BinaryVector;
+using HeuristicLab.Problems.Binary;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -32 +31 @@
 
     // Utility function that sets up and executes the run, then asserts the results
-    private PrivateObject DoRun(BinaryVectorProblem problem, int maximumEvaluations, int seed, double bestQuality, int foundOn) {
+    private PrivateObject DoRun(BinaryProblem problem, int maximumEvaluations, int seed, double bestQuality, int foundOn) {
       var solver = new HeuristicLab.Algorithms.ParameterlessPopulationPyramid.ParameterlessPopulationPyramid();
       solver.Problem = problem;
@@ -41 +40 @@
       try {
         hidden.Invoke("Run", new CancellationToken());
-      }
-      catch (OperationCanceledException) {
+      } catch (OperationCanceledException) {
         // Ignore
       }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -254 +254 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Problems.BinaryVector-3.3">
+    <Reference Include="HeuristicLab.Problems.Binary-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\bin\HeuristicLab.Problems.BinaryVector-3.3.dll</HintPath>
+      <HintPath>..\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>