Changeset 7558 for trunk/sources/HeuristicLab.Tests

Timestamp:

03/06/12 01:43:06 (12 years ago)

Author:

abeham

Message:

#1782: trunk integration of problem instance development

• Adapted TSP and QAP to use the new feature
• Moved the TSPLIB importer dialog from the TSP plugin to the TSPLIB instances plugin (created a view for that provider)
• Created it as a default view for IHeuristicOptimizationProblem in order not to interfere with other problems do not yet work with this

Location:

trunk/sources/HeuristicLab.Tests

Files:

• Builder.testsettings (modified) (1 diff)
• HeuristicLab-3.3/Resources/ch130.opt.tour (deleted)
• HeuristicLab-3.3/Resources/ch130.tsp (deleted)
• HeuristicLab-3.3/SamplesTest.cs (modified) (5 diffs)
• HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIB (deleted)
• HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIBInstancesTest.cs (modified) (3 diffs)
• HeuristicLab.Tests.csproj (modified) (5 diffs)

trunk/sources/HeuristicLab.Tests/Builder.testsettings

@@ -110 +110 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.TravelingSalesman-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Parameters.Views-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.Benchmarks-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Hive-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive-3.3.dll" />  
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.Administrator-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.JobManager-3.3" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.Views-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive-3.3.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.DayView-1.0.dll" />
-  <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.MathJax-1.1.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.Benchmarks-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Hive-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive-3.3.dll" />  
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.Administrator-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.JobManager-3.3" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Clients.Hive-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.DayView-1.0.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.MathJax-1.1.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.TSPLIB-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.QAPLIB-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.dll" />
   </Deployment>
   <Execution hostProcessPlatform="MSIL">

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

@@ -44 +44 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Classification;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
+using HeuristicLab.Problems.Instances.TSPLIB;
 using HeuristicLab.Problems.Knapsack;
 using HeuristicLab.Problems.TestFunctions;
@@ -56 +57 @@
   [TestClass]
   [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.opt.txt")]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/ch130.tsp")]
-  [DeploymentItem(@"HeuristicLab-3.3/Resources/ch130.opt.tour")]
   [DeploymentItem(@"HeuristicLab-3.3/Resources/mammographic_masses.txt")]
   [DeploymentItem(@"HeuristicLab-3.3/Resources/towerData.txt")]
@@ -83 +82 @@
       GeneticAlgorithm ga = new GeneticAlgorithm();
       #region Problem Configuration
+      var provider = new TSPLIBTSPInstanceProvider();
+      var instance = provider.GetDataDescriptors().Where(x => x.Name == "ch130").Single();
       TravelingSalesmanProblem tspProblem = new TravelingSalesmanProblem();
-      tspProblem.ImportFromTSPLIB("ch130.tsp", "ch130.opt.tour", 6110);
-      tspProblem.EvaluatorParameter.Value = new TSPRoundedEuclideanPathEvaluator();
-      tspProblem.SolutionCreatorParameter.Value = new RandomPermutationCreator();
+      tspProblem.Load(provider.LoadData(instance));
       tspProblem.UseDistanceMatrix.Value = true;
-      tspProblem.Name = "ch130 TSP (imported from TSPLIB)";
-      tspProblem.Description = "130 city problem (Churritz)";
       #endregion
       #region Algorithm Configuration
@@ -511 +508 @@
       IslandGeneticAlgorithm ga = new IslandGeneticAlgorithm();
       #region Problem Configuration
+      var provider = new TSPLIBTSPInstanceProvider();
+      var instance = provider.GetDataDescriptors().Where(x => x.Name == "ch130").Single();
       TravelingSalesmanProblem tspProblem = new TravelingSalesmanProblem();
-      tspProblem.ImportFromTSPLIB("ch130.tsp", "ch130.opt.tour", 6110);
-      tspProblem.EvaluatorParameter.Value = new TSPRoundedEuclideanPathEvaluator();
-      tspProblem.SolutionCreatorParameter.Value = new RandomPermutationCreator();
+      tspProblem.Load(provider.LoadData(instance));
       tspProblem.UseDistanceMatrix.Value = true;
-      tspProblem.Name = "ch130 TSP (imported from TSPLIB)";
-      tspProblem.Description = "130 city problem (Churritz)";
       #endregion
       #region Algorithm Configuration
@@ -766 +761 @@
       TabuSearch ts = new TabuSearch();
       #region Problem Configuration
