Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests

Timestamp:

03/28/12 15:47:26 (12 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/Builder.testsettings (modified) (6 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/InstantiateCreatablesTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/InstantiateCreatablesTest.cs)
• HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab-3.3/Resources/ch130.opt.tour (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/Resources/ch130.tsp (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (11 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs)
• HeuristicLab.Tests/HeuristicLab.PluginInfraStructure-3.3/InstallationManagerTest.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs)
• HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3 (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.Instances-3.3)
• HeuristicLab.Tests/HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIB (deleted)
• HeuristicLab.Tests/HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIBInstancesTest.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (12 diffs)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests/Builder.testsettings

@@ -15 +15 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Operators.Views.GraphVisualization-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\LibSVM-1.6.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Optimization.Views-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Optimization.Views-3.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.DebugEngine-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.VehicleRouting.Views-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.OneMax-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.LibSVM-1.6.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.LibSVM-1.6.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Operators.Programmable-3.3.dll" />
@@ -44 +41 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Optimization.Operators-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\log4net.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ICSharpCode.NRefactory.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ICSharpCode.NRefactory.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.SequentialEngine-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll" />
@@ -56 +52 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.NSGA2-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.log4net-1.2.10.0.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.log4net-1.2.10.0.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.WinFormsUI-2.3.1.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.MainForm-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.QuadraticAssignment.Views-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.QuadraticAssignment.Views-3.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.PermutationEncoding.Views-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll" />
@@ -74 +68 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Data.Views-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.ProtobufCS-0.9.1.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ICSharpCode.SharpDevelop.Dom.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ICSharpCode.SharpDevelop.Dom.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Analysis-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\HeuristicLab-3.3\Resources\mammographic_masses.txt" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab-3.3.Tests.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis.Views-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab-3.3.Tests.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\Google.ProtocolBuffers-0.9.1.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Persistence-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.TabuSearch-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Random-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.4.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Core.Views-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ALGLIB-3.1.0.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\ALGLIB-3.4.0.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.ParallelEngine-3.3.dll" />
@@ -96 +86 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt.Views-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Common-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.MainForm.WindowsForms-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Classification-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.MainForm.WindowsForms-3.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\HeuristicLab-3.3\Resources\ch130.tsp" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\HeuristicLab-3.3\Resources\GA_SymbReg.hl" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Optimizer-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Common.Resources-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt-3.3.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Common.Resources-3.3.dll" />    
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Netron-3.0.2672.12446.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\HeuristicLab-3.3\Resources\C101.txt" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.ALGLIB-3.1.0.dll" />
+    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.ALGLIB-3.4.0.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll" />
@@ -118 +106 @@
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Operators.Views-3.3.dll" />
-    <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Core-3.3.dll" />
     <DeploymentItem filename="HeuristicLab.Tests\bin\Release\HeuristicLab.Problems.DataAnalysis-3.4.dll" />
     <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.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">

branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -133 +133 @@
 
     private IEnumerable<object> CheckTotalInequality(object original, object clone) {
-      var originalObjects = new HashSet<object>(original.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
-      var clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      var originalObjects = new HashSet<object>(original.GetObjectGraphObjects(excludeStaticMembers: true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      var clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(excludeStaticMembers: true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
 
       return originalObjects.Intersect(clonedObjects);

branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs

@@ -45 +45 @@
       extLibPluginNames.Add("HeuristicLab.LibSVM");
       extLibPluginNames.Add("HeuristicLab.log4net");
+      extLibPluginNames.Add("HeuristicLab.MathJax");
       extLibPluginNames.Add("HeuristicLab.Netron");
       extLibPluginNames.Add("HeuristicLab.ProtobufCS");

branches/HeuristicLab.Hive.Azure/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
@@ -190 +187 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(63, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(47.26, GetDoubleResult(ga, "CurrentAverageQuality"));
+      Assert.AreEqual(67, GetDoubleResult(ga, "BestQuality"));
+      Assert.AreEqual(45.813, GetDoubleResult(ga, "CurrentAverageQuality"));
       Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
       Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
@@ -241 +238 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(0.82932035115203739, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(0.53850226351927422, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"));
+      Assert.AreEqual(0.78855594192122458, GetDoubleResult(ga, "BestQuality"), 1E-8);
+      Assert.AreEqual(0.61395271071681523, GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
+      Assert.AreEqual(0, GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
       Assert.AreEqual(50950, GetIntResult(ga, "EvaluatedSolutions"));
     }
@@ -344 +341 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(0.13941049901558636, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(5.7121443289014842, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(102.59400156249991, GetDoubleResult(ga, "CurrentWorstQuality"));
+      Assert.AreEqual(0.13775264138895371, GetDoubleResult(ga, "BestQuality"), 1E-8);
+      Assert.AreEqual(14.232802217120254, GetDoubleResult(ga, "CurrentAverageQuality"), 1E-8);
+      Assert.AreEqual(104.24339008411457, GetDoubleResult(ga, "CurrentWorstQuality"), 1E-8);
       Assert.AreEqual(100900, GetIntResult(ga, "EvaluatedSolutions"));
     }
@@ -502 +499 @@
       ga.SetSeedRandomly.Value = false;
       RunAlgorithm(ga);
-      Assert.AreEqual(10469, GetDoubleResult(ga, "BestQuality"));
-      Assert.AreEqual(11184.87, GetDoubleResult(ga, "CurrentAverageQuality"));
-      Assert.AreEqual(13420, GetDoubleResult(ga, "CurrentWorstQuality"));
+      Assert.AreEqual(9918, GetDoubleResult(ga, "BestQuality"));
+      Assert.AreEqual(10324.64, GetDoubleResult(ga, "CurrentAverageQuality"));
+      Assert.AreEqual(11823, GetDoubleResult(ga, "CurrentWorstQuality"));
       Assert.AreEqual(495500, GetIntResult(ga, "EvaluatedSolutions"));
     }
@@ -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
@@ -561 +556 @@
       #region Problem Configuration
       KnapsackProblem problem = new KnapsackProblem();
-      problem.BestKnownQuality.Value = 362;
+      problem.BestKnownQuality = new DoubleValue(362);
       problem.BestKnownSolution = new HeuristicLab.Encodings.BinaryVectorEncoding.BinaryVector(new bool[] { 
        true , false, false, true , true , true , true , true , false, true , true , true , true , true , true , false, true , false, true , true , false, true , true , false, true , false, true , true , true , false, true , true , false, true , true , false, true , false, true , true , true , true , true , true , true , true , true , true , true , true , true , false, true , false, false, true , true , false, true , true , true , true , true , true , true , true , false, true , false, true , true , true , true , false, true , true , true , true , true , true , true , true});
@@ -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
@@ -850 +843 @@
 {48, 71}, {49, 71}, {50, 71}, {44, 70}, {45, 70}, {52, 70}, {53, 70}, {54, 70}, {41, 69}, {42, 69}, {55, 69}, {56, 69}, {40, 68}, {56, 68}, {57, 68}, {39, 67}, {57, 67}, {58, 67}, {59, 67}, {38, 66}, {59, 66}, {60, 66}, {37, 65}, {60, 65}, {36, 64}, {43, 64}, {35, 63}, {37, 63}, {41, 63}, {42, 63}, {43, 63}, {47, 63}, {61, 63}, {40, 62}, {41, 62}, {42, 62}, {43, 62}, {45, 62}, {46, 62}, {47, 62}, {62, 62}, {34, 61}, {38, 61}, {39, 61}, {42, 61}, {43, 61}, {44, 61}, {45, 61}, {46, 61}, {47, 61}, {52, 61}, {62, 61}, {63, 61}, {26, 60}, {38, 60}, {42, 60}, {43, 60}, {44, 60}, {46, 60}, {47, 60}, {63, 60}, {23, 59}, {24, 59}, {27, 59}, {29, 59}, {30, 59}, {31, 59}, {33, 59}, {42, 59}, {46, 59}, {47, 59}, {63, 59}, {21, 58}, {32, 58}, {33, 58}, {34, 58}, {35, 58}, {46, 58}, {47, 58}, {48, 58}, {53, 58}, {21, 57}, {35, 57}, {47, 57}, {48, 57}, {53, 57}, {36, 56}, {37, 56}, {46, 56}, {47, 56}, {48, 56}, {64, 56}, {65, 56}, {20, 55}, {38, 55}, {46, 55}, {47, 55}, {48, 55}, {52, 55}, {21, 54}, {40, 54}, {47, 54}, {48, 54}, {52, 54}, {65, 54}, {30, 53}, {41, 53}, {46, 53}, {47, 53}, {48, 53}, {52, 53}, {65, 53}, {21, 52}, {32, 52}, {33, 52}, {42, 52}, {51, 52}, {21, 51}, {33, 51}, {34, 51}, {43, 51}, {51, 51}, {21, 50}, {35, 50}, {44, 50}, {50, 50}, {66, 50}, {67, 50}, {21, 49}, {34, 49}, {36, 49}, {37, 49}, {46, 49}, {49, 49}, {67, 49}, {22, 48}, {36, 48}, {37, 48}, {46, 48}, {47, 48}, {22, 47}, {30, 47}, {34, 47}, {37, 47}, {38, 47}, {39, 47}, {47, 47}, {48, 47}, {67, 47}, {23, 46}, {28, 46}, {29, 46}, {30, 46}, {31, 46}, {32, 46}, {35, 46}, {37, 46}, {38, 46}, {39, 46}, {49, 46}, {67, 46}, {23, 45}, {28, 45}, {29, 45}, {31, 45}, {32, 45}, {40, 45}, {41, 45}, {49, 45}, {50, 45}, {68, 45}, {24, 44}, {29, 44}, {32, 44}, {41, 44}, {51, 44}, {68, 44}, {25, 43}, {30, 43}, {32, 43}, {42, 43}, {43, 43}, {51, 43}, {68, 43}, {69, 43}, {31, 42}, {32, 42}, {43, 42}, {52, 42}, {55, 42}, {26, 41}, {27, 41}, {31, 41}, {32, 41}, {33, 41}, {44, 41}, {45, 41}, {46, 41}, {47, 41}, {48, 41}, {49, 41}, {53, 41}, {25, 40}, {27, 40}, {32, 40}, {43, 40}, {44, 40}, {45, 40}, {46, 40}, {48, 40}, {49, 40}, {50, 40}, {51, 40}, {53, 40}, {56, 40}, {32, 39}, {33, 39}, {43, 39}, {50, 39}, {51, 39}, {54, 39}, {56, 39}, {69, 39}, {24, 38}, {32, 38}, {41, 38}, {42, 38}, {51, 38}, {52, 38}, {54, 38}, {57, 38}, {69, 38}, {31, 37}, {32, 37}, {40, 37}, {41, 37}, {42, 37}, {43, 37}, {44, 37}, {45, 37}, {46, 37}, {47, 37}, {48, 37}, {51, 37}, {52, 37}, {55, 37}, {57, 37}, {69, 37}, {24, 36}, {31, 36}, {32, 36}, {39, 36}, {40, 36}, {41, 36}, {42, 36}, {43, 36}, {45, 36}, {48, 36}, {49, 36}, {51, 36}, {53, 36}, {55, 36}, {58, 36}, {22, 35}, {23, 35}, {24, 35}, {25, 35}, {30, 35}, {31, 35}, {32, 35}, {39, 35}, {41, 35}, {49, 35}, {51, 35}, {55, 35}, {56, 35}, {58, 35}, {71, 35}, {20, 34}, {27, 34}, {30, 34}, {31, 34}, {51, 34}, {53, 34}, {57, 34}, {60, 34}, {18, 33}, {19, 33}, {29, 33}, {30, 33}, {31, 33}, {45, 33}, {46, 33}, {47, 33}, {52, 33}, {53, 33}, {55, 33}, {57, 33}, {58, 33}, {17, 32}, {30, 32}, {44, 32}, {47, 32}, {54, 32}, {57, 32}, {59, 32}, {61, 32}, {71, 32}, {72, 32}, {43, 31}, {47, 31}, {56, 31}, {58, 31}, {59, 31}, {61, 31}, {72, 31}, {74, 31}, {16, 30}, {43, 30}, {46, 30}, {47, 30}, {59, 30}, {63, 30}, {71, 30}, {75, 30}, {43, 29}, {46, 29}, {47, 29}, {59, 29}, {60, 29}, {75, 29}, {15, 28}, {43, 28}, {46, 28}, {61, 28}, {76, 28}, {15, 27}, {43, 27}, {44, 27}, {45, 27}, {46, 27}, {60, 27}, {62, 27}, {15, 26}, {43, 26}, {44, 26}, {46, 26}, {59, 26}, {60, 26}, {64, 26}, {77, 26}, {15, 25}, {58, 25}, {61, 25}, {77, 25}, {15, 24}, {53, 24}, {55, 24}, {61, 24}, {77, 24}, {62, 23}, {16, 22}, {61, 22}, {62, 22}, {15, 21}, {16, 21}, {52, 21}, {63, 21}, {77, 21}, {16, 20}, {17, 20}, {46, 20}, {47, 20}, {60, 20}, {62, 20}, {63, 20}, {65, 20}, {76, 20}, {15, 19}, {17, 19}, {18, 19}, {44, 19}, {45, 19}, {48, 19}, {53, 19}, {56, 19}, {60, 19}, {62, 19}, {67, 19}, {68, 19}, {76, 19}, {15, 18}, {18, 18}, {19, 18}, {20, 18}, {32, 18}, {33, 18}, {34, 18}, {41, 18}, {42, 18}, {43, 18}, {46, 18}, {48, 18}, {53, 18}, {59, 18}, {60, 18}, {69, 18}, {75, 18}, {16, 17}, {17, 17}, {20, 17}, {21, 17}, {22, 17}, {23, 17}, {24, 17}, {26, 17}, {28, 17}, {29, 17}, {30, 17}, {31, 17}, {32, 17}, {34, 17}, {35, 17}, {36, 17}, {37, 17}, {38, 17}, {39, 17}, {40, 17}, {44, 17}, {46, 17}, {48, 17}, {53, 17}, {56, 17}, {58, 17}, {75, 17}, {17, 16}, {18, 16}, {20, 16}, {24, 16}, {26, 16}, {27, 16}, {29, 16}, {33, 16}, {41, 16}, {42, 16}, {44, 16}, {47, 16}, {52, 16}, {57, 16}, {70, 16}, {73, 16}, {74, 16}, {17, 15}, {18, 15}, {20, 15}, {22, 15}, {24, 15}, {27, 15}, {29, 15}, {31, 15}, {33, 15}, {35, 15}, {36, 15}, {38, 15}, {39, 15}, {42, 15}, {45, 15}, {47, 15}, {52, 15}, {53, 15}, {55, 15}, {56, 15}, {70, 15}, {73, 15}, {17, 14}, {19, 14}, {21, 14}, {24, 14}, {26, 14}, {29, 14}, {31, 14}, {34, 14}, {37, 14}, {40, 14}, {42, 14}, {44, 14}, {46, 14}, {47, 14}, {53, 14}, {54, 14}, {55, 14}, {62, 14}, {70, 14}, {72, 14}, {17, 13}, {19, 13}, {21, 13}, {23, 13}, {25, 13}, {27, 13}, {30, 13}, {32, 13}, {34, 13}, {36, 13}, {38, 13}, {41, 13}, {43, 13}, {44, 13}, {45, 13}, {60, 13}, {70, 13}, {71, 13}, {18, 12}, {21, 12}, {23, 12}, {26, 12}, {28, 12}, {31, 12}, {34, 12}, {37, 12}, {39, 12}, {41, 12}, {42, 12}, {70, 12}, {18, 11}, {19, 11}, {20, 11}, {21, 11}, {24, 11}, {25, 11}, {27, 11}, {29, 11}, {31, 11}, {33, 11}, {35, 11}, {38, 11}, {41, 11}, {59, 11}, {26, 10}, {29, 10}, {32, 10}, {34, 10}, {36, 10}, {39, 10}, {40, 10}, {69, 10}, {21, 9}, {26, 9}, {28, 9}, {30, 9}, {32, 9}, {33, 9}, {35, 9}, {36, 9}, {37, 9}, {38, 9}, {39, 9}, {22, 8}, {27, 8}, {28, 8}, {29, 8}, {30, 8}, {31, 8}, {68, 8}, {23, 7}, {66, 7}, {24, 6}, {65, 6}, {25, 5}, {62, 5}, {63, 5}, {26, 4}, {55, 4}, {56, 4}, {57, 4}, {58, 4}, {59, 4}, {60, 4}, {61, 4}, {28, 3}, {53, 3}, {29, 2}, {50, 2}, {51, 2}, {52, 2}, {31, 1}, {32, 1}, {48, 1}
       });
-      tspProblem.BestKnownQuality.Value = 867;
+      tspProblem.BestKnownQuality = new DoubleValue(867);
 
       tspProblem.EvaluatorParameter.Value = new TSPRoundedEuclideanPathEvaluator();

branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests/HeuristicLab.PluginInfraStructure-3.3/InstallationManagerTest.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using HeuristicLab.PluginInfrastructure.Advanced;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -91 +90 @@
         InstallationManager target = new InstallationManager(pluginDir);
         var pluginList = target.GetRemotePluginList();
-        Assert.IsTrue(pluginList.Count() > 0);
+        Assert.IsTrue(pluginList != null);
       }
       catch (Exception e) {
@@ -107 +106 @@
         InstallationManager target = new InstallationManager(pluginDir);
         var productList = target.GetRemoteProductList();
-        Assert.IsTrue(productList.Count() > 0);
+        Assert.IsTrue(productList != null);
       }
       catch (Exception e) {

branches/HeuristicLab.Hive.Azure/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());
     }
   }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -102 +102 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ALGLIB-3.1.0">
-      <HintPath>..\bin\ALGLIB-3.1.0.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ALGLIB-3.4.0">
+      <HintPath>..\bin\ALGLIB-3.4.0.dll</HintPath>
     </Reference>
     <Reference Include="Calendar.DayView">
@@ -114 +113 @@
       <Private>True</Private>
     </Reference>
-    <Reference Include="HeuristicLab.ALGLIB-3.1.0">
-      <HintPath>..\bin\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="HeuristicLab.ALGLIB-3.4.0">
+      <HintPath>..\bin\HeuristicLab.ALGLIB-3.4.0.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.LibSVM-1.6.3">
@@ -167 +165 @@
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Netron.Diagramming.Core-3.0.2672.12446, Version=3.0.2672.12446, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
@@ -194 +192 @@
     <Compile Include="HeuristicLab-3.3\CollectObjectGraphTest.cs" />
     <Compile Include="HeuristicLab-3.3\ContentViewTests.cs" />
+    <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
     <Compile Include="HeuristicLab-3.3\DeepCloneableCloningTest.cs" />
     <Compile Include="HeuristicLab-3.3\GeneticAlgorithmTest.cs" />
+    <Compile Include="HeuristicLab-3.3\InstantiateCreatablesTest.cs" />
     <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
     <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
@@ -268 +268 @@
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\TableFileParserTest.cs" />
+    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicDataAnalysisExpressionCrossoverTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicDataAnalysisExpressionTreeSimplifierTest.cs" />
@@ -273 +274 @@
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\Token.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\Util.cs" />
+    <Compile Include="HeuristicLab.Problems.Instances-3.3\CordeauGQAPInstanceProviderTest.cs" />
+    <Compile Include="HeuristicLab.Problems.Instances-3.3\ElloumiCTAPInstanceProviderTest.cs" />
+    <Compile Include="HeuristicLab.Problems.Instances-3.3\QAPLIBInstanceProviderTest.cs" />
+    <Compile Include="HeuristicLab.Problems.Instances-3.3\TSPLIBInstanceProviderTest.cs" />
     <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIBInstancesTest.cs" />
     <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPMoveEvaluatorTest.cs" />
@@ -292 +297 @@
     <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>
@@ -307 +306 @@
       <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" />
@@ -467 +329 @@
       <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>
@@ -746 +487 @@
       <Name>HeuristicLab.MainForm-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Operators.Programmable.Views\3.3\HeuristicLab.Operators.Programmable.Views-3.3.csproj">
+      <Project>{8C426FA3-6614-412C-B669-BCE58DB9710E}</Project>
+      <Name>HeuristicLab.Operators.Programmable.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj">
       <Project>{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}</Project>
@@ -858 +603 @@
       <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>{B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9}</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>
@@ -931 +700 @@
     </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. 

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user