Changeset 7558 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

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/HeuristicLab-3.3

Files:

• Resources/ch130.opt.tour (deleted)
• Resources/ch130.tsp (deleted)
• SamplesTest.cs (modified) (5 diffs)

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