-      var tspProblem = new TravelingSalesmanProblem();
-      tspProblem.ImportFromTSPLIB("ch130.tsp", "ch130.opt.tour", 6110);
-      tspProblem.EvaluatorParameter.Value = new TSPRoundedEuclideanPathEvaluator();
-      tspProblem.SolutionCreatorParameter.Value = new RandomPermutationCreator();
+      var provider = new TSPLIBTSPInstanceProvider();
+      var instance = provider.GetDataDescriptors().Where(x => x.Name == "ch130").Single();
+      TravelingSalesmanProblem tspProblem = new TravelingSalesmanProblem();
+      tspProblem.Load(provider.LoadData(instance));
       tspProblem.UseDistanceMatrix.Value = true;
-      tspProblem.Name = "ch130 TSP (imported from TSPLIB)";
-      tspProblem.Description = "130 city problem (Churritz)";
       #endregion
       #region Algorithm Configuration

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIBInstancesTest.cs

@@ -24 +24 @@
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
+using HeuristicLab.Problems.Instances.QAPLIB;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -31 +31 @@
   [TestClass]
   public class QAPLIBInstancesTest {
-    private static string InstancePrefix = "HeuristicLab.Tests.HeuristicLab.Problems.QuadraticAssignment_3._3.QAPLIB.";
-
-    private IEnumerable<string> EmbeddedInstances {
-      get {
-        return Assembly.GetExecutingAssembly()
-          .GetManifestResourceNames()
-          .Where(x => x.EndsWith(".dat"))
-          .OrderBy(x => x)
-          .Select(x => x.Replace(".dat", String.Empty))
-          .Select(x => x.Replace(InstancePrefix, String.Empty));
-      }
-    }
+    #region instances
+    private static Dictionary<string, double> qaplibInstances = new Dictionary<string, double>() {
+      { "bur26a", 5426670 },
+      { "bur26b", 3817852 },
+      { "bur26c", 5426795 },
+      { "bur26d", 3821225 },
+      { "bur26e", 5386879 },
+      { "bur26f", 3782044 },
+      { "bur26g", 10117172 },
+      { "bur26h", 7098658 },
+      { "chr12a", 9552 },
+      { "chr12b", 9742 },
+      { "chr12c", 11156 },
+      { "chr15a", 9896 },
+      { "chr15b", 7990 },
+      { "chr15c", 9504 },
+      { "chr18a", 11098 },
+      { "chr18b", 1534 },
+      { "chr20a", 2192 },
+      { "chr20b", 2298 },
+      { "chr20c", 14142 },
+      { "chr22a", 6156 },
+      { "chr22b", 6194 },
+      { "chr25a", 3796 },
+      { "els19", 17212548 },
+      { "esc16a", 68 },
+      { "esc16b", 292 },
+      { "esc16c", 160 },
+      { "esc16d", 16 },
+      { "esc16e", 28 },
+      { "esc16f", 0 },
+      { "esc16g", 26 },
+      { "esc16h", 996 },
+      { "esc16i", 14 },
+      { "esc16j", 8 },
+      { "esc32a", 130 },
+      { "esc32b", 168 },
+      { "esc32c", 642 },
+      { "esc32d", 200 },
+      { "esc32e", 2 },
+      { "esc32f", 2 },
+      { "esc32g", 6 },
+      { "esc32h", 438 },
+      { "esc64", 116 },
+      { "esc128", 64 },
+      { "had12", 1652 },
+      { "had14", 2724 },
+      { "had16", 3720 },
+      { "had18", 5358 },
+      { "had20", 6922 },
+      { "kra30a", 88900 },
+      { "kra30b", 91420 },
+      { "kra32", 88700 },
+      { "lipa20a", 3683 },
+      { "lipa20b", 27076 },
+      { "lipa30a", 13178 },
+      { "lipa30b", 151426 },
+      { "lipa40a", 31538 },
+      { "lipa40b", 476581 },
+      { "lipa50a", 62093 },
+      { "lipa50b", 1210244 },
+      { "lipa60a", 107218 },
+      { "lipa60b", 2520135 },
+      { "lipa70a", 169755 },
+      { "lipa70b", 4603200 },
+      { "lipa80a", 253195 },
+      { "lipa80b", 7763962 },
+      { "lipa90a", 360630 },
+      { "lipa90b", 12490441 },
+      { "nug12", 578 },
+      { "nug14", 1014 },
+      { "nug15", 1150 },
+      { "nug16a", 1610 },
+      { "nug16b", 1240 },
+      { "nug17", 1732 },
+      { "nug18", 1930 },
+      { "nug20", 2570 },
+      { "nug21", 2438 },
+      { "nug22", 3596 },
+      { "nug24", 3488 },
+      { "nug25", 3744 },
+      { "nug27", 5234 },
+      { "nug28", 5166 },
+      { "nug30", 6124 },
+      { "rou12", 235528 },
+      { "rou15", 354210 },
+      { "rou20", 725522 },
+      { "scr12", 31410 },
+      { "scr15", 51140 },
+      { "scr20", 110030 },
+      { "sko42", 15812 },
+      { "sko49", 23386 },
+      { "sko56", 34458 },
+      { "sko64", 48498 },
+      { "sko72", 66256 },
+      { "sko81", 90998 },
+      { "sko90", 115534 },
+      { "sko100a", 152002 },
+      { "sko100b", 153890 },
+      { "sko100c", 147862 },
+      { "sko100d", 149576 },
+      { "sko100e", 149150 },
+      { "sko100f", 149036 },
+      { "ste36a", 9526 },
+      { "ste36b", 15852 },
+      { "ste36c", 8239110 },
+      { "tai12a", 224416 },
+      { "tai12b", 39464925 },
+      { "tai15a", 388214 },
+      { "tai15b", 51765268 },
+      { "tai17a", 491812 },
+      { "tai20a", 703482 },
+      { "tai20b", 122455319 },
+      { "tai25a", 1167256 },
+      { "tai25b", 344355646 },
+      { "tai30a", 1818146 },
+      { "tai30b", 637117113 },
+      { "tai35a", 2422002 },
+      { "tai35b", 283315445 },
+      { "tai40a", 3139370 },
+      { "tai40b", 637250948 },
+      { "tai50a", 4938796 },
+      { "tai50b", 458821517 },
+      { "tai60a", 7208572  },
+      { "tai60b", 608215054 },
+      { "tai64c", 1855928 },
+      { "tai80a", 13557864 },
+      { "tai80b", 818415043 },
+      { "tai100a", 21052466 },
+      { "tai100b", 1185996137 },
+      { "tai150b", 498896643 },
+      { "tai256c", 44759294 },
+      { "tho30", 149936 },
+      { "tho40", 240516 },
+      { "tho150", 8133398 },
+      { "wil50", 48816 },
+      { "wil100", 273038 }
+    };
+    #endregion
 
     [TestMethod]
     public void TestQAPLIBInstances() {
+      var provider = new QAPLIBInstanceProvider();
       var qap = new QuadraticAssignmentProblem();
       var failedInstances = new StringBuilder();
       string tempPath = Path.GetTempPath();
 
-      Assert.IsTrue(EmbeddedInstances.Any(), "No instances could be found.");
-
-      foreach (string instance in EmbeddedInstances) {
-        WriteEmbeddedResourceToFile(InstancePrefix + instance + ".dat", File.Create(Path.Combine(tempPath, "instance.dat")));
-
-        bool solutionExists = Assembly.GetExecutingAssembly().GetManifestResourceNames().Any(x => x == InstancePrefix + instance + ".sln");
-        if (solutionExists)
-          WriteEmbeddedResourceToFile(InstancePrefix + instance + ".sln", File.Create(Path.Combine(tempPath, "instance.sln")));
-
+      var instances = provider.GetDataDescriptors();
+      Assert.IsTrue(instances.Any(), "No instances could be found.");
+
+      foreach (var instance in instances) {
         try {
-          qap.LoadInstanceFromFile(Path.Combine(tempPath, "instance.dat"));
+          qap.Load(provider.LoadData(instance));
         } catch (Exception ex) {
           failedInstances.AppendLine(instance + ": " + ex.Message);
-          solutionExists = false; // not necessary to test solution as well
-        }
-
-        if (solutionExists) {
-          try {
-            qap.LoadInstanceFromFile(Path.Combine(tempPath, "instance.dat"), Path.Combine(tempPath, "instance.sln"));
-            if (qap.BestKnownSolution == null)
-              failedInstances.AppendLine(instance + " (sln): Given solution and reported quality cannot be reproduced.");
-          } catch (Exception ex) {
-            failedInstances.AppendLine(instance + " (+sln):" + ex.Message);
-          }
         }
       }
@@ -79 +191 @@
     }
 
-    private void WriteEmbeddedResourceToFile(string resource, FileStream file) {
-      try {
-        using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource)) {
-          int token;
-          while ((token = stream.ReadByte()) >= 0) {
-            file.WriteByte((byte)token);
-          }
-        }
-      } finally { file.Close(); }
+    [TestMethod]
+    public void TestQAPLIBSolutions() {
+      var provider = new QAPLIBInstanceProvider();
+      var qap = new QuadraticAssignmentProblem();
+      var failedInstances = new StringBuilder();
+      string tempPath = Path.GetTempPath();
+
+      var instances = provider.GetDataDescriptors();
+      Assert.IsTrue(instances.Any(), "No instances could be found.");
+
+      foreach (var instance in instances) {
+        qap.Load(provider.LoadData(instance));
+        if (qaplibInstances.ContainsKey(instance.Name)
+          && qap.BestKnownQuality != null && qap.BestKnownQuality.Value != qaplibInstances[instance.Name])
+          failedInstances.AppendLine(instance.Name + ": " + qap.BestKnownQuality.Value.ToString() + " vs " + qaplibInstances[instance.Name]);
+      }
+      Assert.IsTrue(failedInstances.Length == 0, "Following instances/solutions have suspicious quality: " + Environment.NewLine + failedInstances.ToString());
     }
   }

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

@@ -293 +293 @@
     <None Include="app.config" />
     <None Include="Builder.testsettings" />
-    <None Include="HeuristicLab-3.3\Resources\ch130.opt.tour">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="HeuristicLab-3.3\Resources\ch130.tsp">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="HeuristicLab-3.3\Resources\GA_SymbReg.hl">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -308 +302 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26d.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26e.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26f.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26g.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26h.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr18a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr18b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr22a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr22b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr25a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\els19.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc128.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16d.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16e.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16f.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16g.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16h.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16i.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16j.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32d.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32e.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32f.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32g.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32h.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc64a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had12.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had14.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had16.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had18.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had20.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra30a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra30b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra32.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa20a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa20b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa30a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa30b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa40a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa40b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa50a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa50b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa60a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa60b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa70a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa70b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa80a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa80b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa90a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa90b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug12.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug14.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug15.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug16a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug16b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug17.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug18.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug20.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug21.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug22.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug24.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug25.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug27.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug28.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug30.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou12.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou15.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou20.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr12.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr15.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr20.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100d.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100e.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100f.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko42.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko49.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko56.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko64.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko72.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko81.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko90.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai100a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai100b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai10a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai10b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai12a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai12b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai150b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai15a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai15b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai17a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai20a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai20b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai256c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai25a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai25b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai30a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai30b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai35a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai35b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai40a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai40b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai50a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai50b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai60a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai60b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai64c.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai80a.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai80b.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tho150.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tho30.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tho40.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\wil100.dat" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\wil50.dat" />
     <None Include="HeuristicLab.snk" />
     <Shadow Include="Test References\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.accessor" />
@@ -468 +325 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26d.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26e.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26f.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26g.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\bur26h.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr12c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr15c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr18a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr18b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr20c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr22a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr22b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\chr25a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\els19.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc128.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16d.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16e.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16f.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16g.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16h.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16i.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc16j.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32e.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32f.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\esc32g.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had12.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had14.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had16.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had18.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\had20.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra30a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra30b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\kra32.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa20a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa20b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa30a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa30b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa40a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa40b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa50a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa50b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa60a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa60b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa70a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa70b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa80a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa80b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa90a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\lipa90b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug12.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug14.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug15.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug16a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug16b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug17.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug18.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug20.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug21.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug22.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug24.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug25.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug27.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug28.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\nug30.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou12.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou15.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\rou20.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr12.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr15.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\scr20.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100d.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100e.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko100f.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko49.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko81.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\sko90.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\ste36c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai100a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai100b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai12a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai12b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai150b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai15a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai15b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai17a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai20a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai20b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai256c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai25a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai25b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai30b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai35b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai40b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai50a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai50b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai60a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai60b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai64c.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai80a.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tai80b.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tho150.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\tho30.sln" />
-    <EmbeddedResource Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIB\wil100.sln" />
   </ItemGroup>
   <ItemGroup>
@@ -859 +595 @@
       <Name>HeuristicLab.Problems.ExternalEvaluation-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.CordeauGQAP\3.3\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj">
+      <Project>{1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}</Project>
+      <Name>HeuristicLab.Problems.Instances.CordeauGQAP-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj">
+      <Project>{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}</Project>
+      <Name>HeuristicLab.Problems.Instances.ElloumiCTAP-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.QAPLIB\3.3\HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj">
+      <Project>{73F29D43-5714-4069-8FAB-0D18FEB5F175}</Project>
+      <Name>HeuristicLab.Problems.Instances.QAPLIB-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB.Views\3.3\HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj">
+      <Project>{8B2BC81F-6B6C-414D-A934-57FD3FA8D6DC}</Project>
+      <Name>HeuristicLab.Problems.Instances.TSPLIB.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB\3.3\HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj">
+      <Project>{CE0F99D6-1C56-48A9-9B68-3E5B833703EF}</Project>
+      <Name>HeuristicLab.Problems.Instances.TSPLIB-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.Knapsack.Views\3.3\HeuristicLab.Problems.Knapsack.Views-3.3.csproj">
       <Project>{A9EE65D9-405B-4C9C-B470-FC911AAC541B}</Project>
@@ -932 +692 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.